Include CodeMirror globally

roccivic · roccivic · commit 49a7f12e4e41 · 2012-04-25T23:47:24.000+01:00
diff --git a/db_events.php b/db_events.php
@@ -19,11 +19,6 @@
 $GLOBALS['js_include'][] = 'rte/common.js';
 $GLOBALS['js_include'][] = 'rte/events.js';
 
-if ($GLOBALS['cfg']['CodemirrorEnable']) {
-    $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
-    $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
-}
-
 /**
  * Include all other files
  */
diff --git a/db_routines.php b/db_routines.php
@@ -25,11 +25,6 @@
 $GLOBALS['js_include'][] = 'rte/common.js';
 $GLOBALS['js_include'][] = 'rte/routines.js';
 
-if ($GLOBALS['cfg']['CodemirrorEnable']) {
-    $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
-    $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
-}
-
 /**
  * Include all other files
  */
diff --git a/db_sql.php b/db_sql.php
@@ -17,11 +17,6 @@
 $GLOBALS['js_include'][] = 'makegrid.js';
 $GLOBALS['js_include'][] = 'sql.js';
 
-if ($GLOBALS['cfg']['CodemirrorEnable']) {
-    $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
-    $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
-}
-
 require 'libraries/db_common.inc.php';
 require_once 'libraries/sql_query_form.lib.php';
 
diff --git a/db_triggers.php b/db_triggers.php
@@ -18,11 +18,6 @@
 $GLOBALS['js_include'][] = 'rte/common.js';
 $GLOBALS['js_include'][] = 'rte/triggers.js';
 
-if ($GLOBALS['cfg']['CodemirrorEnable']) {
-    $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
-    $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
-}
-
 /**
  * Include all other files
  */
diff --git a/js/server_status.js b/js/server_status.js
@@ -159,9 +159,6 @@ $(function() {
                         'js/jquery/timepicker.js',
                         'js/jquery/jquery.json-2.2.js',
                         'js/jquery/jquery.sortableTable.js'];
-                    if (cfg_CodemirrorEnable) {
-                        scripts.push('js/codemirror/lib/codemirror.js', 'js/codemirror/mode/mysql/mysql.js');
-                    }
                     scripts.push('js/server_status_monitor.js');
                     loadJavascript(scripts);
                 }, 50);
diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php
@@ -36,6 +36,11 @@
 
 $GLOBALS['js_include'][] = 'functions.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.qtip-1.0.0-rc3.js';
+if ($GLOBALS['cfg']['CodemirrorEnable']) {
+    $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
+    $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
+}
+
 $params = array('lang' => $GLOBALS['lang']);
 if (isset($GLOBALS['db'])) {
     $params['db'] = $GLOBALS['db'];
diff --git a/querywindow.php b/querywindow.php
@@ -121,11 +121,6 @@
 $js_include[] = 'common.js';
 $js_include[] = 'querywindow.js';
 
-if ($GLOBALS['cfg']['CodemirrorEnable']) {
-    $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
-    $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
-}
-
 if (PMA_isValid($_REQUEST['auto_commit'], 'identical', 'true')) {
     $js_events[] = array(
         'event'     => 'load',
diff --git a/server_privileges.php b/server_privileges.php
@@ -16,10 +16,6 @@
 $GLOBALS['js_include'][] = 'server_privileges.js';
 $GLOBALS['js_include'][] = 'functions.js';
 
-if ($GLOBALS['cfg']['CodemirrorEnable']) {
-    $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
-    $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
-}
 $_add_user_error = false;
 
 /**
diff --git a/server_sql.php b/server_sql.php
@@ -17,11 +17,6 @@
 $GLOBALS['js_include'][] = 'makegrid.js';
 $GLOBALS['js_include'][] = 'sql.js';
 
-if ($GLOBALS['cfg']['CodemirrorEnable']) {
-    $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
-    $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
-}
-
 require_once 'libraries/server_common.inc.php';
 require_once 'libraries/sql_query_form.lib.php';
 
diff --git a/server_status.php b/server_status.php
@@ -430,8 +430,6 @@
  * JS Includes
  */
 
-// needed to decide whether to load codemirror.js in server_status.js
-PMA_AddJSVar('cfg_CodemirrorEnable', $GLOBALS['cfg']['CodemirrorEnable'] ? 1 : 0);
 $GLOBALS['js_include'][] = 'server_status.js';
 
 $GLOBALS['js_include'][] = 'jquery/jquery.tablesorter.js';
diff --git a/sql.php b/sql.php
@@ -21,12 +21,6 @@
 $GLOBALS['js_include'][] = 'indexes.js';
 $GLOBALS['js_include'][] = 'gis_data_editor.js';
 
-if ($GLOBALS['cfg']['CodemirrorEnable']) {
-    $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
-    $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
-}
-
-
 /**
  * Sets globals from $_POST
  */
diff --git a/tbl_export.php b/tbl_export.php
@@ -12,11 +12,6 @@
 
 $GLOBALS['js_include'][] = 'export.js';
 
-if ($GLOBALS['cfg']['CodemirrorEnable']) {
-    $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
-    $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
-}
-
 /**
  * Gets tables informations and displays top links
  */
diff --git a/tbl_replace.php b/tbl_replace.php
@@ -30,11 +30,6 @@
 // Needed for generation of Inline Edit anchors
 $GLOBALS['js_include'][] = 'sql.js';
 
-if ($GLOBALS['cfg']['CodemirrorEnable']) {
-    $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
-    $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
-}
-
 if (isset($_REQUEST['insert_rows'])
     && is_numeric($_REQUEST['insert_rows'])
     && $_REQUEST['insert_rows'] != $cfg['InsertRows']
diff --git a/tbl_sql.php b/tbl_sql.php
@@ -17,11 +17,6 @@
 $GLOBALS['js_include'][] = 'makegrid.js';
 $GLOBALS['js_include'][] = 'sql.js';
 
-if ($GLOBALS['cfg']['CodemirrorEnable']) {
-    $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
-    $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
-}
-
 require 'libraries/tbl_common.php';
 $url_query .= '&amp;goto=tbl_sql.php&amp;back=tbl_sql.php';
 
