From 5957570bf54043ef0b2c0281550959ca10a02937 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Mon, 17 Sep 2012 02:46:36 +0530 Subject: [PATCH] Re-enable javascript loading for monitor tab --- js/server_status.js | 11 +++-------- server_status.php | 6 ------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/js/server_status.js b/js/server_status.js index 428f59493056..264f5a6a76c0 100644 --- 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 index 65a4fcb5edd7..fe701064a731 100644 --- 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 */