Fix shortcut hoverhelp, javascript, and criteria builder usability. Fixes bug #11516
This commit is contained in:
parent
33c54b66b6
commit
982e5117f1
4 changed files with 36 additions and 20 deletions
|
|
@ -1,12 +1,29 @@
|
|||
function wgCriteriaDisable ( form, toDisable ) {
|
||||
var new_state = toDisable ? false : true;
|
||||
var elements = YAHOO.util.Dom.getElementsByClassName('qbselect');
|
||||
var buttons = YAHOO.util.Dom.getElementsByClassName('qbButton');
|
||||
form.resolveMultiples.disabled = new_state;
|
||||
form.shortcutCriteria.disabled = new_state;
|
||||
for(idx=0; idx < elements.length; idx++) {
|
||||
elements[idx].disabled = new_state;
|
||||
}
|
||||
for(idx=0; idx < buttons.length; idx++) {
|
||||
buttons[idx].disabled = new_state;
|
||||
}
|
||||
}
|
||||
|
||||
function addCriteria ( fieldname, opform, valform ) {
|
||||
var form = opform.form;
|
||||
var operator = getValue(opform);
|
||||
var value = getValue(valform);
|
||||
var criteria = form.shortcutCriteria.value;
|
||||
var conjunction = "";
|
||||
if (form.shortcutCriteria.disabled == true) {
|
||||
return;
|
||||
}
|
||||
if(! /^\s*$/.test(criteria)) {
|
||||
conjunction = " " + getValue(form.conjunction) + " ";
|
||||
}
|
||||
}
|
||||
//handle quotes
|
||||
if(/\s+/.test(fieldname)) {
|
||||
fieldname = '"' + fieldname + '"';
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue