Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/db_central_columns.js8
-rw-r--r--js/error_report.js2
-rw-r--r--js/navigation.js2
-rw-r--r--js/normalization.js4
-rw-r--r--js/pmd/move.js1
-rw-r--r--js/sql.js2
-rw-r--r--js/tbl_gis_visualization.js4
-rw-r--r--setup/scripts.js4
8 files changed, 14 insertions, 13 deletions
diff --git a/js/db_central_columns.js b/js/db_central_columns.js
index affc380e67..3e9f062042 100644
--- a/js/db_central_columns.js
+++ b/js/db_central_columns.js
@@ -95,7 +95,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
$.uiTableFilter($("#table_columns"), $(this).val(), cols, null, "td span");
});
$('.edit').click(function() {
- rownum = $(this).parent().data('rownum');
+ var rownum = $(this).parent().data('rownum');
$('#save_' + rownum).show();
$(this).hide();
$('#f_' + rownum + ' td span').hide();
@@ -114,7 +114,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
var $td = $(this);
var question = PMA_messages.strDeleteCentralColumnWarning;
$td.PMA_confirm(question, null, function (url) {
- rownum = $td.data('rownum');
+ var rownum = $td.data('rownum');
$("#del_col_name").val("selected_fld%5B%5D="+$('#checkbox_row_' + rownum ).val());
$("#del_form").submit();
});
@@ -122,7 +122,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
$('.edit_cancel_form').click(function(event) {
event.preventDefault();
event.stopPropagation();
- rownum = $(this).data('rownum');
+ var rownum = $(this).data('rownum');
$('#save_' + rownum).hide();
$('#edit_' + rownum).show();
$('#f_' + rownum + ' td span').show();
@@ -133,7 +133,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
//alert(1);
event.preventDefault();
event.stopPropagation();
- rownum = $(this).data('rownum');
+ var rownum = $(this).data('rownum');
$('#f_' + rownum + ' td').each(function() {
if ($(this).attr('name') !== 'undefined') {
$(this).find(':input[type!="hidden"],select:first')
diff --git a/js/error_report.js b/js/error_report.js
index 4d16a23c09..b2d87d67e5 100644
--- a/js/error_report.js
+++ b/js/error_report.js
@@ -68,7 +68,7 @@ var ErrorReport = {
var button_options = {};
button_options[PMA_messages.strSendErrorReport] = function () {
- $dialog = $(this);
+ var $dialog = $(this);
var post_data = $.extend(report_data, {
send_error_report: true,
description: $("#report_description").val(),
diff --git a/js/navigation.js b/js/navigation.js
index 4ad029c94f..01ee1e3364 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -69,7 +69,7 @@ function loadChildNodes(isNode, $expandElem, callback) {
.slideDown('slow');
}
if (data._errors) {
- $errors = $(data._errors);
+ var $errors = $(data._errors);
if ($errors.children().length > 0) {
$('#pma_errors').replaceWith(data._errors);
}
diff --git a/js/normalization.js b/js/normalization.js
index 6a90720a91..8e008389da 100644
--- a/js/normalization.js
+++ b/js/normalization.js
@@ -241,7 +241,7 @@ function goTo3NFFinish(newTables)
{
for (var table in newTables) {
for (var newtbl in newTables[table]) {
- updatedname = $('#extra input[name="' + newtbl + '"]').val();
+ var updatedname = $('#extra input[name="' + newtbl + '"]').val();
newTables[table][updatedname] = newTables[table][newtbl];
if (updatedname !== newtbl) {
delete newTables[table][newtbl];
@@ -580,7 +580,7 @@ AJAX.registerOnload('normalization.js', function() {
return false;
});
$(".tblFooters").on("click", "#saveNewPrimary", function() {
- datastring = $('#newCols :input').serialize();
+ var datastring = $('#newCols :input').serialize();
datastring += "&field_key[0]=primary_0&ajax_request=1&do_save_data=1&field_where=last";
$.post("tbl_addfield.php", datastring, function(data) {
if (data.success === true) {
diff --git a/js/pmd/move.js b/js/pmd/move.js
index 15ab7d9934..87795fd961 100644
--- a/js/pmd/move.js
+++ b/js/pmd/move.js
@@ -1086,6 +1086,7 @@ function Load_page(page) {
function Grid()
{
+ var value_sent = '';
if (!ON_grid) {
ON_grid = 1;
value_sent = 'on';
diff --git a/js/sql.js b/js/sql.js
index d3e64b71ea..3550a2b4c1 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -500,7 +500,7 @@ AJAX.registerOnload('sql.js', function () {
// Prompt to confirm on Show All
$('body').on('click', '.navigation .showAllRows', function (e) {
e.preventDefault();
- $form = $(this).parents('form');
+ var $form = $(this).parents('form');
if (! $(this).is(':checked')) { // already showing all rows
submitShowAllForm();
diff --git a/js/tbl_gis_visualization.js b/js/tbl_gis_visualization.js
index 71787428fd..40dd9a0c80 100644
--- a/js/tbl_gis_visualization.js
+++ b/js/tbl_gis_visualization.js
@@ -249,10 +249,10 @@ AJAX.registerOnload('tbl_gis_visualization.js', function () {
});
$(document).on('drag', 'svg', function (event, dd) {
- newX = Math.round(dd.offsetX);
+ var newX = Math.round(dd.offsetX);
x += newX - dragX;
dragX = newX;
- newY = Math.round(dd.offsetY);
+ var newY = Math.round(dd.offsetY);
y += newY - dragY;
dragY = newY;
zoomAndPan();
diff --git a/setup/scripts.js b/setup/scripts.js
index 192f0e58df..cf73275602 100644
--- a/setup/scripts.js
+++ b/setup/scripts.js
@@ -38,10 +38,10 @@ $(function () {
$(document).ready(function(){
width = 0;
$('ul.tabs li').each(function(){
- tabWidth = $(this).width() + 10;
+ var tabWidth = $(this).width() + 10;
width += tabWidth;
});
- contentWidth = width;
+ var contentWidth = width;
width += 250;
$('body').css('min-width', width);
$('.tabs_contents').css('min-width', contentWidth);