IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed code smell 'Variables should not be shadowed'.

Browse Source
This commit is contained in:
Satish V 2020-07-15 15:03:47 +05:30 committed by Akshay Joshi
parent 11c4877859
commit 522ddad72b
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/pgadmin/static/js/backgrid.pgadmin.js
View File

@ -411,7 +411,7 @@ define([
editorOptions['columns_length'] = this.column.collection.length; editorOptions['columns_length'] = this.column.collection.length;
editorOptions['el'].attr('tabindex', 0); editorOptions['el'].attr('tabindex', 0);
this.listenTo(this.model, 'backgrid:edit', function(model, column, cell, editor) { this.listenTo(this.model, 'backgrid:edit', function(model, column, sel_cell, editor) {
if (column.get('name') == this.column.get('name')) if (column.get('name') == this.column.get('name'))
editor.extendWithOptions(editorOptions); editor.extendWithOptions(editorOptions);
}); });
@ -850,7 +850,7 @@ define([
} }
if (gotoCell) { if (gotoCell) {
let command = new Backgrid.Command({ let cmd = new Backgrid.Command({
key: 'Tab', key: 'Tab',
keyCode: 9, keyCode: 9,
which: 9, which: 9,
@ -862,12 +862,12 @@ define([
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
self.model.trigger('backgrid:edited', self.model, self.model.trigger('backgrid:edited', self.model,
self.column, command); self.column, cmd);
} }
else { else {
// When we have Non-Editable Cell // When we have Non-Editable Cell
self.model.trigger('backgrid:edited', self.model, self.model.trigger('backgrid:edited', self.model,
self.column, command); self.column, cmd);
} }
}, 20); }, 20);
} }
@ -1008,11 +1008,11 @@ define([
// Select the highlighted item on Tab press. // Select the highlighted item on Tab press.
if (this.$sel) { if (this.$sel) {
this.$sel.data('select2').on('keypress', function(ev) { this.$sel.data('select2').on('keypress', function(ev) {
var self = this; var ctx = this;
// keycode 9 is for TAB key // keycode 9 is for TAB key
if (ev.which === 9 && self.isOpen()) { if (ev.which === 9 && ctx.isOpen()) {
self.trigger('results:select', {}); ctx.trigger('results:select', {});
ev.preventDefault(); ev.preventDefault();
} }
}); });

22
web/pgadmin/static/vendor/backgrid/backgrid.js vendored
View File

@ -859,8 +859,8 @@ var Cell = Backgrid.Cell = Backbone.View.extend({
this.listenTo(model, "backgrid:error", this.renderError); this.listenTo(model, "backgrid:error", this.renderError);
this.listenTo(column, "change:editable change:sortable change:renderable", this.listenTo(column, "change:editable change:sortable change:renderable",
function (column) { function (col) {
var changed = column.changedAttributes(); var changed = col.changedAttributes();
for (var key in changed) { for (var key in changed) {
if (changed.hasOwnProperty(key)) { if (changed.hasOwnProperty(key)) {
$el.toggleClass(key, changed[key]); $el.toggleClass(key, changed[key]);
@ -1944,24 +1944,24 @@ var Row = Backgrid.Row = Backbone.View.extend({
cells.push(this.makeCell(columns.at(i), options)); cells.push(this.makeCell(columns.at(i), options));
} }
this.listenTo(columns, "add", function (column, columns) { this.listenTo(columns, "add", function (column, cols) {
var i = columns.indexOf(column); var index = cols.indexOf(column);
var cell = this.makeCell(column, options); var cell = this.makeCell(column, options);
cells.splice(i, 0, cell); cells.splice(index, 0, cell);
var $el = this.$el; var $el = this.$el;
if (i === 0) { if (index === 0) {
$el.prepend(cell.render().$el); $el.prepend(cell.render().$el);
} }
else if (i === columns.length - 1) { else if (index === cols.length - 1) {
$el.append(cell.render().$el); $el.append(cell.render().$el);
} }
else { else {
$el.children().eq(i).before(cell.render().$el); $el.children().eq(index).before(cell.render().$el);
} }
}); });
this.listenTo(columns, "remove", function (column, columns, opts) { this.listenTo(columns, "remove", function (column, cols, opts) {
cells[opts.index].remove(); cells[opts.index].remove();
cells.splice(opts.index, 1); cells.splice(opts.index, 1);
}); });
@ -2107,8 +2107,8 @@ var HeaderCell = Backgrid.HeaderCell = Backbone.View.extend({
var column = this.column, collection = this.collection, $el = this.$el; var column = this.column, collection = this.collection, $el = this.$el;
this.listenTo(column, "change:editable change:sortable change:renderable", this.listenTo(column, "change:editable change:sortable change:renderable",
function (column) { function (col) {
var changed = column.changedAttributes(); var changed = col.changedAttributes();
for (var key in changed) { for (var key in changed) {
if (changed.hasOwnProperty(key)) { if (changed.hasOwnProperty(key)) {
$el.toggleClass(key, changed[key]); $el.toggleClass(key, changed[key]);