From 3ed7f453bc96c5c95a8cecf35a1e1b29e7106a6e Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Mon, 29 Aug 2011 17:08:20 +0200 Subject: [PATCH] Ctrl+click on button opens form to blank window --- adminer/static/functions.js | 10 +++++++--- changes.txt | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/adminer/static/functions.js b/adminer/static/functions.js index f6ad1bf7..619026ce 100644 --- a/adminer/static/functions.js +++ b/adminer/static/functions.js @@ -488,7 +488,7 @@ function selectDblClick(td, event, text) { * @return boolean */ function bodyClick(event, db, ns) { - if (event.button || event.ctrlKey || event.shiftKey || event.altKey || event.metaKey) { + if (event.button || event.shiftKey || event.altKey || event.metaKey) { return; } if (event.getPreventDefault ? event.getPreventDefault() : event.returnValue === false || event.defaultPrevented) { @@ -498,13 +498,17 @@ function bodyClick(event, db, ns) { if (/^a$/i.test(el.parentNode.tagName)) { el = el.parentNode; } - if (/^a$/i.test(el.tagName) && !/:|#|&download=/i.test(el.getAttribute('href')) && /[&?]username=/.test(el.href)) { + if (/^a$/i.test(el.tagName) && !/:|#|&download=/i.test(el.getAttribute('href')) && /[&?]username=/.test(el.href) && !event.ctrlKey) { var match = /&db=([^&]*)/.exec(el.href); var match2 = /&ns=([^&]*)/.exec(el.href); return !(db == (match ? match[1] : '') && ns == (match2 ? match2[1] : '') && ajaxSend(el.href)); } if (/^input$/i.test(el.tagName) && /image|submit/.test(el.type)) { - return !ajaxForm(el.form, (el.name ? encodeURIComponent(el.name) + (el.type == 'image' ? '.x' : '') + '=1' : ''), el.type == 'image'); + if (event.ctrlKey) { + el.form.target = '_blank'; + } else { + return !ajaxForm(el.form, (el.name ? encodeURIComponent(el.name) + (el.type == 'image' ? '.x' : '') + '=1' : ''), el.type == 'image'); + } } return true; } diff --git a/changes.txt b/changes.txt index 0c0ccb45..282957e9 100644 --- a/changes.txt +++ b/changes.txt @@ -1,6 +1,7 @@ Adminer 3.3.4-dev: Foreign keys default actions (bug #3397606) Fix minor parser bug in SQL command with webserver file +Ctrl+click on button opens form to blank window PostgreSQL: fix alter foreign key SET DEFAULT foreign key action PostgreSQL over PDO: connect if the eponymous database does not exist (bug #3391619)