From d876574e61e413cca6906da7c208c1d3c8ae34d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 15 Jan 2013 09:08:39 +0100 Subject: [PATCH] Whitespace cleanup --- js/server_status_monitor.js | 240 ++++++++++++++++++------------------ 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 152a6b3385..610e7286a1 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -14,15 +14,15 @@ $(function() { $('div#logAnalyseDialog .datetimefield').each(function() { PMA_addDatepicker($(this)); }); - + /**** Monitor charting implementation ****/ /* Saves the previous ajax response for differential values */ var oldChartData = null; // Holds about to created chart var newChart = null; var chartSpacing; - - // Whenever the monitor object (runtime.charts) or the settings object (monitorSettings) + + // Whenever the monitor object (runtime.charts) or the settings object (monitorSettings) // changes in a way incompatible to the previous version, increase this number // It will reset the users monitor and settings object in his localStorage to the default configuration var monitorProtocolVersion = '1.0'; @@ -47,7 +47,7 @@ $(function() { xmin: -1, xmax: -1 }; - + var monitorSettings = null; var defaultMonitorSettings = { @@ -61,7 +61,7 @@ $(function() { // Allows drag and drop rearrange and print/edit icons on charts var editMode = false; - + /* List of preconfigured charts that the user may select */ var presetCharts = { // Query cache efficiency @@ -97,14 +97,14 @@ $(function() { // chart tooltip var tooltipBox; - + /* Add OS specific system info charts to the preset chart list */ switch(server_os) { - case 'WINNT': - $.extend(presetCharts, { + case 'WINNT': + $.extend(presetCharts, { 'cpu': { title: PMA_messages['strSystemCPUUsage'], - series: [ { + series: [ { label: PMA_messages['strAverageLoad'] } ], nodes: [ { @@ -112,7 +112,7 @@ $(function() { } ], maxYLabel: [] }, - + 'memory': { title: PMA_messages['strSystemMemory'], series: [ { @@ -130,7 +130,7 @@ $(function() { ], maxYLabel: [] }, - + 'swap': { title: PMA_messages['strSystemSwap'], series: [ { @@ -149,7 +149,7 @@ $(function() { } }); break; - + case 'Linux': $.extend(presetCharts, { 'cpu': { @@ -192,12 +192,12 @@ $(function() { } }); break; - + case 'SunOS': $.extend(presetCharts, { 'cpu': { title: PMA_messages['strSystemCPUUsage'], - series: [ { + series: [ { label: PMA_messages['strAverageLoad'] } ], nodes: [ { @@ -409,7 +409,7 @@ $(function() { // To many cells in one row => put into next row $tr.find('td').each(function() { if (numColumns > monitorSettings.columns) { - if ($tr.next().length == 0) { + if ($tr.next().length == 0) { $tr.after(''); } $tr.next().prepend($(this)); @@ -505,14 +505,14 @@ $(function() { $(this).dialog("close"); }; - + dlgButtons[PMA_messages['strClose']] = function() { newChart = null; $('span#clearSeriesLink').hide(); $('#seriesPreview').html(''); $(this).dialog("close"); }; - + var $presetList = $('div#addChartDialog select[name="presetCharts"]'); if ($presetList.html().length == 0) { $.each(presetCharts, function(key, value) { @@ -523,7 +523,7 @@ $(function() { $('input[name="chartTitle"]').attr('value', presetCharts[$(this).prop('value')].title); }); } - + $('div#addChartDialog').dialog({ width: 'auto', height: 'auto', @@ -534,7 +534,7 @@ $(function() { return false; }); - + $('a[href="#exportMonitorConfig"]').click(function() { var gridCopy = {}; @@ -544,15 +544,15 @@ $(function() { gridCopy[key].settings = elem.settings; gridCopy[key].title = elem.title; }); - + var exportData = { monitorCharts: gridCopy, monitorSettings: monitorSettings }; var $form; - + $('body').append($form = $('
')); - + $form.append(''); $form.submit(); $form.remove(); @@ -562,16 +562,16 @@ $(function() { $('div#emptyDialog').dialog({title: PMA_messages['strImportDialogTitle']}); $('div#emptyDialog').html(PMA_messages['strImportDialogMessage'] + ':
' + '
'); - + var dlgBtns = {}; - + dlgBtns[PMA_messages['strImport']] = function() { var $iframe, $form; $('body').append($iframe = $('')); var d = $iframe[0].contentWindow.document; d.open(); d.close(); mew = d; - + $iframe.load(function() { var json; @@ -585,14 +585,14 @@ $(function() { $('div#emptyDialog').dialog('close'); return; } - + // Basic check, is this a monitor config json? if (!json || ! json.monitorCharts || ! json.monitorCharts) { alert(PMA_messages['strFailedParsingConfig']); $('div#emptyDialog').dialog('close'); return; } - + // If json ok, try applying config try { window.localStorage['monitorCharts'] = $.toJSON(json.monitorCharts); @@ -605,20 +605,20 @@ $(function() { window.localStorage.removeItem('monitorSettings'); rebuildGrid(); } - + $('div#emptyDialog').dialog('close'); }); - + $("body", d).append($form = $('div#emptyDialog').find('form')); $form.submit(); $('div#emptyDialog').append(''); }; - + dlgBtns[PMA_messages['strCancel']] = function() { $(this).dialog('close'); } - - + + $('div#emptyDialog').dialog({ width: 'auto', height: 'auto', @@ -647,7 +647,7 @@ $(function() { } return false; }); - + $('a[href="#monitorInstructionsDialog"]').click(function() { var $dialog = $('div#monitorInstructionsDialog'); @@ -699,7 +699,7 @@ $(function() { + $.sprintf(PMA_messages['strSmallerLongQueryTimeAdvice'], logVars['long_query_time']) + '
'; } - + if (logVars['long_query_time'] < 2) { str += PMA_getImage('s_success.png') + ' ' + $.sprintf(PMA_messages['strLongQueryTimeSet'], logVars['long_query_time']) @@ -718,7 +718,7 @@ $(function() { if (logVars['log_output'] == 'TABLE') { varValue = 'FILE'; } - + str += '- ' + $.sprintf(PMA_messages['strSetLogOutput'], varValue) + '
'; @@ -772,8 +772,8 @@ $(function() { } ); }; - - + + loadLogVars(); return false; @@ -782,7 +782,7 @@ $(function() { $('input[name="chartType"]').change(function() { $('#chartVariableSettings').toggle(this.checked && this.value == 'variable'); var title = $('input[name="chartTitle"]').attr('value'); - if (title == PMA_messages['strChartTitle'] + if (title == PMA_messages['strChartTitle'] || title == $('label[for="' + $('input[name="chartTitle"]').data('lastRadio') + '"]').text() ) { $('input[name="chartTitle"]') @@ -831,7 +831,7 @@ $(function() { if ($('input#variableInput').attr('value').length == 0) { return false; } - + if (newChart == null) { $('#seriesPreview').html(''); @@ -905,11 +905,11 @@ $(function() { var dlgBtns = {}; dlgBtns[PMA_messages['strClose']] = function() { $(this).dialog('close'); }; - $('div#emptyDialog').dialog({ + $('div#emptyDialog').dialog({ width: 400, - buttons: dlgBtns + buttons: dlgBtns }); - } + } } if (runtime.charts == null) { @@ -934,13 +934,13 @@ $(function() { /* Calculate how much spacing there is between each chart */ $('table#chartGrid').html(''); chartSpacing = { - width: $('table#chartGrid td:nth-child(2)').offset().left + width: $('table#chartGrid td:nth-child(2)').offset().left - $('table#chartGrid td:nth-child(1)').offset().left, - height: $('table#chartGrid tr:nth-child(2) td:nth-child(2)').offset().top + height: $('table#chartGrid tr:nth-child(2) td:nth-child(2)').offset().top - $('table#chartGrid tr:nth-child(1) td:nth-child(1)').offset().top } $('table#chartGrid').html(''); - + /* Add all charts - in correct order */ var keys = []; $.each(runtime.charts, function(key, value) { @@ -959,11 +959,11 @@ $(function() { // Empty cells should keep their size so you can drop onto them $('table#chartGrid tr td').css('width', chartSize().width + 'px'); - + buildRequiredDataList(); refreshChartGrid(); } - + /* Destroys all monitor related resources */ function destroyGrid() { if (runtime.charts) { @@ -973,22 +973,22 @@ $(function() { } catch(err) {} }); } - + try { runtime.refreshRequest.abort(); } catch(err) {} - try { + try { clearTimeout(runtime.refreshTimeout); } catch(err) {} - + $('table#chartGrid').html(''); runtime.charts = null; runtime.chartAI = 0; monitorSettings = null; } - - /* Calls destroyGrid() and initGrid(), but before doing so it saves the chart + + /* Calls destroyGrid() and initGrid(), but before doing so it saves the chart * data from each chart and restores it after the monitor is initialized again */ function rebuildGrid() { var oldData = null; @@ -1002,10 +1002,10 @@ $(function() { } }); } - + destroyGrid(); initGrid(); - + if (oldData) { $.each(runtime.charts, function(key, chartObj) { for (var j = 0; j < chartObj.nodes.length; j++) { @@ -1014,7 +1014,7 @@ $(function() { } } }); - } + } } /* Calculactes the dynamic chart size that depends on the column width */ @@ -1211,7 +1211,7 @@ $(function() { if (! htmlnode ) { return; } - + var chart = null; var chartKey = null; $.each(runtime.charts, function(key, value) { @@ -1221,7 +1221,7 @@ $(function() { return false; } }); - + if (chart == null) { return; } @@ -1231,18 +1231,18 @@ $(function() { for (var i = 0; i
'; } - + dlgBtns = {}; dlgBtns[PMA_messages['strSave']] = function() { runtime.charts[chartKey].title = $('div#emptyDialog input[name="chartTitle"]').attr('value'); runtime.charts[chartKey].chart.setTitle({ text: runtime.charts[chartKey].title }); - + $('div#emptyDialog input[name*="chartSerie"]').each(function() { var idx = $(this).attr('name').split('-')[1]; runtime.charts[chartKey].nodes[idx].name = $(this).attr('value'); runtime.charts[chartKey].chart.series[idx].name = $(this).attr('value'); }); - + $(this).dialog('close'); saveMonitor(); }; @@ -1271,7 +1271,7 @@ $(function() { loadLog('slow', min, max); $(this).dialog("close"); }; - + dlgBtns[PMA_messages['strFromGeneralLog']] = function() { loadLog('general', min, max); $(this).dialog("close"); @@ -1296,15 +1296,15 @@ $(function() { limitTypes: $('input#limitTypes').prop('checked') }); } - - + + /* Removes a chart from the grid */ function removeChart(chartObj) { var htmlnode = chartObj.options.chart.renderTo; if (! htmlnode ) { return; } - + $.each(runtime.charts, function(key, value) { if (value.chart.options.chart.renderTo == htmlnode) { delete runtime.charts[key]; @@ -1328,10 +1328,10 @@ $(function() { function refreshChartGrid() { /* Send to server */ runtime.refreshRequest = $.post('server_status.php?' + url_query, { - ajax_request: true, - chart_data: 1, - type: 'chartgrid', - requiredData: $.toJSON(runtime.dataList) + ajax_request: true, + chart_data: 1, + type: 'chartgrid', + requiredData: $.toJSON(runtime.dataList) }, function(data) { var chartData; try { @@ -1341,7 +1341,7 @@ $(function() { } var value, i = 0; var diff; - + /* Update values in each graph */ $.each(runtime.charts, function(orderKey, elem) { var key = elem.chartID; @@ -1366,7 +1366,7 @@ $(function() { //elem.chart.xAxis[0].setExtremes(runtime.xmin, runtime.xmax, false); /* Calculate y value */ - + // If transform function given, use it if (elem.nodes[j].transformFn) { value = chartValueTransform( @@ -1382,7 +1382,7 @@ $(function() { value = parseFloat(chartData[key][j][0].value); if (elem.nodes[j].display == 'differential') { - if (oldChartData == null || oldChartData[key] == null) { + if (oldChartData == null || oldChartData[key] == null) { continue; } value -= oldChartData[key][j][0].value; @@ -1392,7 +1392,7 @@ $(function() { value = value / elem.nodes[j].valueDivisor; } } - + // Set y value, if defined if (value != undefined) { elem.chart.series[j].data.push([chartData.x, value]); @@ -1432,9 +1432,9 @@ $(function() { runtime.refreshTimeout = setTimeout(refreshChartGrid, monitorSettings.gridRefresh); }); } - + /* Function that supplies special value transform functions for chart values */ - function chartValueTransform(name, cur, prev) { + function chartValueTransform(name, cur, prev) { switch(name) { case 'cpu-linux': if (prev == null) { @@ -1474,7 +1474,7 @@ $(function() { */ function buildRequiredDataList() { runtime.dataList = {}; - // Store an own id, because the property name is subject of reordering, + // Store an own id, because the property name is subject of reordering, // thus destroying our mapping with runtime.charts <=> runtime.dataList var chartID = 0; $.each(runtime.charts, function(key, chart) { @@ -1498,10 +1498,10 @@ $(function() { if (! opts.limitTypes) { opts.limitTypes = false; } - + $('#emptyDialog').dialog({title: PMA_messages['strAnalysingLogsTitle']}); - $('#emptyDialog').html(PMA_messages['strAnalysingLogs'] + - ' '); var dlgBtns = {}; @@ -1529,14 +1529,14 @@ $(function() { removeVariables: opts.removeVariables, limitTypes: opts.limitTypes }, - function(data) { + function(data) { var logData; try { logData = $.parseJSON(data); } catch(err) { return serverResponseError(); } - + if (logData.rows.length != 0) { runtime.logDataCols = buildLogTable(logData); @@ -1585,26 +1585,26 @@ $(function() { $(this).dialog("close"); $(document).scrollTop($('div#logTable').offset().top); }; - + $('#emptyDialog').dialog( "option", "buttons", dlgBtns); - + } else { $('#emptyDialog').dialog({title: PMA_messages['strNoDataFoundTitle']}); $('#emptyDialog').html('

' + PMA_messages['strNoDataFound'] + '

'); - + var dlgBtns = {}; - dlgBtns[PMA_messages['strClose']] = function() { - $(this).dialog("close"); + dlgBtns[PMA_messages['strClose']] = function() { + $(this).dialog("close"); }; - + $('#emptyDialog').dialog( "option", "buttons", dlgBtns ); } } ); - /* Handles the actions performed when the user uses any of the log table filters + /* Handles the actions performed when the user uses any of the log table filters * which are the filter by name and grouping with ignoring data in WHERE clauses - * + * * @param boolean Should be true when the users enabled or disabled to group queries ignoring data in WHERE clauses */ function filterQueries(varFilterChange) { @@ -1616,7 +1616,7 @@ $(function() { } else { textFilter = new RegExp(val, 'i'); } - + var rowSum = 0, totalSum = 0, i = 0, q; var noVars = $('div#logTable input#noWHEREData').attr('checked'); var equalsFilter = /([^=]+)=(\d+|((\'|"|).*?[^\\])\4((\s+)|$))/gi; @@ -1627,7 +1627,7 @@ $(function() { var sumColumnName = runtime.logDataCols[runtime.logDataCols.length - 1]; var isSlowLog = opts.src == 'slow'; var columnSums = {}; - + // For the slow log we have to count many columns (query_time, lock_time, rows_examined, rows_sent, etc.) var countRow = function(query, row) { var cells = row.match(/(.*?)<\/td>/gi); @@ -1642,15 +1642,15 @@ $(function() { columnSums[query][2] += parseInt(cells[4].replace(/(|<\/td>)/gi, '')); columnSums[query][3] += parseInt(cells[5].replace(/(|<\/td>)/gi, '')); }; - + // We just assume the sql text is always in the second last column, and that the total count is right of it $('div#logTable table tbody tr td:nth-child(' + (runtime.logDataCols.length - 1) + ')').each(function() { - // If query is a SELECT and user enabled or disabled to group queries ignoring data in where statements, we + // If query is a SELECT and user enabled or disabled to group queries ignoring data in where statements, we // need to re-calculate the sums of each row if (varFilterChange && $(this).html().match(/^SELECT/i)) { if (noVars) { // Group on => Sum up identical columns, and hide all but 1 - + q = $(this).text().replace(equalsFilter, '$1=...$6').trim(); q = q.replace(functionFilter, ' $1(...)'); @@ -1712,7 +1712,7 @@ $(function() { hide = false; i++; }); - + // We finished summarizing counts => Update count values of all grouped entries if (varFilterChange) { if (noVars) { @@ -1721,11 +1721,11 @@ $(function() { if (filteredQueries[key] <= 1) { return; } - + row = $table.children('tr:nth-child(' + (value + 1) + ')'); numCol = row.children(':nth-child(' + (runtime.logDataCols.length) + ')'); numCol.text(filteredQueries[key]); - + if (isSlowLog) { row.children('td:nth-child(3)').text(secToTime(columnSums[key][0])); row.children('td:nth-child(4)').text(secToTime(columnSums[key][1])); @@ -1734,9 +1734,9 @@ $(function() { } }); } - - $('div#logTable table').trigger("update"); - setTimeout(function() { + + $('div#logTable table').trigger("update"); + setTimeout(function() { $('div#logTable table').trigger('sorton', [[[runtime.logDataCols.length - 1, 1]]]); }, 0); } @@ -1754,14 +1754,14 @@ $(function() { var time = timeStr.split(':'); return parseInt(time[0]*3600) + parseInt(time[1]*60) + parseInt(time[2]); } - + /* Turns a number into a timespan (100 into 00:01:40) */ function secToTime(timeInt) { hours = Math.floor(timeInt / 3600); timeInt -= hours*3600; minutes = Math.floor(timeInt / 60); timeInt -= minutes*60; - + if (hours < 10) { hours = '0' + hours; } @@ -1771,10 +1771,10 @@ $(function() { if (timeInt < 10) { timeInt = '0' + timeInt; } - + return hours + ':' + minutes + ':' + timeInt; } - + /* Constructs the log table out of the retrieved server data */ function buildLogTable(data) { var rows = data.rows; @@ -1791,7 +1791,7 @@ $(function() { } return value; }; - + for (var i = 0; i < rows.length; i++) { if (i == 0) { $.each(rows[0], function(key, value) { @@ -1856,7 +1856,7 @@ $(function() { return cols; } - + /* Opens the query analyzer dialog */ function openQueryAnalyzer() { var rowData = $(this).parent().data('query'); @@ -1871,11 +1871,11 @@ $(function() { var profilingChart = null; var dlgBtns = {}; - - dlgBtns[PMA_messages['strAnalyzeQuery']] = function() { - loadQueryAnalysis(rowData); + + dlgBtns[PMA_messages['strAnalyzeQuery']] = function() { + loadQueryAnalysis(rowData); }; - dlgBtns[PMA_messages['strClose']] = function() { + dlgBtns[PMA_messages['strClose']] = function() { if (profilingChart != null) { profilingChart.destroy(); } @@ -1891,13 +1891,13 @@ $(function() { buttons: dlgBtns }); } - + /* Loads and displays the analyzed query data */ function loadQueryAnalysis(rowData) { var db = rowData.db || ''; - + $('div#queryAnalyzerDialog div.placeHolder').html( - PMA_messages['strAnalyzing'] + ' '); $.post('server_status.php?' + url_query, { @@ -1917,7 +1917,7 @@ $(function() { // Float sux, I'll use table :( $('div#queryAnalyzerDialog div.placeHolder') .html('
'); - + var explain = '' + PMA_messages['strExplainOutput'] + ' ' + explain_docu; if (data.explain.length > 1) { explain += ' ('; @@ -1934,7 +1934,7 @@ $(function() { explain += '
0? 'style="display:none;"' : '' ) + '>'; $.each(data.explain[i], function(key, value) { value = (value == null)?'null':value; - + if (key == 'type' && value.toLowerCase() == 'all') { value = '' + value + ''; } @@ -1945,17 +1945,17 @@ $(function() { }); explain += '
'; } - + explain += '

' + PMA_messages['strAffectedRows'] + ' ' + data.affectedRows; $('div#queryAnalyzerDialog div.placeHolder td.explain').append(explain); - + $('div#queryAnalyzerDialog div.placeHolder a[href*="#showExplain"]').click(function() { var id = $(this).attr('href').split('-')[1]; $(this).parent().find('div[class*="explain"]').hide(); $(this).parent().find('div[class*="explain-' + id + '"]').show(); }); - + if (data.profiling) { var chartData = []; var numberTable = ''; @@ -1971,12 +1971,12 @@ $(function() { } numberTable += ''; numberTable += '
' + PMA_messages['strStatus'] + '' + PMA_messages['strTime'] + '
' + PMA_messages['strTotalTime'] + '' + PMA_prettyProfilingNum(totalTime, 2) + '
'; - + $('div#queryAnalyzerDialog div.placeHolder td.chart').append( '' + PMA_messages['strProfilingResults'] + ' ' + profiling_docu + ' ' + '(' + PMA_messages['strTable'] + ', ' + PMA_messages['strChart'] + ')
' + numberTable + '

'); - + $('div#queryAnalyzerDialog div.placeHolder a[href="#showNums"]').click(function() { $('div#queryAnalyzerDialog div#queryProfiling').hide(); $('div#queryAnalyzerDialog table.queryNums').show(); @@ -1990,7 +1990,7 @@ $(function() { }); profilingChart = PMA_createProfilingChartJqplot( - 'queryProfiling', + 'queryProfiling', chartData );