WEBUI: EPG - cleanups in the comet code

diff --git a/src/webui/static/app/epg.js b/src/webui/static/app/epg.js
index d4be5df7efeb3f9e8ae7fc75676b632d491570fb..16d824cec7e9cec7419c1d94dce752bb52103a45 100644 (file)
--- a/src/webui/static/app/epg.js
+++ b/src/webui/static/app/epg.js
@@ -938,18 +938,9 @@ tvheadend.epg = function() {
                     },
                     success: function(d) {
                         d = json_decode(d);
-                        for (var i = 0; i < d.length; i++) {
-                            var r = epgStore.getById(d[i].eventId);
-                            if (r) {
-                                for (var j = 0; j < r.store.fields.items.length; j++) {
-                                    var n = r.store.fields.items[j];
-                                    var v = d[i][n.name];
-                                    r.data[n.name] = n.convert((v !== undefined) ? v : n.defaultValue, v);
-                                }
-                                r.json = d[i];
-                                r.commit();
-                            }
-                        }
+                        Ext.each(d, function(jd) {
+                            tvheadend.replace_entry(epgStore.getById(jd.eventId), jd);
+                        });
                     },
                     failure: function(response, options) {
                         Ext.MessageBox.alert(_('EPG Update'), response.statusText);

diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js
index 4c8d4346ce86338ca2b4a3dfd63b9de0708a0f75..ed432962e1cbd9856dd21dbec04cb04c6269839a 100644 (file)
--- a/src/webui/static/app/tvheadend.js
+++ b/src/webui/static/app/tvheadend.js
@@ -164,6 +164,20 @@ tvheadend.doQueryAnyMatch = function(q, forceAll) {
     }
 }
 
+/*
+ * Replace one entry
+ */
+
+tvheadend.replace_entry = function(r, d) {
+  if (!r) return;
+  r.store.fields.each(function (n) {
+    var v = d[n.name];
+    r.data[n.name] = n.convert((v !== undefined) ? v : n.defaultValue, v);
+  });
+  r.json = d;
+  r.commit();
+}
+
 /*
  * General capabilities
  */