beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Edit select SQL query on Ctrl+click

Browse source
This commit is contained in:
Jakub Vrana 2013-04-04 18:15:18 -07:00
parent e4d5835dab
commit 1a1b800b40
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adminer/include/adminer.inc.php
View file

@ -165,9 +165,9 @@ username.form['auth[driver]'].onchange();
*/ */
function selectQuery($query) { function selectQuery($query) {
global $jush, $token; global $jush, $token;
return "<form action='" . h(ME) . "sql=' method='post'><p><span>" return "<form action='" . h(ME) . "sql=' method='post'><p><span onclick=\"return !selectEditSql(event, this, '" . lang('Execute') . "');\">"
. "<code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code>" . "<code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code>"
. " <a href='" . h(ME) . "sql=" . urlencode($query) . "' onclick=\"return !selectEditSql(event, this.parentNode, '" . lang('Execute') . "');\">" . lang('Edit') . "</a>" . " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>"
. "</span><input type='hidden' name='token' value='$token'></p></form>\n"; // </p> - required for IE9 inline edit . "</span><input type='hidden' name='token' value='$token'></p></form>\n"; // </p> - required for IE9 inline edit
} }

6
adminer/static/editing.js
View file

@ -203,11 +203,11 @@ function selectFieldChange(form) {
* @param MouseEvent * @param MouseEvent
* @param HTMLSpanElement * @param HTMLSpanElement
* @param string * @param string
* @return boolean
*/ */
function selectEditSql(event, el, label) { function selectEditSql(event, el, label) {
if (isCtrl(event) || event.altKey) { var a = parentTag(event.target || event.srcElement, 'a');
return false; if (!isCtrl(event) || (a && a.href)) {
return;
} }
var sql = el.firstChild; var sql = el.firstChild;
var input = document.createElement('input'); var input = document.createElement('input');

4
adminer/static/functions.js
View file

@ -40,12 +40,12 @@ function selectValue(select) {
/** Get parent node with specified tag name. /** Get parent node with specified tag name.
* @param HTMLElement * @param HTMLElement
* @param string * @param string regular expression
* @return HTMLElement * @return HTMLElement
*/ */
function parentTag(el, tag) { function parentTag(el, tag) {
var re = new RegExp('^' + tag + '$', 'i'); var re = new RegExp('^' + tag + '$', 'i');
while (!re.test(el.tagName)) { while (el && !re.test(el.tagName)) {
el = el.parentNode; el = el.parentNode;
} }
return el; return el;

2
changes.txt
View file

@ -1,6 +1,6 @@
Adminer 3.6.4-dev: Adminer 3.6.4-dev:
Display pagination on a fixed position Display pagination on a fixed position
Display select SQL edit form inline Display SQL edit form on Ctrl+click on the select query
Recover original view, trigger, routine if creating fails Recover original view, trigger, routine if creating fails
Allow loading more data with inline edit (bug #3605531) Allow loading more data with inline edit (bug #3605531)
Stay on the same page after deleting rows (bug #3605845) Stay on the same page after deleting rows (bug #3605845)