webui: fix 'Map all services'

tvheadend · Apr 5, 2016 · 6e8213e · 6e8213e
1 parent cdbcc2c
commit 6e8213e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/webui/static/app/servicemapper.js b/src/webui/static/app/servicemapper.js
@@ -126,7 +126,7 @@ tvheadend.service_mapper0 = function(all)
         beforeShow: all ? function(panel, conf) {
             var form = panel.getForm();
             var services = form.findField('services');
-            services.on('afterrender', function() {
+            services.store.on('load', function() {
                 services.selectAll();
             });
         } : null,

diff --git a/src/webui/static/lovcombo/lovcombo-all.js b/src/webui/static/lovcombo/lovcombo-all.js
@@ -167,8 +167,10 @@ Ext.ux.form.LovCombo = Ext.extend(Ext.form.ComboBox, {
 	 * @private
 	 */
 	,onBeforeQuery:function(qe) {
-	        var d = tvheadend.regexEscape(this.getCheckedDisplay());
-		qe.query = qe.query.replace(new RegExp(d + '[ ' + this.separator + ']*'), '');
+		if (qe.query) {
+		        var d = tvheadend.regexEscape(this.getCheckedDisplay());
+			qe.query = qe.query.replace(new RegExp(d + '[ ' + this.separator + ']*'), '');
+		}
 	} // eo function onBeforeQuery
 	// }}}
 	// {{{