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

Use camel case for most variables in tbl_structure.js

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2019-05-26 12:54:46 -03:00
parent 13f08037d1
commit a7c64e00b8
1 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
js/tbl_structure.js
View File

@ -22,11 +22,11 @@
* Reload fields table
*/
function reloadFieldForm () {
$.post($('#fieldsForm').attr('action'), $('#fieldsForm').serialize() + CommonParams.get('arg_separator') + 'ajax_request=true', function (form_data) {
var $temp_div = $('<div id=\'temp_div\'><div>').append(form_data.message);
$('#fieldsForm').replaceWith($temp_div.find('#fieldsForm'));
$('#addColumns').replaceWith($temp_div.find('#addColumns'));
$('#move_columns_dialog').find('ul').replaceWith($temp_div.find('#move_columns_dialog ul'));
$.post($('#fieldsForm').attr('action'), $('#fieldsForm').serialize() + CommonParams.get('arg_separator') + 'ajax_request=true', function (formData) {
var $tempDiv = $('<div id=\'temp_div\'><div>').append(formData.message);
$('#fieldsForm').replaceWith($tempDiv.find('#fieldsForm'));
$('#addColumns').replaceWith($tempDiv.find('#addColumns'));
$('#move_columns_dialog').find('ul').replaceWith($tempDiv.find('#move_columns_dialog ul'));
$('#moveColumns').removeClass('move-active');
});
$('#page_content').show();
@ -70,7 +70,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
* @var the_form object referring to the export form
*/
var $form = $(this);
var field_cnt = $form.find('input[name=orig_num_fields]').val();
var fieldCnt = $form.find('input[name=orig_num_fields]').val();
function submitForm () {
@ -99,25 +99,25 @@ AJAX.registerOnload('tbl_structure.js', function () {
}); // end $.post()
}
function checkIfConfirmRequired ($form, $field_cnt) {
function checkIfConfirmRequired ($form, $fieldCnt) {
var i = 0;
var id;
var elm;
var val;
var name_orig;
var elm_orig;
var val_orig;
var nameOrig;
var elmOrig;
var valOrig;
var checkRequired = false;
for (i = 0; i < field_cnt; i++) {
for (i = 0; i < fieldCnt; i++) {
id = '#field_' + i + '_5';
elm = $(id);
val = elm.val();
name_orig = 'input[name=field_collation_orig\\[' + i + '\\]]';
elm_orig = $form.find(name_orig);
val_orig = elm_orig.val();
nameOrig = 'input[name=field_collation_orig\\[' + i + '\\]]';
elmOrig = $form.find(nameOrig);
valOrig = elmOrig.val();
if (val && val_orig && val !== val_orig) {
if (val && valOrig && val !== valOrig) {
checkRequired = true;
break;
}
@ -132,7 +132,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
* this is why we pass $form[0] as a parameter (the jQuery object
* is actually an array of DOM elements)
*/
if (Functions.checkTableEditForm($form[0], field_cnt)) {
if (Functions.checkTableEditForm($form[0], fieldCnt)) {
// OK, form passed validation step
Functions.prepareForAjaxRequest($form);
@ -140,7 +140,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
// User wants to submit the form
// If Collation is changed, Warn and Confirm
if (checkIfConfirmRequired($form, field_cnt)) {
if (checkIfConfirmRequired($form, fieldCnt)) {
var question = sprintf(
Messages.strChangeColumnCollation, 'https://wiki.phpmyadmin.net/pma/Garbled_data'
);
@ -162,28 +162,28 @@ AJAX.registerOnload('tbl_structure.js', function () {
/**
* @var curr_table_name String containing the name of the current table
*/
var curr_table_name = $(this).closest('form').find('input[name=table]').val();
var currTableName = $(this).closest('form').find('input[name=table]').val();
/**
* @var curr_row Object reference to the currently selected row (i.e. field in the table)
*/
var $curr_row = $(this).parents('tr');
var $currRow = $(this).parents('tr');
/**
* @var curr_column_name String containing name of the field referred to by {@link curr_row}
*/
var curr_column_name = $curr_row.children('th').children('label').text().trim();
curr_column_name = Functions.escapeHtml(curr_column_name);
var currColumnName = $currRow.children('th').children('label').text().trim();
currColumnName = Functions.escapeHtml(currColumnName);
/**
* @var $after_field_item Corresponding entry in the 'After' field.
*/
var $after_field_item = $('select[name=\'after_field\'] option[value=\'' + curr_column_name + '\']');
var $afterFieldItem = $('select[name=\'after_field\'] option[value=\'' + currColumnName + '\']');
/**
* @var question String containing the question to be asked for confirmation
*/
var question = Functions.sprintf(Messages.strDoYouReally, 'ALTER TABLE `' + Functions.escapeHtml(curr_table_name) + '` DROP `' + Functions.escapeHtml(curr_column_name) + '`;');
var $this_anchor = $(this);
$this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function (url) {
var question = Functions.sprintf(Messages.strDoYouReally, 'ALTER TABLE `' + Functions.escapeHtml(currTableName) + '` DROP `' + Functions.escapeHtml(currColumnName) + '`;');
var $thisAnchor = $(this);
$thisAnchor.PMA_confirm(question, $thisAnchor.attr('href'), function (url) {
var $msg = Functions.ajaxShowMessage(Messages.strDroppingColumn, false);
var params = Functions.getJsConfirmCommonParam(this, $this_anchor.getPostData());
var params = Functions.getJsConfirmCommonParam(this, $thisAnchor.getPostData());
params += CommonParams.get('arg_separator') + 'ajax_page_request=1';
$.post(url, params, function (data) {
if (typeof data !== 'undefined' && data.success === true) {
@ -198,16 +198,16 @@ AJAX.registerOnload('tbl_structure.js', function () {
Functions.highlightSql($('#page_content'));
}
// Adjust the row numbers
for (var $row = $curr_row.next(); $row.length > 0; $row = $row.next()) {
var new_val = parseInt($row.find('td:nth-child(2)').text(), 10) - 1;
$row.find('td:nth-child(2)').text(new_val);
for (var $row = $currRow.next(); $row.length > 0; $row = $row.next()) {
var newVal = parseInt($row.find('td:nth-child(2)').text(), 10) - 1;
$row.find('td:nth-child(2)').text(newVal);
}
$after_field_item.remove();
$curr_row.hide('medium').remove();
$afterFieldItem.remove();
$currRow.hide('medium').remove();
// Remove the dropped column from select menu for 'after field'
$('select[name=after_field]').find(
'[value="' + curr_column_name + '"]'
'[value="' + currColumnName + '"]'
).remove();
// by default select the (new) last option to add new column
@ -245,31 +245,31 @@ AJAX.registerOnload('tbl_structure.js', function () {
event.preventDefault();
var $this = $(this);
var curr_table_name = $this.closest('form').find('input[name=table]').val();
var curr_column_name = $this.parents('tr').children('th').children('label').text().trim();
var currTableName = $this.closest('form').find('input[name=table]').val();
var currColumnName = $this.parents('tr').children('th').children('label').text().trim();
var add_clause = '';
var addClause = '';
if ($this.is('.add_primary_key_anchor')) {
add_clause = 'ADD PRIMARY KEY';
addClause = 'ADD PRIMARY KEY';
} else if ($this.is('.add_index_anchor')) {
add_clause = 'ADD INDEX';
addClause = 'ADD INDEX';
} else if ($this.is('.add_unique_anchor')) {
add_clause = 'ADD UNIQUE';
addClause = 'ADD UNIQUE';
} else if ($this.is('.add_spatial_anchor')) {
add_clause = 'ADD SPATIAL';
addClause = 'ADD SPATIAL';
} else if ($this.is('.add_fulltext_anchor')) {
add_clause = 'ADD FULLTEXT';
addClause = 'ADD FULLTEXT';
}
var question = Functions.sprintf(Messages.strDoYouReally, 'ALTER TABLE `' +
Functions.escapeHtml(curr_table_name) + '` ' + add_clause + '(`' + Functions.escapeHtml(curr_column_name) + '`);');
Functions.escapeHtml(currTableName) + '` ' + addClause + '(`' + Functions.escapeHtml(currColumnName) + '`);');
var $this_anchor = $(this);
var $thisAnchor = $(this);
$this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function (url) {
$thisAnchor.PMA_confirm(question, $thisAnchor.attr('href'), function (url) {
Functions.ajaxShowMessage();
AJAX.source = $this;
var params = Functions.getJsConfirmCommonParam(this, $this_anchor.getPostData());
var params = Functions.getJsConfirmCommonParam(this, $thisAnchor.getPostData());
params += CommonParams.get('arg_separator') + 'ajax_page_request=1';
$.post(url, params, AJAX.responseHandler);
}); // end $.PMA_confirm()
@ -289,9 +289,9 @@ AJAX.registerOnload('tbl_structure.js', function () {
* @var button_options Object that stores the options passed to jQueryUI
* dialog
*/
var button_options = {};
var buttonOptions = {};
button_options[Messages.strGo] = function (event) {
buttonOptions[Messages.strGo] = function (event) {
event.preventDefault();
var $msgbox = Functions.ajaxShowMessage();
var $this = $(this);
@ -314,23 +314,23 @@ AJAX.registerOnload('tbl_structure.js', function () {
height: 230,
width: 900,
modal: true,
buttons: button_options_error
buttons: buttonOptionsError
}); // end dialog options
} else {
// sort the fields table
var $fields_table = $('table#tablestructure tbody');
var $fieldsTable = $('table#tablestructure tbody');
// remove all existing rows and remember them
var $rows = $fields_table.find('tr').remove();
var $rows = $fieldsTable.find('tr').remove();
// loop through the correct order
for (var i in data.columns) {
var the_column = data.columns[i];
var $the_row = $rows
.find('input:checkbox[value=\'' + the_column + '\']')
var theColumn = data.columns[i];
var $theRow = $rows
.find('input:checkbox[value=\'' + theColumn + '\']')
.closest('tr');
// append the row for this column to the table
$fields_table.append($the_row);
$fieldsTable.append($theRow);
}
var $firstrow = $fields_table.find('tr').eq(0);
var $firstrow = $fieldsTable.find('tr').eq(0);
// Adjust the row numbers and colors
for (var $row = $firstrow; $row.length > 0; $row = $row.next()) {
$row
@ -345,42 +345,42 @@ AJAX.registerOnload('tbl_structure.js', function () {
}
});
};
button_options[Messages.strPreviewSQL] = function () {
buttonOptions[Messages.strPreviewSQL] = function () {
// Function for Previewing SQL
var $form = $('#move_column_form');
Functions.previewSql($form);
};
button_options[Messages.strCancel] = function () {
buttonOptions[Messages.strCancel] = function () {
$(this).dialog('close');
};
var button_options_error = {};
button_options_error[Messages.strOK] = function () {
var buttonOptionsError = {};
buttonOptionsError[Messages.strOK] = function () {
$(this).dialog('close').remove();
};
var columns = [];
$('#tablestructure').find('tbody tr').each(function () {
var col_name = $(this).find('input:checkbox').eq(0).val();
var hidden_input = $('<input>')
var colName = $(this).find('input:checkbox').eq(0).val();
var hiddenInput = $('<input>')
.prop({
name: 'move_columns[]',
type: 'hidden'
})
.val(col_name);
.val(colName);
columns[columns.length] = $('<li></li>')
.addClass('placeholderDrag')
.text(col_name)
.append(hidden_input);
.text(colName)
.append(hiddenInput);
});
var col_list = $('#move_columns_dialog').find('ul')
var colList = $('#move_columns_dialog').find('ul')
.find('li').remove().end();
for (var i in columns) {
col_list.append(columns[i]);
colList.append(columns[i]);
}
col_list.sortable({
colList.sortable({
axis: 'y',
containment: $('#move_columns_dialog').find('div'),
tolerance: 'pointer'
@ -390,7 +390,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
$('#move_columns_dialog').dialog({
modal: true,
buttons: button_options,
buttons: buttonOptions,
open: function () {
if ($('#move_columns_dialog').parents('.ui-dialog').height() > $(window).height()) {
$('#move_columns_dialog').dialog('option', 'height', $(window).height());