From 201d0e892c91cdee0ecc3a8c48389a41b3532b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jan 2010 11:49:46 +0000 Subject: [PATCH] Load mootools in every page. --- db_import.php | 1 - db_structure.php | 1 - import.php | 1 - libraries/header_scripts.inc.php | 2 ++ main.php | 1 - server_import.php | 1 - server_replication.php | 1 - server_synchronize.php | 1 - sql.php | 1 - tbl_import.php | 1 - tbl_replace.php | 1 - tbl_select.php | 1 - tbl_structure.php | 1 - 13 files changed, 2 insertions(+), 12 deletions(-) diff --git a/db_import.php b/db_import.php index 97cffbcb0..d1c824715 100644 --- a/db_import.php +++ b/db_import.php @@ -14,7 +14,6 @@ require_once './libraries/common.inc.php'; /** * Load mootools for upload progress bar */ -$GLOBALS['js_include'][] = 'mootools.js'; $GLOBALS['js_include'][] = 'mootools-more.js'; /** diff --git a/db_structure.php b/db_structure.php index 15699c36e..e5c300809 100644 --- a/db_structure.php +++ b/db_structure.php @@ -12,7 +12,6 @@ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php'; -$GLOBALS['js_include'][] = 'mootools.js'; $GLOBALS['js_include'][] = 'mootools-more.js'; /** diff --git a/import.php b/import.php index 0c721f85d..59274ea3e 100644 --- a/import.php +++ b/import.php @@ -14,7 +14,6 @@ require_once './libraries/common.inc.php'; //require_once './libraries/display_import_functions.lib.php'; $GLOBALS['js_include'][] = 'functions.js'; -$GLOBALS['js_include'][] = 'mootools.js'; $GLOBALS['js_include'][] = 'mootools-more.js'; // reset import messages for ajax request diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php index d924bbdeb..dbde99a4f 100644 --- a/libraries/header_scripts.inc.php +++ b/libraries/header_scripts.inc.php @@ -112,6 +112,8 @@ $GLOBALS['js_events'][] = array( 'function' => 'PMA_TT_init', ); +$GLOBALS['js_include'][] = 'mootools.js'; + foreach ($GLOBALS['js_include'] as $js_script_file) { echo '' . "\n"; } diff --git a/main.php b/main.php index 59c2b3c07..7f6ba61e3 100644 --- a/main.php +++ b/main.php @@ -11,7 +11,6 @@ */ define('PMA_MOORAINBOW', true); require_once './libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'mootools.js'; $GLOBALS['js_include'][] = 'mootools-more.js'; $GLOBALS['js_include'][] = 'mooRainbow/mooRainbow.js'; $GLOBALS['js_include'][] = 'mootools-domready-rainbow.js'; diff --git a/server_import.php b/server_import.php index 0684a4052..640665252 100644 --- a/server_import.php +++ b/server_import.php @@ -14,7 +14,6 @@ require_once './libraries/common.inc.php'; /** * Load mootools for upload progress bar */ -$GLOBALS['js_include'][] = 'mootools.js'; $GLOBALS['js_include'][] = 'mootools-more.js'; diff --git a/server_replication.php b/server_replication.php index b42d83eea..963d65482 100644 --- a/server_replication.php +++ b/server_replication.php @@ -16,7 +16,6 @@ require_once './libraries/common.inc.php'; */ $GLOBALS['js_include'][] = 'server_privileges.js'; $GLOBALS['js_include'][] = 'functions.js'; -$GLOBALS['js_include'][] = 'mootools.js'; $GLOBALS['js_include'][] = 'mootools-more.js'; $GLOBALS['js_include'][] = 'mootools_common.js'; diff --git a/server_synchronize.php b/server_synchronize.php index 2808000f7..7d7fe3d6e 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -16,7 +16,6 @@ require_once './libraries/common.inc.php'; * Does the common work */ $GLOBALS['js_include'][] = 'functions.js'; -$GLOBALS['js_include'][] = 'mootools.js'; $GLOBALS['js_include'][] = 'mootools-more.js'; require_once './libraries/server_common.inc.php'; diff --git a/sql.php b/sql.php index 4b38943b3..63d7a8846 100644 --- a/sql.php +++ b/sql.php @@ -15,7 +15,6 @@ require_once './libraries/Table.class.php'; require_once './libraries/check_user_privileges.lib.php'; require_once './libraries/bookmark.lib.php'; -$GLOBALS['js_include'][] = 'mootools.js'; $GLOBALS['js_include'][] = 'mootools-more.js'; /** diff --git a/tbl_import.php b/tbl_import.php index bfdecd9c7..a1bc3a0dd 100644 --- a/tbl_import.php +++ b/tbl_import.php @@ -14,7 +14,6 @@ require_once './libraries/common.inc.php'; /** * Load mootools for upload progress bar */ -$GLOBALS['js_include'][] = 'mootools.js'; $GLOBALS['js_include'][] = 'mootools-more.js'; /** diff --git a/tbl_replace.php b/tbl_replace.php index e113fd730..4e3e7cae2 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -430,7 +430,6 @@ if (isset($return_to_sql_query)) { $GLOBALS['js_include'][] = 'tbl_change.js'; $GLOBALS['js_include'][] = 'functions.js'; // in case we call sql.php which needs those: -$GLOBALS['js_include'][] = 'mootools.js'; $GLOBALS['js_include'][] = 'mootools-more.js'; $active_page = $goto_include; diff --git a/tbl_select.php b/tbl_select.php index c49826b42..06433ca1e 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -19,7 +19,6 @@ require_once './libraries/relation.lib.php'; // foreign keys require_once './libraries/mysql_charsets.lib.php'; $GLOBALS['js_include'][] = 'tbl_change.js'; -$GLOBALS['js_include'][] = 'mootools.js'; $GLOBALS['js_include'][] = 'mootools-more.js'; if ($GLOBALS['cfg']['PropertiesIconic'] == true) { diff --git a/tbl_structure.php b/tbl_structure.php index 41e90055d..35a4b7149 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -14,7 +14,6 @@ require_once './libraries/common.inc.php'; require_once './libraries/mysql_charsets.lib.php'; require_once './libraries/relation.lib.php'; -$GLOBALS['js_include'][] = 'mootools.js'; $GLOBALS['js_include'][] = 'mootools-more.js'; /**