gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

temporarily change loading mechanism, to enable Firebug tracing

Browse Source
This commit is contained in:
Marc Delisle 2012-09-16 08:28:29 -04:00
parent 4e80101320
commit eae555520c
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/server_status.js
View File

@ -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;

6
server_status.php
View File

@ -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
*/