Use @this in selectFieldChange
This commit is contained in:
parent
3b0e1cf289
commit
e5c52589ec
|
@ -315,7 +315,7 @@ focus(qs('#username'));
|
||||||
$select[""] = array();
|
$select[""] = array();
|
||||||
foreach ($select as $key => $val) {
|
foreach ($select as $key => $val) {
|
||||||
$val = $_GET["columns"][$key];
|
$val = $_GET["columns"][$key];
|
||||||
$column = select_input(" name='columns[$i][col]' onchange='" . ($key !== "" ? "selectFieldChange(this.form)" : "selectAddRow.call(this)") . ";'", $columns, $val["col"]);
|
$column = select_input(" name='columns[$i][col]' onchange='" . ($key !== "" ? "selectFieldChange" : "selectAddRow") . ".call(this);'", $columns, $val["col"]);
|
||||||
echo "<div>" . ($functions || $grouping ? "<select name='columns[$i][fun]' onchange='helpClose();" . ($key !== "" ? "" : " this.nextSibling.nextSibling.onchange();") . "'"
|
echo "<div>" . ($functions || $grouping ? "<select name='columns[$i][fun]' onchange='helpClose();" . ($key !== "" ? "" : " this.nextSibling.nextSibling.onchange();") . "'"
|
||||||
. on_help("getTarget(event).value && getTarget(event).value.replace(/ |\$/, '(') + ')'", 1) . ">" . optionlist(array(-1 => "") + array_filter(array(lang('Functions') => $functions, lang('Aggregation') => $grouping)), $val["fun"]) . "</select>"
|
. on_help("getTarget(event).value && getTarget(event).value.replace(/ |\$/, '(') + ')'", 1) . ">" . optionlist(array(-1 => "") + array_filter(array(lang('Functions') => $functions, lang('Aggregation') => $grouping)), $val["fun"]) . "</select>"
|
||||||
. "($column)" : $column) . "</div>\n";
|
. "($column)" : $column) . "</div>\n";
|
||||||
|
@ -335,7 +335,7 @@ focus(qs('#username'));
|
||||||
foreach ($indexes as $i => $index) {
|
foreach ($indexes as $i => $index) {
|
||||||
if ($index["type"] == "FULLTEXT") {
|
if ($index["type"] == "FULLTEXT") {
|
||||||
echo "(<i>" . implode("</i>, <i>", array_map('h', $index["columns"])) . "</i>) AGAINST";
|
echo "(<i>" . implode("</i>, <i>", array_map('h', $index["columns"])) . "</i>) AGAINST";
|
||||||
echo " <input type='search' name='fulltext[$i]' value='" . h($_GET["fulltext"][$i]) . "' onchange='selectFieldChange(this.form);'>";
|
echo " <input type='search' name='fulltext[$i]' value='" . h($_GET["fulltext"][$i]) . "' onchange='selectFieldChange.call(this);'>";
|
||||||
echo checkbox("boolean[$i]", 1, isset($_GET["boolean"][$i]), "BOOL");
|
echo checkbox("boolean[$i]", 1, isset($_GET["boolean"][$i]), "BOOL");
|
||||||
echo "<br>\n";
|
echo "<br>\n";
|
||||||
}
|
}
|
||||||
|
@ -348,7 +348,7 @@ focus(qs('#username'));
|
||||||
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.call(this)") . ";' onkeydown='selectSearchKeydown.call(this, event);' onsearch='selectSearchSearch.call(this);'></div>\n";
|
echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "' onchange='" . ($val ? "selectFieldChange" : "selectAddRow") . ".call(this);' onkeydown='selectSearchKeydown.call(this, event);' onsearch='selectSearchSearch.call(this);'></div>\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
echo "</div></fieldset>\n";
|
echo "</div></fieldset>\n";
|
||||||
|
@ -365,7 +365,7 @@ focus(qs('#username'));
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach ((array) $_GET["order"] as $key => $val) {
|
foreach ((array) $_GET["order"] as $key => $val) {
|
||||||
if ($val != "") {
|
if ($val != "") {
|
||||||
echo "<div>" . select_input(" name='order[$i]' onchange='selectFieldChange(this.form);'", $columns, $val);
|
echo "<div>" . select_input(" name='order[$i]' onchange='selectFieldChange.call(this);'", $columns, $val);
|
||||||
echo checkbox("desc[$i]", 1, isset($_GET["desc"][$key]), lang('descending')) . "</div>\n";
|
echo checkbox("desc[$i]", 1, isset($_GET["desc"][$key]), lang('descending')) . "</div>\n";
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
@ -381,7 +381,7 @@ focus(qs('#username'));
|
||||||
*/
|
*/
|
||||||
function selectLimitPrint($limit) {
|
function selectLimitPrint($limit) {
|
||||||
echo "<fieldset><legend>" . lang('Limit') . "</legend><div>"; // <div> for easy styling
|
echo "<fieldset><legend>" . lang('Limit') . "</legend><div>"; // <div> for easy styling
|
||||||
echo "<input type='number' name='limit' class='size' value='" . h($limit) . "' onchange='selectFieldChange(this.form);'>";
|
echo "<input type='number' name='limit' class='size' value='" . h($limit) . "' onchange='selectFieldChange.call(this);'>";
|
||||||
echo "</div></fieldset>\n";
|
echo "</div></fieldset>\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -419,7 +419,7 @@ focus(qs('#username'));
|
||||||
json_row($key);
|
json_row($key);
|
||||||
}
|
}
|
||||||
echo ";\n";
|
echo ";\n";
|
||||||
echo "selectFieldChange(qs('#form'));\n";
|
echo "selectFieldChange.call(qs('#form')['select']);\n";
|
||||||
echo "</script>\n";
|
echo "</script>\n";
|
||||||
echo "</div></fieldset>\n";
|
echo "</div></fieldset>\n";
|
||||||
}
|
}
|
||||||
|
|
|
@ -94,9 +94,10 @@ function dbChange() {
|
||||||
|
|
||||||
|
|
||||||
/** Check whether the query will be executed with index
|
/** Check whether the query will be executed with index
|
||||||
* @param HTMLFormElement
|
* @this HTMLElement
|
||||||
*/
|
*/
|
||||||
function selectFieldChange(form) {
|
function selectFieldChange() {
|
||||||
|
var form = this.form;
|
||||||
var ok = (function () {
|
var ok = (function () {
|
||||||
var inputs = qsa('input', form);
|
var inputs = qsa('input', form);
|
||||||
for (var i=0; i < inputs.length; i++) {
|
for (var i=0; i < inputs.length; i++) {
|
||||||
|
|
|
@ -357,9 +357,7 @@ function menuOut() {
|
||||||
*/
|
*/
|
||||||
function selectAddRow() {
|
function selectAddRow() {
|
||||||
var field = this;
|
var field = this;
|
||||||
field.onchange = function () {
|
field.onchange = selectFieldChange;
|
||||||
selectFieldChange(field.form);
|
|
||||||
};
|
|
||||||
field.onchange();
|
field.onchange();
|
||||||
var row = cloneNode(field.parentNode);
|
var row = cloneNode(field.parentNode);
|
||||||
var selects = qsa('select', row);
|
var selects = qsa('select', row);
|
||||||
|
|
Loading…
Reference in a new issue