Permalink
Browse files

Ctrl+Up and Down in edit and in-place edit

  • Loading branch information...
1 parent 0926122 commit 241fc4ef6ce4343b0c95eba46f51877abd6cd8b5 @vrana committed Jan 25, 2011
Showing with 34 additions and 30 deletions.
  1. +1 −1 adminer/edit.inc.php
  2. +1 −1 adminer/select.inc.php
  3. +0 −27 adminer/static/editing.js
  4. +31 −0 adminer/static/functions.js
  5. +1 −1 changes.txt
View
@@ -67,7 +67,7 @@
<form action="" method="post" enctype="multipart/form-data">
<?php
if ($fields) {
- echo "<table cellspacing='0'>\n";
+ echo "<table cellspacing='0' onkeydown='return editingKeydown(event);'>\n";
foreach ($fields as $name => $field) {
echo "<tr><th>" . $adminer->fieldName($field);
$default = $_GET["set"][bracket_escape($name)];
View
@@ -251,7 +251,7 @@
} else {
$backward_keys = $adminer->backwardKeys($TABLE, $table_name);
- echo "<table cellspacing='0' class='nowrap' onclick='tableClick(event);'>\n";
+ echo "<table cellspacing='0' class='nowrap' onclick='tableClick(event);' onkeydown='return editingKeydown(event);'>\n";
echo "<thead><tr>" . (!$group && $select ? "" : "<td><input type='checkbox' id='all-page' onclick='formCheck(this, /check/);'> <a href='" . h($_GET["modify"] ? remove_from_uri("modify") : $_SERVER["REQUEST_URI"] . "&modify=1") . "'>" . lang('edit') . "</a>");
$names = array();
$functions = array();
View
@@ -240,33 +240,6 @@ function editingLengthBlur(edit) {
edit.style.display = 'none';
}
-/** Find node position
-* @param Node
-* @return number
-*/
-function nodePosition(el) {
- var pos = 0;
- while (el = el.previousSibling) {
- pos++;
- }
- return pos;
-}
-
-/** Change focus by Ctrl+Up or Down
-* @param KeyboardEvent
-* @return boolean
-*/
-function editingKeydown(event) {
- var target = event.target || event.srcElement;
- if ((event.keyCode == 40 || event.keyCode == 38) && event.ctrlKey && !event.altKey && !event.metaKey) { // shiftKey allowed
- if ((el = target.parentNode.parentNode[(event.keyCode == 40 ? 'nextSibling' : 'previousSibling')]) && (el = el.childNodes[nodePosition(target.parentNode)]) && (el = el.childNodes[nodePosition(target)])) {
- el.focus();
- }
- return false;
- }
- return true;
-}
-
/** Show or hide selected table column
* @param boolean
* @param number
@@ -107,6 +107,18 @@ function setHtml(id, html) {
}
}
+/** Find node position
+* @param Node
+* @return number
+*/
+function nodePosition(el) {
+ var pos = 0;
+ while (el = el.previousSibling) {
+ pos++;
+ }
+ return pos;
+}
+
/** Go to the specified page
* @param string
* @param string
@@ -177,6 +189,25 @@ function textareaKeypress(target, event, tab, button) {
+/** Change focus by Ctrl+Up or Ctrl+Down
+* @param KeyboardEvent
+* @return boolean
+*/
+function editingKeydown(event) {
+ if ((event.keyCode == 40 || event.keyCode == 38) && event.ctrlKey && !event.altKey && !event.metaKey) { // shiftKey allowed
+ var target = event.target || event.srcElement;
+ var sibling = (event.keyCode == 40 ? 'nextSibling' : 'previousSibling');
+ var el = target.parentNode.parentNode[sibling];
+ if (el && (/^tr$/i.test(el.tagName) || (el = el[sibling])) && /^tr$/i.test(el.tagName) && (el = el.childNodes[nodePosition(target.parentNode)]) && (el = el.childNodes[nodePosition(target)])) {
+ el.focus();
+ }
+ return false;
+ }
+ return true;
+}
+
+
+
/** Create AJAX request
* @param string
* @param function (text)
View
@@ -7,7 +7,7 @@ History: edit all
MS SQL: auto primary and foreign key
SQLite: display 0
Create table default data type: int
-Create table keyboard shortcuts: Ctrl+Up, Ctrl+Down
+Focus upper/lower fields by Ctrl+Up/Ctrl+Down
Homepage customization
Use IN for search in numeric fields (Editor)
Use password input for _md5 and _sha1 fields (Editor)

0 comments on commit 241fc4e

Please sign in to comment.