Re-enable javascript loading for monitor tab

phpmyadmin · Sep 16, 2012 · 5957570 · 5957570
1 parent 50f0c43
commit 5957570
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/js/server_status.js b/js/server_status.js
@@ -163,15 +163,10 @@ $(function() {
                 );
                 // Delay loading a bit so the tab loads and the user gets to see a ajax loading icon
                 setTimeout(function() {
-                    //loadJavascript(['js/jquery/timepicker.js', 'js/jquery/jquery.json-2.2.js',
-                    //                'js/jquery/jquery.sprintf.js', 'js/jquery/jquery.sortableTable.js',
-                    //                'js/codemirror/lib/codemirror.js', 'js/codemirror/mode/mysql/mysql.js',
-                    //                'js/server_status_monitor.js']);
-                //}, 50);
-                    loadJavascript([
+                    loadJavascript(['js/jquery/timepicker.js', 'js/jquery/jquery.json-2.2.js',
                                     'js/jquery/jquery.sprintf.js', 'js/jquery/jquery.sortableTable.js',
-                                    'js/codemirror/lib/codemirror.js', 'js/codemirror/mode/mysql/mysql.js'
-                                    ]);
+                                    'js/codemirror/lib/codemirror.js', 'js/codemirror/mode/mysql/mysql.js',
+                                    'js/server_status_monitor.js']);
                 }, 50);
 
                 monitorLoaded = true;

diff --git a/server_status.php b/server_status.php
@@ -440,12 +440,6 @@
 $GLOBALS['js_include'][] = 'jqplot/plugins/jqplot.cursor.js';
 $GLOBALS['js_include'][] = 'date.js';
 
-// temporarily load this here, to be able to follow via Firebug
-//
-$GLOBALS['js_include'][] = 'jquery/timepicker.js';
-$GLOBALS['js_include'][] = 'jquery/jquery.json-2.2.js';
-$GLOBALS['js_include'][] = 'server_status_monitor.js';
-
 /**
  * flush status variables if requested
  */