').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..97bb92ace7 100644
--- a/js/tbl_chart.js
+++ b/js/tbl_chart.js
@@ -43,7 +43,7 @@ $(document).ready(function() {
plotOptions: {
series: {}
}
- }
+ };
$('#querychart').html('');
@@ -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')
- 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);
+ $.extend(true, settings, passedSettings);
return PMA_createChart(settings);
}
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/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);
});
});
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;
-})
+});