Operator selection bug in search interface (need to keep track of selected operator now that onConditionSelected() is called after loading in a condition)
This commit is contained in:
parent
d38e94dd27
commit
61c18639fe
|
@ -169,6 +169,7 @@
|
||||||
]]>
|
]]>
|
||||||
</constructor>
|
</constructor>
|
||||||
<field name="selectedCondition"/>
|
<field name="selectedCondition"/>
|
||||||
|
<field name="selectedOperator"/>
|
||||||
<method name="onConditionSelected">
|
<method name="onConditionSelected">
|
||||||
<body>
|
<body>
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
|
@ -176,10 +177,11 @@
|
||||||
if (this.id('conditionsmenu').value==this.selectedCondition){
|
if (this.id('conditionsmenu').value==this.selectedCondition){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.selectedCondition = this.id('conditionsmenu').value;
|
|
||||||
|
|
||||||
var operatorsList = this.id('operatorsmenu');
|
var operatorsList = this.id('operatorsmenu');
|
||||||
|
|
||||||
|
this.selectedCondition = this.id('conditionsmenu').value;
|
||||||
|
this.selectedOperator = operatorsList.value;
|
||||||
|
|
||||||
var condition = Scholar.SearchConditions.get(this.id('conditionsmenu').value);
|
var condition = Scholar.SearchConditions.get(this.id('conditionsmenu').value);
|
||||||
var operators = condition['operators'];
|
var operators = condition['operators'];
|
||||||
|
|
||||||
|
@ -187,12 +189,14 @@
|
||||||
var selectThis;
|
var selectThis;
|
||||||
for(var i = 0, len = operatorsList.firstChild.childNodes.length; i < len; i++)
|
for(var i = 0, len = operatorsList.firstChild.childNodes.length; i < len; i++)
|
||||||
{
|
{
|
||||||
var hidden = !operators[operatorsList.firstChild.childNodes[i].getAttribute('value')];
|
var val = operatorsList.firstChild.childNodes[i].getAttribute('value');
|
||||||
|
var hidden = !operators[val];
|
||||||
operatorsList.firstChild.childNodes[i].setAttribute('hidden', hidden);
|
operatorsList.firstChild.childNodes[i].setAttribute('hidden', hidden);
|
||||||
if(selectThis == null && !hidden)
|
if (!hidden && (selectThis == null || this.selectedOperator == val))
|
||||||
|
{
|
||||||
selectThis = i;
|
selectThis = i;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
operatorsList.selectedIndex = selectThis;
|
operatorsList.selectedIndex = selectThis;
|
||||||
|
|
||||||
// Generate drop-down menus for certain conditions
|
// Generate drop-down menus for certain conditions
|
||||||
|
|
Loading…
Reference in New Issue
Block a user