From dd5aae9a67c91cfc0dea6e28b0a20e3138996d05 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 9 Apr 2012 09:09:07 -0400 Subject: [PATCH] jQuery UI is already included from common.inc.php --- db_create.php | 1 - db_events.php | 1 - db_operations.php | 2 -- db_routines.php | 1 - db_structure.php | 1 - db_tracking.php | 1 - db_triggers.php | 1 - main.php | 2 -- server_plugins.php | 1 - server_privileges.php | 1 - server_status.php | 1 - sql.php | 1 - tbl_change.php | 1 - tbl_operations.php | 4 ---- tbl_replace.php | 2 -- tbl_select.php | 1 - tbl_structure.php | 1 - tbl_zoom_select.php | 1 - 18 files changed, 24 deletions(-) diff --git a/db_create.php b/db_create.php index 497a000e3bc8..dd299a128c57 100644 --- a/db_create.php +++ b/db_create.php @@ -10,7 +10,6 @@ */ require_once 'libraries/common.inc.php'; $GLOBALS['js_include'][] = 'functions.js'; -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; require_once 'libraries/mysql_charsets.lib.php'; if (!PMA_DRIZZLE) { diff --git a/db_events.php b/db_events.php index af41eb1f5628..aecda1aad164 100644 --- a/db_events.php +++ b/db_events.php @@ -15,7 +15,6 @@ /** * Include JavaScript libraries */ -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; $GLOBALS['js_include'][] = 'rte/common.js'; $GLOBALS['js_include'][] = 'rte/events.js'; diff --git a/db_operations.php b/db_operations.php index 62ba3f6e1807..145141d37d92 100644 --- a/db_operations.php +++ b/db_operations.php @@ -19,8 +19,6 @@ require_once 'libraries/mysql_charsets.lib.php'; // add a javascript file for jQuery functions to handle Ajax actions -// also add jQueryUI -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; $GLOBALS['js_include'][] = 'db_operations.js'; /** diff --git a/db_routines.php b/db_routines.php index 154e0b22dc43..dd55c72a8c80 100644 --- a/db_routines.php +++ b/db_routines.php @@ -21,7 +21,6 @@ /** * Include JavaScript libraries */ -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; $GLOBALS['js_include'][] = 'rte/common.js'; $GLOBALS['js_include'][] = 'rte/routines.js'; diff --git a/db_structure.php b/db_structure.php index 8d24c0ab695c..83517e213308 100644 --- a/db_structure.php +++ b/db_structure.php @@ -10,7 +10,6 @@ */ require_once 'libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; $GLOBALS['js_include'][] = 'db_structure.js'; $GLOBALS['js_include'][] = 'tbl_change.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; diff --git a/db_tracking.php b/db_tracking.php index 765e39bb1f73..7782321dc746 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -10,7 +10,6 @@ require_once 'libraries/common.inc.php'; //Get some js files needed for Ajax requests -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; $GLOBALS['js_include'][] = 'db_structure.js'; /** diff --git a/db_triggers.php b/db_triggers.php index a83733807f4f..4fa8592fc5f1 100644 --- a/db_triggers.php +++ b/db_triggers.php @@ -15,7 +15,6 @@ /** * Include JavaScript libraries */ -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; $GLOBALS['js_include'][] = 'rte/common.js'; $GLOBALS['js_include'][] = 'rte/triggers.js'; $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js'; diff --git a/main.php b/main.php index 838ec85529bc..f4babfe1394c 100644 --- a/main.php +++ b/main.php @@ -10,8 +10,6 @@ */ require_once 'libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; - // Handles some variables that may have been sent by the calling script $GLOBALS['db'] = ''; $GLOBALS['table'] = ''; diff --git a/server_plugins.php b/server_plugins.php index 3e95b5389ab0..0b836b946fab 100644 --- a/server_plugins.php +++ b/server_plugins.php @@ -13,7 +13,6 @@ /** * JS includes */ -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; $GLOBALS['js_include'][] = 'jquery/jquery.cookie.js'; $GLOBALS['js_include'][] = 'jquery/jquery.tablesorter.js'; $GLOBALS['js_include'][] = 'server_plugins.js'; diff --git a/server_privileges.php b/server_privileges.php index 53c4ed396fe4..a96eef03c252 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -15,7 +15,6 @@ */ $GLOBALS['js_include'][] = 'server_privileges.js'; $GLOBALS['js_include'][] = 'functions.js'; -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js'; $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js'; $_add_user_error = false; diff --git a/server_status.php b/server_status.php index 5c5e498e851c..c35ae5a7bcdc 100644 --- a/server_status.php +++ b/server_status.php @@ -433,7 +433,6 @@ */ $GLOBALS['js_include'][] = 'server_status.js'; -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; $GLOBALS['js_include'][] = 'jquery/jquery.tablesorter.js'; $GLOBALS['js_include'][] = 'jquery/jquery.cookie.js'; // For tab persistence // Charting diff --git a/sql.php b/sql.php index 69b4c2447b18..9e3b42e11f5a 100644 --- a/sql.php +++ b/sql.php @@ -14,7 +14,6 @@ require_once 'libraries/check_user_privileges.lib.php'; require_once 'libraries/bookmark.lib.php'; -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; $GLOBALS['js_include'][] = 'tbl_change.js'; // the next one needed because sql.php may do a "goto" to tbl_structure.php diff --git a/tbl_change.php b/tbl_change.php index 4b804478f235..04b17a68846b 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -123,7 +123,6 @@ */ $GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'tbl_change.js'; -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; $GLOBALS['js_include'][] = 'gis_data_editor.js'; diff --git a/tbl_operations.php b/tbl_operations.php index 27c3edd6c20f..da5676e2eea7 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -30,10 +30,6 @@ require_once 'libraries/mysql_charsets.lib.php'; require_once 'libraries/StorageEngine.class.php'; -// add a javascript file for jQuery functions to handle Ajax actions -// also add jQueryUI -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; - /** * Class for partition management */ diff --git a/tbl_replace.php b/tbl_replace.php index 21d963f92c5a..f7e0f9e2631f 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -556,8 +556,6 @@ } $GLOBALS['js_include'][] = 'tbl_change.js'; -// in case we call sql.php which needs those: -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; $active_page = $goto_include; diff --git a/tbl_select.php b/tbl_select.php index 660c84c72349..a79358022844 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -21,7 +21,6 @@ $GLOBALS['js_include'][] = 'sql.js'; $GLOBALS['js_include'][] = 'tbl_select.js'; $GLOBALS['js_include'][] = 'tbl_change.js'; -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; $GLOBALS['js_include'][] = 'gis_data_editor.js'; diff --git a/tbl_structure.php b/tbl_structure.php index ffb0d68a0b59..30c937e15a79 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -12,7 +12,6 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/mysql_charsets.lib.php'; -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; $GLOBALS['js_include'][] = 'tbl_structure.js'; $GLOBALS['js_include'][] = 'indexes.js'; diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 49e38b3e8c36..0c72b1640a4f 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -26,7 +26,6 @@ /* Files required for chart exporting */ $GLOBALS['js_include'][] = 'highcharts/exporting.js'; $GLOBALS['js_include'][] = 'canvg/canvg.js'; -$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; /**