Don't reset column when searching for an empty value with Enter
This commit is contained in:
parent
df8fce2bf9
commit
8c8f659028
|
@ -275,7 +275,7 @@ username.form['auth[driver]'].onchange();
|
||||||
if (!$val || ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators))) {
|
if (!$val || ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators))) {
|
||||||
echo "<div>" . select_input(" name='where[$i][col]' onchange='$change_next'", $columns, $val["col"], "(" . lang('anywhere') . ")");
|
echo "<div>" . select_input(" name='where[$i][col]' onchange='$change_next'", $columns, $val["col"], "(" . lang('anywhere') . ")");
|
||||||
echo html_select("where[$i][op]", $this->operators, $val["op"], $change_next);
|
echo html_select("where[$i][op]", $this->operators, $val["op"], $change_next);
|
||||||
echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "' onchange='" . ($val ? "selectFieldChange(this.form)" : "selectAddRow(this)") . ";' onsearch='selectSearchSearch(this);'></div>\n";
|
echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "' onchange='" . ($val ? "selectFieldChange(this.form)" : "selectAddRow(this)") . ";' onkeydown='selectSearchKeydown(this, event);' onsearch='selectSearchSearch(this);'></div>\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
echo "</div></fieldset>\n";
|
echo "</div></fieldset>\n";
|
||||||
|
|
|
@ -311,6 +311,17 @@ function selectAddRow(field) {
|
||||||
field.parentNode.parentNode.appendChild(row);
|
field.parentNode.parentNode.appendChild(row);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Prevent onsearch handler on Enter
|
||||||
|
* @param HTMLInputElement
|
||||||
|
* @param KeyboardEvent
|
||||||
|
*/
|
||||||
|
function selectSearchKeydown(el, event) {
|
||||||
|
if (event.keyCode == 13 || event.keyCode == 10) {
|
||||||
|
el.onsearch = function () {
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** Clear column name after resetting search
|
/** Clear column name after resetting search
|
||||||
* @param HTMLInputElement
|
* @param HTMLInputElement
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -16,6 +16,7 @@ Encrypt passwords stored in session by a key stored in cookie
|
||||||
Don't append newlines to uploaded files, bug since Adminer 3.7.0
|
Don't append newlines to uploaded files, bug since Adminer 3.7.0
|
||||||
Don't display SQL edit form on Ctrl+click on the select query, introduced in Adminer 3.6.4
|
Don't display SQL edit form on Ctrl+click on the select query, introduced in Adminer 3.6.4
|
||||||
Use MD5 for editing long keys only in supported drivers, bug since Adminer 3.6.4
|
Use MD5 for editing long keys only in supported drivers, bug since Adminer 3.6.4
|
||||||
|
Don't reset column when searching for an empty value with Enter, bug since Adminer 3.6.4
|
||||||
Don't execute external JavaScript when verifying version
|
Don't execute external JavaScript when verifying version
|
||||||
Include JUSH in the compiled version
|
Include JUSH in the compiled version
|
||||||
Protect CSRF token against BREACH
|
Protect CSRF token against BREACH
|
||||||
|
|
|
@ -240,7 +240,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
|
||||||
if (($val["col"] == "" || $columns[$val["col"]]) && "$val[col]$val[val]" != "") {
|
if (($val["col"] == "" || $columns[$val["col"]]) && "$val[col]$val[val]" != "") {
|
||||||
echo "<div><select name='where[$i][col]'><option value=''>(" . lang('anywhere') . ")" . optionlist($columns, $val["col"], true) . "</select>";
|
echo "<div><select name='where[$i][col]'><option value=''>(" . lang('anywhere') . ")" . optionlist($columns, $val["col"], true) . "</select>";
|
||||||
echo html_select("where[$i][op]", array(-1 => "") + $this->operators, $val["op"]);
|
echo html_select("where[$i][op]", array(-1 => "") + $this->operators, $val["op"]);
|
||||||
echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "' onsearch='selectSearchSearch(this);'></div>\n";
|
echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "' onkeydown='selectSearchKeydown(this, event);' onsearch='selectSearchSearch(this);'></div>\n";
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue