Update jQuery to 3.3.1. Fixes #3271

Patch by Aditya, with test enhancements from Anthony and Joao at Pivotal.
This commit is contained in:
Aditya Toshniwal
2018-05-25 16:26:37 +01:00
committed by Dave Page
parent 61d8072a8c
commit 9f13865777
32 changed files with 120 additions and 154 deletions

View File

@@ -1609,7 +1609,7 @@ define('pgadmin.browser', [
jsonResp = (
contentType &&
contentType.indexOf('application/json') == 0 &&
$.parseJSON(xhr.responseText)
JSON.parse(xhr.responseText)
) || {};
if (xhr.status == 410 && jsonResp.success == 0) {

View File

@@ -142,18 +142,18 @@ _.extend(pgBrowser.keyboardNavigation, {
bindMainMenuUpDown: function(event, combo) {
// Handle Sub-menus
if (combo === 'up' && $(event.target).parent().prev().prev('.dropdown-submenu').length > 0) {
$(event.target).parent().prev().prev('.dropdown-submenu').find('a:first').focus();
$(event.target).parent().prev().prev('.dropdown-submenu').find('a:first').trigger('focus');
} else {
if ($(event.target).parent().hasClass('dropdown-submenu')) {
$(event.target).parent().parent().parent().find('a:first').dropdown('toggle');
$(event.target).parent().parent().children().eq(2).find('a:first').focus();
$(event.target).parent().parent().children().eq(2).find('a:first').trigger('focus');
}
}
},
bindLeftTree: function() {
const tree = this.getTreeDetails();
$('#tree').focus();
$('#tree').trigger('focus');
tree.t.focus(tree.i);
tree.t.select(tree.i);
},
@@ -219,7 +219,7 @@ _.extend(pgBrowser.keyboardNavigation, {
const top = $(event.srcElement).find('.aciTreeEntry').position().top + 70;
tree.t.blur(tree.i);
$('#tree').blur();
$('#tree').trigger('blur');
// Call context menu and set position
tree.i.children().contextMenu({x: left, y: top});
},

View File

@@ -95,10 +95,10 @@ define([
element.find('i').addClass('font-white');
element.find('i').removeClass('font-gray-4');
span.mouseover(function() {
span.on('mouseover',() => {
element.addClass('bg-gray-5');
});
span.mouseout(function() {
span.on('mouseout',() => {
element.removeClass('bg-gray-5');
});
},

View File

@@ -734,7 +734,7 @@ define('pgadmin.browser.node', [
/* Error from the server */
if (jqx.status == 417 || jqx.status == 410 || jqx.status == 500) {
try {
var data = $.parseJSON(jqx.responseText);
var data = JSON.parse(jqx.responseText);
msg = data.errormsg;
} catch (e) {
console.warn(e.stack || e);
@@ -1140,7 +1140,7 @@ define('pgadmin.browser.node', [
icon: 'fa fa-lg fa-pencil-square-o',
disabled: !that.canEdit,
register: function(btn) {
btn.click(function() {
btn.on('click',() => {
onEdit();
});
},
@@ -1154,7 +1154,7 @@ define('pgadmin.browser.node', [
icon: 'fa fa-lg fa-info',
disabled: (that.sqlAlterHelp == '' && that.sqlCreateHelp == '') ? true : false,
register: function(btn) {
btn.click(function() {
btn.on('click',() => {
onSqlHelp();
});
},
@@ -1359,7 +1359,7 @@ define('pgadmin.browser.node', [
icon: 'fa fa-lg fa-info',
disabled: (that.sqlAlterHelp == '' && that.sqlCreateHelp == '') ? true : false,
register: function(btn) {
btn.click(function() {
btn.on('click',() => {
onSqlHelp();
});
},
@@ -1371,7 +1371,7 @@ define('pgadmin.browser.node', [
icon: 'fa fa-lg fa-question',
disabled: (that.dialogHelp == '') ? true : false,
register: function(btn) {
btn.click(function() {
btn.on('click',() => {
onDialogHelp();
});
},
@@ -1384,7 +1384,7 @@ define('pgadmin.browser.node', [
disabled: true,
register: function(btn) {
// Save the changes
btn.click(function() {
btn.on('click',() => {
onSave.call(this, view, btn);
});
},
@@ -1396,7 +1396,7 @@ define('pgadmin.browser.node', [
icon: 'fa fa-lg fa-close',
disabled: false,
register: function(btn) {
btn.click(function() {
btn.on('click',() => {
// Removing the action-mode
panel.$container.removeAttr('action-mode');
onCancelFunc.call(arguments);
@@ -1410,7 +1410,7 @@ define('pgadmin.browser.node', [
icon: 'fa fa-lg fa-recycle',
disabled: true,
register: function(btn) {
btn.click(function() {
btn.on('click',() => {
setTimeout(function() {
editFunc.call();
}, 0);