From dd76c46c920b3e8976a2ed50e92d91b9845ec1aa Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 25 Mar 2012 22:51:07 +0530 Subject: [PATCH 1/4] Add missing semicolons --- js/navigation.js | 4 +-- js/server_privileges.js | 18 ++++++------- js/server_status.js | 6 ++--- js/server_status_monitor.js | 16 ++++++------ js/server_synchronize.js | 2 +- js/tbl_change.js | 4 +-- js/tbl_chart.js | 9 ++++--- js/tbl_select.js | 6 ++--- js/tbl_structure.js | 51 ++++++++++++++++++++----------------- js/update-location.js | 2 +- 10 files changed, 63 insertions(+), 55 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index 8e9b5aca91..337cb66173 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -67,9 +67,9 @@ function PMA_callFunctionDelayed(myfunction, delay) function PMA_saveFrameSizeReal() { if (parent.text_dir == 'ltr') { - pma_navi_width = parseInt(parent.document.getElementById('mainFrameset').cols) + pma_navi_width = parseInt(parent.document.getElementById('mainFrameset').cols); } else { - pma_navi_width = parent.document.getElementById('mainFrameset').cols.match(/\d+$/) + pma_navi_width = parent.document.getElementById('mainFrameset').cols.match(/\d+$/); } if ((pma_navi_width > 0) && (pma_navi_width != PMA_getCookie('pma_navi_width'))) { PMA_setCookie('pma_navi_width', pma_navi_width, expires); diff --git a/js/server_privileges.js b/js/server_privileges.js index 2c9e83a375..65feb11cf4 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -236,7 +236,7 @@ $(document).ready(function() { } else { PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); } - }) + }); }; button_options[PMA_messages['strCancel']] = function() { $(this).dialog("close"); }; @@ -332,13 +332,13 @@ $(document).ready(function() { .end() .find('tr:even') .removeClass('odd').addClass('even'); - }) + }); } else { PMA_ajaxShowMessage(data.error, false); } - }) // end $.post() - }) // end Revoke User + }); // end $.post() + }); // end Revoke User /** * AJAX handler for 'Edit User' @@ -382,8 +382,8 @@ $(document).ready(function() { displayPasswordGenerateButton(); PMA_ajaxRemoveMessage($msgbox); PMA_convertFootnotesToTooltips($div); - }) // end $.get() - }) + }); // end $.get() + }); /** * Step 2: Submit the Edit User Dialog @@ -462,7 +462,7 @@ $(document).ready(function() { PMA_ajaxShowMessage(data.error, false); } }); - }) + }); //end Edit user /** @@ -582,8 +582,8 @@ $(document).ready(function() { .siblings("h2").not(":first").remove(); PMA_ajaxRemoveMessage($msgbox); - }) // end $.get - })// end of the paginate users table + }); // end $.get + }); // end of the paginate users table /* * Additional confirmation dialog after clicking diff --git a/js/server_status.js b/js/server_status.js index 2a043eb6e6..4826ecc1c6 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -265,7 +265,7 @@ $(function() { }, error: function() { serverResponseError(); } } - } + }; setupLiveChart($tab, this, settings); if (tabstat == 'liveconnections') { @@ -631,7 +631,7 @@ $(function() { dlgBtns[PMA_messages['strClose']] = function() { $(this).dialog('close'); - } + }; $('#advisorInstructionsDialog').attr('title', PMA_messages['strAdvisorSystem']); $('#advisorInstructionsDialog').dialog({ @@ -674,7 +674,7 @@ $(function() { $.each(data.run.fired, function(key, value) { // recommendation may contain links, don't show those in overview table (clicking on them redirects the user) - rc_stripped = $.trim($('
').html(value.recommendation).text()) + rc_stripped = $.trim($('
').html(value.recommendation).text()); $tbody.append($tr = $('' + value.issue + '' + rc_stripped + ' ')); even = !even; diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 56044f0744..d0ec47a7de 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -250,7 +250,7 @@ $(function() { } // Icon graphics have zIndex 19, 20 and 21. Let's just hope nothing else has the same zIndex - $('table#chartGrid div svg').find('*[zIndex=20], *[zIndex=21], *[zIndex=19]').toggle(editMode) + $('table#chartGrid div svg').find('*[zIndex=20], *[zIndex=21], *[zIndex=19]').toggle(editMode); $('a[href="#endChartEditMode"]').toggle(editMode); @@ -564,7 +564,7 @@ $(function() { dlgBtns[PMA_messages['strCancel']] = function() { $(this).dialog('close'); - } + }; $('div#emptyDialog').dialog({ @@ -888,7 +888,7 @@ $(function() { - $('table#chartGrid td:nth-child(1)').offset().left, 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 */ @@ -973,7 +973,7 @@ $(function() { return { width: wdt, height: 0.75 * wdt - } + }; } /* Adds a chart to the chart grid */ @@ -1093,7 +1093,7 @@ $(function() { } // Edit, Print icon only in edit mode - $('table#chartGrid div svg').find('*[zIndex=20], *[zIndex=21], *[zIndex=19]').toggle(editMode) + $('table#chartGrid div svg').find('*[zIndex=20], *[zIndex=21], *[zIndex=19]').toggle(editMode); runtime.chartAI++; } @@ -1348,7 +1348,7 @@ $(function() { } $(this).dialog("close"); - } + }; $('#emptyDialog').dialog({ width: 'auto', @@ -1679,7 +1679,7 @@ $(function() { }, hide: { delay: 1000 } - }) + }); } $('div#logTable table').tablesorter({ @@ -1702,7 +1702,7 @@ $(function() { codemirror_editor.setValue(query); // Codemirror is bugged, it doesn't refresh properly sometimes. Following lines seem to fix that setTimeout(function() { - codemirror_editor.refresh() + codemirror_editor.refresh(); },50); var profilingChart = null; diff --git a/js/server_synchronize.js b/js/server_synchronize.js index a58253bb71..4a4b1c1288 100644 --- a/js/server_synchronize.js +++ b/js/server_synchronize.js @@ -314,7 +314,7 @@ function hideOrDisplayServerFields($server_selector, selected_option) $tbody.find('.server-socket').val(parts[2]); $tbody.find('.server-user').val(parts[3]); $tbody.find('.server-pass').val(''); - $tbody.find('.server-db').val(parts[4]) + $tbody.find('.server-db').val(parts[4]); } } diff --git a/js/tbl_change.js b/js/tbl_change.js index caa71f06fa..d70662ea8e 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -157,10 +157,10 @@ function verificationsAfterFieldChange(urlField, multi_edit, theType) var target = evt.target || evt.srcElement; // Unchecks the corresponding "NULL" control - $("input[name='fields_null[multi_edit][" + multi_edit + "][" + urlField + "]']").attr({'checked': false}); + $("input[name='fields_null[multi_edit][" + multi_edit + "][" + urlField + "]']").attr('checked', false); // Unchecks the Ignore checkbox for the current row - $("input[name='insert_ignore_" + multi_edit + "']").attr({'checked': false}); + $("input[name='insert_ignore_" + multi_edit + "']").attr('checked', false); var $this_input = $("input[name='fields[multi_edit][" + multi_edit + "][" + urlField + "]']"); // Does this field come from datepicker? diff --git a/js/tbl_chart.js b/js/tbl_chart.js index bec9a5cc59..3783fdae10 100644 --- a/js/tbl_chart.js +++ b/js/tbl_chart.js @@ -43,7 +43,7 @@ $(document).ready(function() { plotOptions: { series: {} } - } + }; $('#querychart').html(''); @@ -232,8 +232,11 @@ function PMA_queryChart(data,passedSettings) } }; - if(passedSettings.chart.type == 'pie') - settings.tooltip.formatter = function() { return ''+columnNames[0]+'
'+this.y; } + if(passedSettings.chart.type == 'pie') { + settings.tooltip.formatter = function() { + return ''+columnNames[0]+'
'+this.y; + }; + } // Overwrite/Merge default settings with passedsettings $.extend(true,settings,passedSettings); diff --git a/js/tbl_select.js b/js/tbl_select.js index ba144959a4..f782bf50da 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -65,7 +65,7 @@ $(document).ready(function() { .hide(); $('#togglesearchformlink') // always start with the Show message - .text(PMA_messages['strShowSearchCriteria']) + .text(PMA_messages['strShowSearchCriteria']); $('#togglesearchformdiv') // now it's time to show the div containing the link .show(); @@ -81,8 +81,8 @@ $(document).ready(function() { $("#sqlqueryresults").html(response['error']); } } - }) // end $.post() - }) + }); // end $.post() + }); // Following section is related to the 'function based search' for geometry data types. // Initialy hide all the open_gis_editor spans diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 80a8a72f29..757fade3fe 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -70,7 +70,7 @@ $(document).ready(function() { else { PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); } - }) // end $.get() + }); // end $.get() }); // end $.PMA_confirm() }) ; //end of Drop Column Anchor action @@ -112,9 +112,9 @@ $(document).ready(function() { else { PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); } - }) // end $.get() - }) // end $.PMA_confirm() - })//end Add Primary Key + }); // end $.get() + }); // end $.PMA_confirm() + }); //end Add Primary Key /** * Ajax Event handler for 'Drop Primary Key/Index' @@ -168,9 +168,9 @@ $(document).ready(function() { else { PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); } - }) // end $.get() - }) // end $.PMA_confirm() - }) //end Drop Primary Key/Index + }); // end $.get() + }); // end $.PMA_confirm() + }); //end Drop Primary Key/Index /** *Ajax event handler for multi column change @@ -280,11 +280,11 @@ $(document).ready(function() { } PMA_ajaxShowMessage($error, false); } - }) // end $.post() - } + }); // end $.post() + }; button_options[PMA_messages['strCancel']] = function() { $(this).dialog('close'); - } + }; var $msgbox = PMA_ajaxShowMessage(); $.get("tbl_indexes.php", url, function(data) { if (data.error) { @@ -323,7 +323,7 @@ $(document).ready(function() { // Focus the slider, otherwise it looks nearly transparent $('.ui-slider-handle').addClass('ui-state-focus'); } - }) // end $.get() + }); // end $.get() }); /** @@ -368,10 +368,14 @@ $(document).ready(function() { */ var button_options = {}; // in the following function we need to use $(this) - button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();} + button_options[PMA_messages['strCancel']] = function() { + $(this).dialog('close').remove(); + }; var button_options_error = {}; - button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();} + button_options_error[PMA_messages['strOK']] = function() { + $(this).dialog('close').remove(); + }; var $msgbox = PMA_ajaxShowMessage(); $.get( $form.attr('action') , $form.serialize()+"&ajax_request=true" , function(data) { @@ -386,7 +390,7 @@ $(document).ready(function() { open: PMA_verifyColumnsProperties, modal: true, buttons : button_options_error - })// end dialog options + }); // end dialog options } else { $div .append(data) @@ -405,12 +409,9 @@ $(document).ready(function() { PMA_convertFootnotesToTooltips($div); } PMA_ajaxRemoveMessage($msgbox); - }) // end $.get() + }); // end $.get() }); - - - -}) // end $(document).ready() +}); // end $(document).ready() /** * Loads the append_fields_form to the Change dialog allowing users @@ -437,10 +438,14 @@ function changeColumns(action,url) */ var button_options = {}; // in the following function we need to use $(this) - button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();} + button_options[PMA_messages['strCancel']] = function() { + $(this).dialog('close').remove(); + }; var button_options_error = {}; - button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();} + button_options_error[PMA_messages['strOK']] = function() { + $(this).dialog('close').remove(); + }; var $msgbox = PMA_ajaxShowMessage(); $.get( action , url , function(data) { @@ -455,7 +460,7 @@ function changeColumns(action,url) modal: true, open: PMA_verifyColumnsProperties, buttons : button_options_error - })// end dialog options + }); // end dialog options } else { $div .append(data) @@ -474,6 +479,6 @@ function changeColumns(action,url) PMA_convertFootnotesToTooltips($div); } PMA_ajaxRemoveMessage($msgbox); - }) // end $.get() + }); // end $.get() } diff --git a/js/update-location.js b/js/update-location.js index 18e9851c09..5aae07efbc 100644 --- a/js/update-location.js +++ b/js/update-location.js @@ -71,4 +71,4 @@ $(document).ready(function(){ } /* Indicate that we're done (and we are not going to change location */ hash_init_done = 1; -}) +}); From 965b6da54a5e83739edd6e6a2b292978b7cdedac Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 25 Mar 2012 23:05:59 +0530 Subject: [PATCH 2/4] Remove tab characters --- js/tbl_zoom_plot.js | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index 5605431f0f..48b1cafa8e 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -195,76 +195,76 @@ $(document).ready(function() { 'table' : window.parent.table, 'field' : $('#tableid_0').val(), 'it' : 0, - 'token' : window.parent.token, + 'token' : window.parent.token },function(data) { $('#tableFieldsId tr:eq(1) td:eq(0)').html(data.field_type); $('#tableFieldsId tr:eq(1) td:eq(1)').html(data.field_collation); $('#tableFieldsId tr:eq(1) td:eq(2)').html(data.field_operators); $('#tableFieldsId tr:eq(1) td:eq(3)').html(data.field_value); - xLabel = $('#tableid_0').val(); - $('#types_0').val(data.field_type); - $('#collations_0').val(data.field_collations); + xLabel = $('#tableid_0').val(); + $('#types_0').val(data.field_type); + $('#collations_0').val(data.field_collations); }); }); $('#tableid_1').change(function() { //AJAX request for field type, collation, operators, and value field - $.post('tbl_zoom_select.php',{ + $.post('tbl_zoom_select.php',{ 'ajax_request' : true, 'change_tbl_info' : true, 'db' : window.parent.db, 'table' : window.parent.table, 'field' : $('#tableid_1').val(), 'it' : 1, - 'token' : window.parent.token, + 'token' : window.parent.token },function(data) { $('#tableFieldsId tr:eq(3) td:eq(0)').html(data.field_type); $('#tableFieldsId tr:eq(3) td:eq(1)').html(data.field_collation); $('#tableFieldsId tr:eq(3) td:eq(2)').html(data.field_operators); $('#tableFieldsId tr:eq(3) td:eq(3)').html(data.field_value); - yLabel = $('#tableid_1').val(); - $('#types_1').val(data.field_type); - $('#collations_1').val(data.field_collations); + yLabel = $('#tableid_1').val(); + $('#types_1').val(data.field_type); + $('#collations_1').val(data.field_collations); }); }); $('#tableid_2').change(function() { //AJAX request for field type, collation, operators, and value field - $.post('tbl_zoom_select.php',{ + $.post('tbl_zoom_select.php',{ 'ajax_request' : true, 'change_tbl_info' : true, 'db' : window.parent.db, 'table' : window.parent.table, 'field' : $('#tableid_2').val(), 'it' : 2, - 'token' : window.parent.token, + 'token' : window.parent.token },function(data) { $('#tableFieldsId tr:eq(6) td:eq(0)').html(data.field_type); $('#tableFieldsId tr:eq(6) td:eq(1)').html(data.field_collation); $('#tableFieldsId tr:eq(6) td:eq(2)').html(data.field_operators); $('#tableFieldsId tr:eq(6) td:eq(3)').html(data.field_value); - $('#types_2').val(data.field_type); - $('#collations_2').val(data.field_collations); + $('#types_2').val(data.field_type); + $('#collations_2').val(data.field_collations); }); }); $('#tableid_3').change(function() { //AJAX request for field type, collation, operators, and value field - $.post('tbl_zoom_select.php',{ + $.post('tbl_zoom_select.php',{ 'ajax_request' : true, 'change_tbl_info' : true, 'db' : window.parent.db, 'table' : window.parent.table, 'field' : $('#tableid_3').val(), 'it' : 3, - 'token' : window.parent.token, + 'token' : window.parent.token },function(data) { $('#tableFieldsId tr:eq(8) td:eq(0)').html(data.field_type); $('#tableFieldsId tr:eq(8) td:eq(1)').html(data.field_collation); $('#tableFieldsId tr:eq(8) td:eq(2)').html(data.field_operators); $('#tableFieldsId tr:eq(8) td:eq(3)').html(data.field_value); - $('#types_3').val(data.field_type); - $('#collations_3').val(data.field_collations); + $('#types_3').val(data.field_type); + $('#collations_3').val(data.field_collations); }); }); From 807599910f3aacfb859d31c3efd7e38b943d305d Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 25 Mar 2012 23:12:01 +0530 Subject: [PATCH 3/4] Improve coding style --- js/tbl_chart.js | 98 ++++++++++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 38 deletions(-) diff --git a/js/tbl_chart.js b/js/tbl_chart.js index 3783fdae10..97bb92ace7 100644 --- a/js/tbl_chart.js +++ b/js/tbl_chart.js @@ -52,23 +52,27 @@ $(document).ready(function() { drawChart(); - if($(this).attr('value') == 'bar' || $(this).attr('value') == 'column') + if ($(this).attr('value') == 'bar' || $(this).attr('value') == 'column') { $('span.barStacked').show(); - else + } else { $('span.barStacked').hide(); + } }); $('input[name="barStacked"]').click(function() { - if(this.checked) - $.extend(true,currentSettings,{ plotOptions: { series: { stacking:'normal' } } }); - else - $.extend(true,currentSettings,{ plotOptions: { series: { stacking:null } } }); + if (this.checked) { + $.extend(true, currentSettings, { plotOptions: { series: { stacking:'normal' } } }); + } else { + $.extend(true, currentSettings, { plotOptions: { series: { stacking:null } } }); + } drawChart(); }); $('input[name="chartTitle"]').keyup(function() { var title = $(this).attr('value'); - if(title.length == 0) title = ' '; + if (title.length == 0) { + title = ' '; + } currentChart.setTitle({ text: title }); }); @@ -96,27 +100,38 @@ $(document).ready(function() { currentSettings.chart.width = $('#resizer').width() - 20; currentSettings.chart.height = $('#resizer').height() - 20; - if(currentChart != null) currentChart.destroy(); + if (currentChart != null) { + currentChart.destroy(); + } - if(noAnimation) currentSettings.plotOptions.series.animation = false; - currentChart = PMA_queryChart(chart_data,currentSettings); - if(noAnimation) currentSettings.plotOptions.series.animation = true; + if (noAnimation) { + currentSettings.plotOptions.series.animation = false; + } + currentChart = PMA_queryChart(chart_data, currentSettings); + if (noAnimation) { + currentSettings.plotOptions.series.animation = true; + } } drawChart(); $('#querychart').show(); }); -function in_array(element,array) +function in_array(element, array) { - for(var i=0; i < array.length; i++) - if(array[i] == element) return true; + for (var i = 0; i < array.length; i++) { + if (array[i] == element) { + return true; + } + } return false; } -function PMA_queryChart(data,passedSettings) +function PMA_queryChart(data, passedSettings) { - if($('#querychart').length == 0) return; + if ($('#querychart').length == 0) { + return; + } var columnNames = Array(); @@ -124,7 +139,7 @@ function PMA_queryChart(data,passedSettings) var xaxis = { type: 'linear' }; var yaxis = new Object(); - $.each(data[0],function(index,element) { + $.each(data[0], function(index, element) { columnNames.push(index); }); @@ -135,31 +150,34 @@ function PMA_queryChart(data,passedSettings) case 'bar': xaxis.categories = new Array(); - if(chart_series == 'columns') { + if (chart_series == 'columns') { var j = 0; - for(var i=0; i'+ this.point.name +'
'+ Highcharts.numberFormat(this.percentage, 2) +' %'; - } + return ''+ this.point.name +'
'+ Highcharts.numberFormat(this.percentage, 2) + ' %'; + } } } }, tooltip: { formatter: function() { - if(this.point.name) return ''+this.series.name+'
'+this.point.name+'
'+this.y; - return ''+this.series.name+'
'+this.y; + if (this.point.name) { + return '' + this.series.name + '
' + this.point.name+'
' + this.y; + } + return '' + this.series.name+'
'+this.y; } } }; - if(passedSettings.chart.type == 'pie') { + if (passedSettings.chart.type == 'pie') { settings.tooltip.formatter = function() { - return ''+columnNames[0]+'
'+this.y; + return '' + columnNames[0] + '
' + this.y; }; } // Overwrite/Merge default settings with passedsettings - $.extend(true,settings,passedSettings); + $.extend(true, settings, passedSettings); return PMA_createChart(settings); } From 767201774436fd579e0e87a1d17588b5a0a9fb37 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 25 Mar 2012 23:36:31 +0530 Subject: [PATCH 4/4] Coding style improvements for functions.js --- js/functions.js | 269 +++++++++++++++++++++++++----------------------- 1 file changed, 139 insertions(+), 130 deletions(-) diff --git a/js/functions.js b/js/functions.js index 07b4fcbc71..d8c30bcbc8 100644 --- a/js/functions.js +++ b/js/functions.js @@ -87,7 +87,7 @@ function suggestPassword(passwd_form) passwd.value = ''; for ( i = 0; i < passwordlength; i++ ) { - passwd.value += pwchars.charAt( Math.floor( Math.random() * pwchars.length ) ) + passwd.value += pwchars.charAt( Math.floor( Math.random() * pwchars.length ) ); } passwd_form.text_pma_pw.value = passwd.value; passwd_form.text_pma_pw2.value = passwd.value; @@ -193,8 +193,8 @@ function PMA_addDatepicker($this_element, options) // Fix wrong timepicker z-index, doesn't work without timeout setTimeout(function() { - $('#ui-timepicker-div').css('z-index',$('#ui-datepicker-div').css('z-index')) - },0); + $('#ui-timepicker-div').css('z-index',$('#ui-datepicker-div').css('z-index')); + }, 0); } }; @@ -480,7 +480,7 @@ function checkTableEditForm(theForm, fieldsCnt) { id = "#field_" + i + "_2"; elm = $(id); - val = elm.val() + val = elm.val(); if (val == 'VARCHAR' || val == 'CHAR' || val == 'BIT' || val == 'VARBINARY' || val == 'BINARY') { elm2 = $("#field_" + i + "_3"); val = parseInt(elm2.val()); @@ -524,7 +524,7 @@ $(document).ready(function() { * next pages reached via AJAX); a tr may have the class noclick to remove * this behavior. */ - $('table:not(.noclick) tr.odd:not(.noclick), table:not(.noclick) tr.even:not(.noclick)').live('click',function(e) { + $('table:not(.noclick) tr.odd:not(.noclick), table:not(.noclick) tr.even:not(.noclick)').live('click', function(e) { // do not trigger when clicked on anchor if ($(e.target).is('a, img, a *')) { return; @@ -684,7 +684,7 @@ function unMarkAllRows( container_id ) function setCheckboxes( container_id, state ) { - if(state) { + if (state) { $("#"+container_id).find("input:checkbox").attr('checked', 'checked'); } else { @@ -763,7 +763,7 @@ function insertQuery(queryType) query = "INSERT INTO `" + table + "`(" + chaineAj + ") VALUES (" + valDis + ")"; } else if (queryType == "update") { query = "UPDATE `" + table + "` SET " + editDis + " WHERE 1"; - } else if(queryType == "delete") { + } else if (queryType == "delete") { query = "DELETE FROM `" + table + "` WHERE 1"; } setQuery(query); @@ -781,7 +781,7 @@ function insertValueQuery() var myQuery = document.sqlform.sql_query; var myListBox = document.sqlform.dummy; - if(myListBox.options.length > 0) { + if (myListBox.options.length > 0) { sql_box_locked = true; var chaineAj = ""; var NbSelect = 0; @@ -844,9 +844,9 @@ function refreshDragOption(e) */ function refreshLayout() { - var elm = $('#pdflayout') + var elm = $('#pdflayout'); var orientation = $('#orientation_opt').val(); - if($('#paper_opt').length==1){ + if ($('#paper_opt').length==1) { var paper = $('#paper_opt').val(); }else{ var paper = 'A4'; @@ -872,11 +872,11 @@ function ToggleDragDrop(e) PDFinit(); /* Defined in pdf_pages.php */ elm.css('visibility', 'visible'); elm.css('display', 'block'); - $('#showwysiwyg').val('1') + $('#showwysiwyg').val('1'); } else { elm.css('visibility', 'hidden'); elm.css('display', 'none'); - $('#showwysiwyg').val('0') + $('#showwysiwyg').val('0'); } } @@ -1055,8 +1055,8 @@ function pdfPaperSize(format, axis) /** * Jquery Coding for inline editing SQL_QUERY */ -$(document).ready(function(){ - $(".inline_edit_sql").live('click', function(){ +$(document).ready(function() { + $(".inline_edit_sql").live('click', function() { if ($('#sql_query_edit').length) { // An inline query editor is already open, // we don't want another copy of it @@ -1085,7 +1085,7 @@ $(document).ready(function(){ codemirror_editor.getScrollerElement().style.height = height; codemirror_editor.refresh(); - $(".btnSave").click(function(){ + $(".btnSave").click(function() { if (codemirror_editor !== undefined) { var sql_query = codemirror_editor.getValue(); } else { @@ -1097,19 +1097,19 @@ $(document).ready(function(){ .append($('', {type: 'hidden', name: 'sql_query', value: sql_query})); $fake_form.appendTo($('body')).submit(); }); - $(".btnDiscard").click(function(){ + $(".btnDiscard").click(function() { $(this).closest(".sql").html("" + old_text + ""); }); return false; }); - $('.sqlbutton').click(function(evt){ + $('.sqlbutton').click(function(evt) { insertQuery(evt.target.id); return false; }); - $("#export_type").change(function(){ - if($("#export_type").val()=='svg'){ + $("#export_type").change(function() { + if ($("#export_type").val()=='svg') { $("#show_grid_opt").attr("disabled","disabled"); $("#orientation_opt").attr("disabled","disabled"); $("#with_doc").attr("disabled","disabled"); @@ -1118,7 +1118,7 @@ $(document).ready(function(){ $("#paper_opt").removeAttr("disabled","disabled"); $("#show_color_opt").removeAttr("disabled","disabled"); //$(this).css("background-color","yellow"); - }else if($("#export_type").val()=='dia'){ + } else if ($("#export_type").val()=='dia') { $("#show_grid_opt").attr("disabled","disabled"); $("#with_doc").attr("disabled","disabled"); $("#show_table_dim_opt").attr("disabled","disabled"); @@ -1126,7 +1126,7 @@ $(document).ready(function(){ $("#paper_opt").removeAttr("disabled","disabled"); $("#show_color_opt").removeAttr("disabled","disabled"); $("#orientation_opt").removeAttr("disabled","disabled"); - }else if($("#export_type").val()=='eps'){ + } else if ($("#export_type").val()=='eps') { $("#show_grid_opt").attr("disabled","disabled"); $("#orientation_opt").removeAttr("disabled"); $("#with_doc").attr("disabled","disabled"); @@ -1135,7 +1135,7 @@ $(document).ready(function(){ $("#paper_opt").attr("disabled","disabled"); $("#show_color_opt").attr("disabled","disabled"); - }else if($("#export_type").val()=='pdf'){ + } else if ($("#export_type").val()=='pdf') { $("#show_grid_opt").removeAttr("disabled"); $("#orientation_opt").removeAttr("disabled"); $("#with_doc").removeAttr("disabled","disabled"); @@ -1143,7 +1143,7 @@ $(document).ready(function(){ $("#all_table_same_wide").removeAttr("disabled","disabled"); $("#paper_opt").removeAttr("disabled","disabled"); $("#show_color_opt").removeAttr("disabled","disabled"); - }else{ + } else { // nothing } }); @@ -1362,10 +1362,14 @@ function PMA_createTableDialog( $div, url , target) */ var button_options = {}; // in the following function we need to use $(this) - button_options[PMA_messages['strCancel']] = function() {$(this).closest('.ui-dialog-content').dialog('close').remove();} + button_options[PMA_messages['strCancel']] = function() { + $(this).closest('.ui-dialog-content').dialog('close').remove(); + }; var button_options_error = {}; - button_options_error[PMA_messages['strOK']] = function() {$(this).closest('.ui-dialog-content').dialog('close').remove();} + button_options_error[PMA_messages['strOK']] = function() { + $(this).closest('.ui-dialog-content').dialog('close').remove(); + }; var $msgbox = PMA_ajaxShowMessage(); @@ -1479,7 +1483,7 @@ function PMA_createChart(passedSettings) // No realtime updates for graphs that are being exported, and disabled when realtime is not set // Also don't do live charting if we don't have the server time - if(thisChart.options.chart.forExport == true || + if (thisChart.options.chart.forExport == true || ! thisChart.options.realtime || ! thisChart.options.realtime.callback || ! server_time_diff) return; @@ -1492,7 +1496,7 @@ function PMA_createChart(passedSettings) try { curValue = jQuery.parseJSON(data); } catch (err) { - if(thisChart.options.realtime.error) + if (thisChart.options.realtime.error) thisChart.options.realtime.error(err); return; } @@ -1509,7 +1513,7 @@ function PMA_createChart(passedSettings) false ); - thisChart.options.realtime.callback(thisChart,curValue,lastValue,numLoadedPoints); + thisChart.options.realtime.callback(thisChart, curValue, lastValue, numLoadedPoints); lastValue = curValue; numLoadedPoints++; @@ -1524,7 +1528,7 @@ function PMA_createChart(passedSettings) thisChart.options.realtime.refreshRate ); }); - } + }; chart_activeTimeouts[container] = setTimeout(thisChart.options.realtime.timeoutCallBack, 5); } @@ -1565,29 +1569,29 @@ function PMA_createChart(passedSettings) enabled: true }, series: [] - } + }; /* Set/Get realtime chart default values */ - if(passedSettings.realtime) { - if(!passedSettings.realtime.refreshRate) { + if (passedSettings.realtime) { + if (!passedSettings.realtime.refreshRate) { passedSettings.realtime.refreshRate = 5000; } - if(!passedSettings.realtime.numMaxPoints) { + if (!passedSettings.realtime.numMaxPoints) { passedSettings.realtime.numMaxPoints = 30; } // Allow custom POST vars to be added - passedSettings.realtime.postData = $.extend(false,{ ajax_request: true, chart_data: 1, type: passedSettings.realtime.type },passedSettings.realtime.postData); + passedSettings.realtime.postData = $.extend(false, { ajax_request: true, chart_data: 1, type: passedSettings.realtime.type }, passedSettings.realtime.postData); - if(server_time_diff) { + if (server_time_diff) { settings.xAxis.min = new Date().getTime() - server_time_diff - passedSettings.realtime.numMaxPoints * passedSettings.realtime.refreshRate; settings.xAxis.max = new Date().getTime() - server_time_diff + passedSettings.realtime.refreshRate; } } // Overwrite/Merge default settings with passedsettings - $.extend(true,settings,passedSettings); + $.extend(true, settings, passedSettings); return new Highcharts.Chart(settings); } @@ -1627,7 +1631,7 @@ function PMA_createProfilingChart(data, options) return ''+ this.point.name +'
'+PMA_prettyProfilingNum(this.y)+'
('+Highcharts.numberFormat(this.percentage, 2) +' %)'; } } - },options)); + }, options)); } /** @@ -1642,7 +1646,7 @@ function PMA_prettyProfilingNum(num, acc) if (!acc) { acc = 2; } - acc = Math.pow(10,acc); + acc = Math.pow(10, acc); if (num * 1000 < 0.1) { num = Math.round(acc * (num * 1000 * 1000)) / acc + 'ยต'; } else if (num < 0.1) { @@ -1691,14 +1695,14 @@ function PMA_SQLPrettyPrint(string) while (! stream.eol()) { stream.start = stream.pos; token = mode.token(stream, state); - if(token != null) { + if (token != null) { tokens.push([token, stream.current().toLowerCase()]); } } var currentStatement = tokens[0][1]; - if(! statements[currentStatement]) { + if (! statements[currentStatement]) { return string; } // Holds all currently opened code blocks (statement, function or generic) @@ -1791,7 +1795,7 @@ function PMA_SQLPrettyPrint(string) output += "\n" + tabs(indentLevel + 1); } // Todo: Also split and or blocks in newlines & identation++ - //if(blockStack[0] == 'generic') + //if (blockStack[0] == 'generic') // output += ... } } @@ -1818,16 +1822,16 @@ jQuery.fn.PMA_confirm = function(question, url, callbackFn) { * dialog */ var button_options = {}; - button_options[PMA_messages['strOK']] = function(){ + button_options[PMA_messages['strOK']] = function() { $(this).dialog("close"); - if($.isFunction(callbackFn)) { + if ($.isFunction(callbackFn)) { callbackFn.call(this, url); } }; button_options[PMA_messages['strCancel']] = function() { $(this).dialog("close"); - } + }; $('
', {'id':'confirm_dialog'}) .prepend(question) @@ -1863,24 +1867,24 @@ jQuery.fn.PMA_sort_table = function(text_selector) { //get the text of the field that we will sort by $.each(rows, function(index, row) { row.sortKey = $.trim($(row).find(text_selector).text().toLowerCase()); - }) + }); //get the sorted order - rows.sort(function(a,b) { - if(a.sortKey < b.sortKey) { + rows.sort(function(a, b) { + if (a.sortKey < b.sortKey) { return -1; } - if(a.sortKey > b.sortKey) { + if (a.sortKey > b.sortKey) { return 1; } return 0; - }) + }); //pull out each row from the table and then append it according to it's order $.each(rows, function(index, row) { $(table_body).append(row); row.sortKey = null; - }) + }); //Re-check the classes of each row $(this).find('tr:odd') @@ -1888,8 +1892,8 @@ jQuery.fn.PMA_sort_table = function(text_selector) { .end() .find('tr:even') .removeClass('odd').addClass('even'); - }) -} + }); +}; /** * jQuery coding for 'Create Table'. Used on db_operations.php, @@ -1952,7 +1956,7 @@ $(document).ready(function() { PMA_prepareForAjaxRequest($form); //User wants to submit the form $.post($form.attr('action'), $form.serialize() + "&do_save_data=" + $(this).val(), function(data) { - if(data.success == true) { + if (data.success == true) { $('#properties_message') .removeClass('error') .html(''); @@ -2016,7 +2020,7 @@ $(document).ready(function() { // scroll to the div containing the error message $('#properties_message')[0].scrollIntoView(); } - }) // end $.post() + }); // end $.post() } // end if ($form.hasClass('ajax') else { // non-Ajax submit @@ -2024,7 +2028,7 @@ $(document).ready(function() { $form.submit(); } } // end if (checkTableEditForm() ) - }) // end create table form (save) + }); // end create table form (save) /** * Attach event handler for create table form (add fields) @@ -2058,9 +2062,9 @@ $(document).ready(function() { } PMA_verifyColumnsProperties(); PMA_ajaxRemoveMessage($msgbox); - }) //end $.post() + }); //end $.post() - }) // end create table form (add fields) + }); // end create table form (add fields) }, 'top.frame_content'); //end $(document).ready for 'Create Table' @@ -2127,14 +2131,14 @@ $(document).ready(function() { var $error = $temp_div.find(".error code").addClass("error"); PMA_ajaxShowMessage($error, false); } - }) // end $.post() + }); // end $.post() } else { // non-Ajax submit $form.append(''); $form.submit(); } } - }) // end change table button "do_save_data" + }); // end change table button "do_save_data" }, 'top.frame_content'); //end $(document).ready for 'Change Table' @@ -2166,12 +2170,12 @@ $(document).ready(function() { $("#result_query .notice").remove(); $("#result_query").prepend((data.message)); } else { - var $temp_div = $("
") + var $temp_div = $("
"); $temp_div.html(data.error); var $error = $temp_div.find("code").addClass("error"); PMA_ajaxShowMessage($error, false); } - }) // end $.post() + }); // end $.post() });//end of alterTableOrderby ajax submit /** @@ -2180,7 +2184,7 @@ $(document).ready(function() { $("#copyTable.ajax input[name='submit_copy']").live('click', function(event) { event.preventDefault(); var $form = $("#copyTable"); - if($form.find("input[name='switch_to_new']").attr('checked')) { + if ($form.find("input[name='switch_to_new']").attr('checked')) { $form.append(''); $form.removeClass('ajax'); $form.find("#ajax_request_hidden").remove(); @@ -2213,7 +2217,7 @@ $(document).ready(function() { var $error = $temp_div.find("code").addClass("error"); PMA_ajaxShowMessage($error, false); } - }) // end $.post() + }); // end $.post() } });//end of copyTable ajax submit @@ -2252,7 +2256,7 @@ $(document).ready(function() { var $error = $temp_div.find("code").addClass("error"); PMA_ajaxShowMessage($error, false); } - }) // end $.post() + }); // end $.post() });//end of table maintanance ajax click }, 'top.frame_content'); //end $(document).ready for 'Table operations' @@ -2278,17 +2282,17 @@ $(document).ready(function() { */ var question = PMA_messages['strDropDatabaseStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + '\n' + 'DROP DATABASE ' + escapeHtml(window.parent.db); - $(this).PMA_confirm(question, $(this).attr('href') ,function(url) { + $(this).PMA_confirm(question, $(this).attr('href'), function(url) { PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); $.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function(data) { //Database deleted successfully, refresh both the frames window.parent.refreshNavigation(); window.parent.refreshMain(); - }) // end $.get() + }); // end $.get() }); // end $.PMA_confirm() }); //end of Drop Database Ajax action -}) // end of $(document).ready() for Drop Database +}); // end of $(document).ready() for Drop Database /** * Attach Ajax event handlers for 'Create Database'. Used wherever libraries/ @@ -2308,7 +2312,7 @@ $(document).ready(function() { PMA_prepareForAjaxRequest($form); $.post($form.attr('action'), $form.serialize(), function(data) { - if(data.success == true) { + if (data.success == true) { PMA_ajaxShowMessage(data.message); //Append database's row to table @@ -2331,9 +2335,9 @@ $(document).ready(function() { else { PMA_ajaxShowMessage(data.error, false); } - }) // end $.post() - }) // end $().live() -}) // end $(document).ready() for Create Database + }); // end $.post() + }); // end $().live() +}); // end $(document).ready() for Create Database /** * Attach Ajax event handlers for 'Change Password' on main.php @@ -2344,7 +2348,7 @@ $(document).ready(function() { * Attach Ajax event handler on the change password anchor * @see $cfg['AjaxEnable'] */ - $('#change_password_anchor.dialog_active').live('click',function(event) { + $('#change_password_anchor.dialog_active').live('click', function(event) { event.preventDefault(); return false; }); @@ -2357,51 +2361,57 @@ $(document).ready(function() { var button_options = {}; button_options[PMA_messages['strGo']] = function() { - event.preventDefault(); + event.preventDefault(); - /** - * @var the_form Object referring to the change password form - */ - var the_form = $("#change_password_form"); + /** + * @var the_form Object referring to the change password form + */ + var the_form = $("#change_password_form"); - /** - * @var this_value String containing the value of the submit button. - * Need to append this for the change password form on Server Privileges - * page to work - */ - var this_value = $(this).val(); + /** + * @var this_value String containing the value of the submit button. + * Need to append this for the change password form on Server Privileges + * page to work + */ + var this_value = $(this).val(); - var $msgbox = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); - $(the_form).append(''); + var $msgbox = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); + $(the_form).append(''); - $.post($(the_form).attr('action'), $(the_form).serialize() + '&change_pw='+ this_value, function(data) { - if(data.success == true) { - $("#floating_menubar").after(data.sql_query); - $("#change_password_dialog").hide().remove(); - $("#edit_user_dialog").dialog("close").remove(); - $('#change_password_anchor.dialog_active').removeClass('dialog_active').addClass('ajax'); - PMA_ajaxRemoveMessage($msgbox); - } - else { - PMA_ajaxShowMessage(data.error, false); - } - }) // end $.post() + $.post($(the_form).attr('action'), $(the_form).serialize() + '&change_pw='+ this_value, function(data) { + if (data.success == true) { + $("#floating_menubar").after(data.sql_query); + $("#change_password_dialog").hide().remove(); + $("#edit_user_dialog").dialog("close").remove(); + $('#change_password_anchor.dialog_active').removeClass('dialog_active').addClass('ajax'); + PMA_ajaxRemoveMessage($msgbox); + } + else { + PMA_ajaxShowMessage(data.error, false); + } + }); // end $.post() + }; - } - button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();} + button_options[PMA_messages['strCancel']] = function() { + $(this).dialog('close').remove(); + }; $.get($(this).attr('href'), {'ajax_request': true}, function(data) { $('
') .dialog({ title: PMA_messages['strChangePassword'], width: 600, - close: function(ev,ui) {$(this).remove();}, + close: function(ev, ui) { + $(this).remove(); + }, buttons : button_options, - beforeClose: function(ev,ui){ $('#change_password_anchor.dialog_active').removeClass('dialog_active').addClass('ajax')} + beforeClose: function(ev, ui) { + $('#change_password_anchor.dialog_active').removeClass('dialog_active').addClass('ajax'); + } }) .append(data); displayPasswordGenerateButton(); - }) // end $.get() - }) // end handler for change password anchor + }); // end $.get() + }); // end handler for change password anchor /** * Attach Ajax event handler for Change Password form submission @@ -2409,7 +2419,7 @@ $(document).ready(function() { * @uses PMA_ajaxShowMessage() * @see $cfg['AjaxEnable'] */ -}) // end $(document).ready() for Change Password +}); // end $(document).ready() for Change Password /** * Toggle the hiding/showing of the "Open in ENUM/SET editor" message when @@ -2669,7 +2679,7 @@ function displayMoreTableOpts() { // Remove the actions from the table cells (they are available by default for JavaScript-disabled browsers) // if the table is not a view or information_schema (otherwise there is only one action to hide and there's no point) - if($("input[type='hidden'][name='table_type']").val() == "table") { + if ($("input[type='hidden'][name='table_type']").val() == "table") { var $table = $("table[id='tablestructure']"); $table.find("td.replaced_by_more").remove(); $table.find("th[class='action']").attr("colspan", 3); @@ -2702,7 +2712,7 @@ function displayMoreTableOpts() // When "more" is hovered over, show the hidden actions $table.find("td[class='more_opts']") .mouseenter(function() { - if($.browser.msie && $.browser.version == "6.0") { + if ($.browser.msie && $.browser.version == "6.0") { $("iframe[class='IE_hack']") .show() .width($after_field.width()+4) @@ -2715,7 +2725,7 @@ function displayMoreTableOpts() $(".structure_actions_dropdown").hide(); // Hide all the other ones that may be open $(this).children(".structure_actions_dropdown").show(); // Need to do this again for IE otherwise the offset is wrong - if($.browser.msie) { + if ($.browser.msie) { var left_offset_IE = $(this).offset().left + $(this).innerWidth() - $(this).children(".structure_actions_dropdown").innerWidth(); var top_offset_IE = $(this).offset().top + $(this).innerHeight(); $(this).children(".structure_actions_dropdown").offset({ @@ -2725,14 +2735,14 @@ function displayMoreTableOpts() }) .mouseleave(function() { $(this).children(".structure_actions_dropdown").hide(); - if($.browser.msie && $.browser.version == "6.0") { + if ($.browser.msie && $.browser.version == "6.0") { $("iframe[class='IE_hack']").hide(); } }); } } -$(document).ready(function(){ +$(document).ready(function() { PMA_convertFootnotesToTooltips(); }); @@ -3099,7 +3109,7 @@ var toggleButton = function ($obj) { var addClass = 'on'; } $.post(url, {'ajax_request': true}, function(data) { - if(data.success == true) { + if (data.success == true) { PMA_ajaxRemoveMessage($msg); $container .removeClass(removeClass) @@ -3139,7 +3149,7 @@ $(document).ready(function() { $('.vpointer').filter('.row_' + row_num).toggleClass('hover'); } ); -}) // end of $(document).ready() for vertical pointer +}); // end of $(document).ready() for vertical pointer $(document).ready(function() { /** @@ -3218,10 +3228,10 @@ $(document).ready(function() { /** * Enables the text generated by PMA_linkOrButton() to be clickable */ - $('a[class~="formLinkSubmit"]').live('click',function(e) { + $('a[class~="formLinkSubmit"]').live('click', function(e) { - if($(this).attr('href').indexOf('=') != -1) { - var data = $(this).attr('href').substr($(this).attr('href').indexOf('#')+1).split('=',2); + if ($(this).attr('href').indexOf('=') != -1) { + var data = $(this).attr('href').substr($(this).attr('href').indexOf('#')+1).split('=', 2); $(this).parents('form').append(''); } $(this).parents('form').submit(); @@ -3235,8 +3245,7 @@ $(document).ready(function() { window.parent.frame_navigation.PMA_reloadRecentTable(); } }); - -}) // end of $(document).ready() +}); // end of $(document).ready() /** * Creates a message inside an object with a sliding effect @@ -3335,17 +3344,17 @@ $(document).ready(function() { */ var question = PMA_messages['strDropTableStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + '\n' + 'DROP TABLE ' + window.parent.table; - $(this).PMA_confirm(question, $(this).attr('href') ,function(url) { + $(this).PMA_confirm(question, $(this).attr('href'), function(url) { PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); $.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function(data) { //Database deleted successfully, refresh both the frames window.parent.refreshNavigation(); window.parent.refreshMain(); - }) // end $.get() + }); // end $.get() }); // end $.PMA_confirm() }); //end of Drop Table Ajax action -}) // end of $(document).ready() for Drop Table +}); // end of $(document).ready() for Drop Table /** * Attach Ajax event handlers for Truncate Table. @@ -3366,7 +3375,7 @@ $(document).ready(function() { */ var question = PMA_messages['strTruncateTableStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + '\n' + 'TRUNCATE TABLE ' + window.parent.table; - $(this).PMA_confirm(question, $(this).attr('href') ,function(url) { + $(this).PMA_confirm(question, $(this).attr('href'), function(url) { PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); $.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function(data) { @@ -3381,15 +3390,15 @@ $(document).ready(function() { $("
").insertAfter("#floating_menubar"); $("#sqlqueryresults").html(data.sql_query); } else { - var $temp_div = $("
") + var $temp_div = $("
"); $temp_div.html(data.error); var $error = $temp_div.find("code").addClass("error"); PMA_ajaxShowMessage($error, false); } - }) // end $.get() + }); // end $.get() }); // end $.PMA_confirm() }); //end of Truncate Table Ajax action -}) // end of $(document).ready() for Truncate Table +}); // end of $(document).ready() for Truncate Table /** * Attach CodeMirror2 editor to SQL edit area. @@ -3444,7 +3453,7 @@ $(document).ready(function() { (function ($) { $.fn.filterByValue = function (value) { return this.filter(function () { - return $(this).val() === value + return $(this).val() === value; }); }; })(jQuery); @@ -3486,7 +3495,7 @@ function PMA_createqTip($elements, content, options) length: 200 } } - } + }; $elements.qtip($.extend(true, o, options)); } @@ -3506,7 +3515,7 @@ function PMA_getCellValue(td) { /* Loads a js file, an array may be passed as well */ loadJavascript=function(file) { - if($.isArray(file)) { + if ($.isArray(file)) { for(var i=0; i'); } @@ -3554,12 +3563,12 @@ $(document).ready(function() { * Clear text selection */ function PMA_clearSelection() { - if(document.selection && document.selection.empty) { + if (document.selection && document.selection.empty) { document.selection.empty(); - } else if(window.getSelection) { + } else if (window.getSelection) { var sel = window.getSelection(); - if(sel.empty) sel.empty(); - if(sel.removeAllRanges) sel.removeAllRanges(); + if (sel.empty) sel.empty(); + if (sel.removeAllRanges) sel.removeAllRanges(); } }