diff --git a/js/server_status.js b/js/server_status.js index 264f5a6a76..428f594930 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -163,10 +163,15 @@ $(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', + //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([ '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']); + 'js/codemirror/lib/codemirror.js', 'js/codemirror/mode/mysql/mysql.js' + ]); }, 50); monitorLoaded = true; diff --git a/server_status.php b/server_status.php index fe701064a7..65a4fcb5ed 100644 --- a/server_status.php +++ b/server_status.php @@ -440,6 +440,12 @@ $GLOBALS['js_include'][] = 'jqplot/plugins/jqplot.highlighter.js'; $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 */