stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

WEBUI JS: fix the any match query for comboboxes

Browse source
This commit is contained in:
Jaroslav Kysela 2014-09-08 17:55:58 +02:00
parent df01566def
commit ba01c1000a
2 changed files with 54 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/webui/static/app/idnode.js
View file

@ -239,6 +239,7 @@ tvheadend.IdNodeField = function(conf)
this.editor = function(conf)
{
var cons = null;
var combo = false;
/* Editable? */
var d = this.rdonly;
@ -269,6 +270,8 @@ tvheadend.IdNodeField = function(conf)
c['forceSelection'] = false;
c['triggerAction'] = 'all';
c['emptyText'] = 'Select ' + this.text + ' ...';
combo = true;
/* Single */
} else {
@ -302,7 +305,10 @@ tvheadend.IdNodeField = function(conf)
}
}
return new cons(c);
var r = new cons(c);
if (combo)
r.doQuery = tvheadend.doQueryAnyMatch;
return r;
};
};
@ -410,6 +416,9 @@ tvheadend.idnode_editor_field = function(f, create)
}
}
});
r.doQuery = tvheadend.doQueryAnyMatch;
if (st.on) {
var fn = function() {
st.un('load', fn);
@ -417,50 +426,7 @@ tvheadend.idnode_editor_field = function(f, create)
};
st.on('load', fn);
}
// any match mode
r.doQuery = function(q, forceAll){
q = Ext.isEmpty(q) ? '' : q;
var qe = {
query: q,
forceAll: forceAll,
combo: this,
cancel:false
};
if (this.fireEvent('beforequery', qe) === false || qe.cancel)
return false;
q = qe.query;
forceAll = qe.forceAll;
if (forceAll === true || (q.length >= this.minChars)) {
if (this.lastQuery !== q) {
this.lastQuery = q;
if (this.mode == 'local') {
this.selectedIndex = -1;
if (forceAll) {
this.store.clearFilter();
}
else {
this.store.filter(this.displayField, q, true); // supply the anyMatch option
}
this.onLoad();
}
else {
this.store.baseParams[this.queryParam] = q;
this.store.load({
params: this.getParams(q)
});
this.expand();
}
}
else {
this.selectedIndex = -1;
this.onLoad();
}
}
};
return r;
/* TODO: listeners for regexp?
listeners : {

44
src/webui/static/app/tvheadend.js
View file

@ -90,6 +90,49 @@ tvheadend.loading = function(on) {
Ext.getBody().unmask();
};
/*
* Any Match option in ComboBox queries
* This query is identical as in extjs-all.js
* except one
*/
tvheadend.doQueryAnyMatch = function(q, forceAll) {
q = Ext.isEmpty(q) ? '' : q;
var qe = {
query: q,
forceAll: forceAll,
combo: this,
cancel:false
};
if (this.fireEvent('beforequery', qe) === false || qe.cancel)
return false;
q = qe.query;
forceAll = qe.forceAll;
if (forceAll === true || (q.length >= this.minChars)) {
if (this.lastQuery !== q) {
this.lastQuery = q;
if (this.mode == 'local') {
this.selectedIndex = -1;
if (forceAll) {
this.store.clearFilter();
} else {
/* supply the anyMatch option (last param) */
this.store.filter(this.displayField, q, true);
}
this.onLoad();
} else {
this.store.baseParams[this.queryParam] = q;
this.store.load({ params: this.getParams(q) });
this.expand();
}
} else {
this.selectedIndex = -1;
this.onLoad();
}
}
}
/*
* General capabilities
*/
@ -494,4 +537,3 @@ tvheadend.app = function() {
};
}(); // end of app