pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent Alertify from inadvertently opening help pages.

pull/24/head
Aditya Toshniwal 2019-05-29 13:46:39 -04:00 committed by Dave Page
parent 15252b0a26
commit dd187b9122
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/pgadmin/browser/static/js/browser.js
View File

@ -12,7 +12,7 @@ define('pgadmin.browser', [
'sources/gettext', 'sources/url_for', 'require', 'jquery', 'underscore', 'underscore.string', 'sources/gettext', 'sources/url_for', 'require', 'jquery', 'underscore', 'underscore.string',
'bootstrap', 'sources/pgadmin', 'pgadmin.alertifyjs', 'bundled_codemirror', 'bootstrap', 'sources/pgadmin', 'pgadmin.alertifyjs', 'bundled_codemirror',
'sources/check_node_visibility', './toolbar', 'pgadmin.help', 'sources/check_node_visibility', './toolbar', 'pgadmin.help',
'sources/csrf', 'pgadmin.browser.utils', 'sources/csrf', 'sources/keyboard_shortcuts', 'pgadmin.browser.utils',
'wcdocker', 'jquery.contextmenu', 'jquery.aciplugin', 'jquery.acitree', 'wcdocker', 'jquery.contextmenu', 'jquery.aciplugin', 'jquery.acitree',
'pgadmin.browser.preferences', 'pgadmin.browser.messages', 'pgadmin.browser.preferences', 'pgadmin.browser.messages',
'pgadmin.browser.menu', 'pgadmin.browser.panel', 'pgadmin.browser.menu', 'pgadmin.browser.panel',
@ -24,7 +24,7 @@ define('pgadmin.browser', [
tree, tree,
gettext, url_for, require, $, _, S, gettext, url_for, require, $, _, S,
Bootstrap, pgAdmin, Alertify, codemirror, Bootstrap, pgAdmin, Alertify, codemirror,
checkNodeVisibility, toolBar, help, csrfToken checkNodeVisibility, toolBar, help, csrfToken, keyboardFunc
) { ) {
window.jQuery = window.$ = $; window.jQuery = window.$ = $;
// Some scripts do export their object in the window only. // Some scripts do export their object in the window only.
@ -607,7 +607,9 @@ define('pgadmin.browser', [
/* Enable ok only if password entered */ /* Enable ok only if password entered */
$okBtn.prop('disabled', true); $okBtn.prop('disabled', true);
$password.on('input', ()=>{ $password.on('input change keyup', (event)=>{
keyboardFunc._stopEventPropagation(event);
if($password.val() != '') { if($password.val() != '') {
$okBtn.prop('disabled', false); $okBtn.prop('disabled', false);
} else { } else {