From 08434b14f19e2551a5658d2277abe06b35b74610 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Thu, 23 Aug 2012 15:09:48 +0100 Subject: [PATCH] Fix some javascript syntax errors that seem to bother IE9. Fixes #1081. --- src/webui/static/app/config.js | 10 +++++----- src/webui/static/app/epggrab.js | 30 +++++++++++++++--------------- src/webui/static/app/iptv.js | 4 ++-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/webui/static/app/config.js b/src/webui/static/app/config.js index e97f20b7..e3830720 100644 --- a/src/webui/static/app/config.js +++ b/src/webui/static/app/config.js @@ -7,7 +7,7 @@ tvheadend.miscconf = function() { var confreader = new Ext.data.JsonReader( { root: 'config' }, [ - 'muxconfpath', 'language', + 'muxconfpath', 'language' ] ); @@ -18,13 +18,13 @@ tvheadend.miscconf = function() { var dvbscanPath = new Ext.form.TextField({ fieldLabel : 'DVB scan files path', name : 'muxconfpath', - allowBlank : true, + allowBlank : true }); var language = new Ext.form.TextField({ fieldLabel : 'Default Language(s)', name : 'language', - allowBlank : true, + allowBlank : true }); /* **************************************************************** @@ -35,7 +35,7 @@ tvheadend.miscconf = function() { text : "Save configuration", tooltip : 'Save changes made to configuration below', iconCls :'save', - handler : saveChanges, + handler : saveChanges }); var helpButton = new Ext.Button({ @@ -60,7 +60,7 @@ tvheadend.miscconf = function() { autoHeight : true, items : [ language, - dvbscanPath, + dvbscanPath ], tbar: [ saveButton, diff --git a/src/webui/static/app/epggrab.js b/src/webui/static/app/epggrab.js index 9ea3af9b..47827b7e 100644 --- a/src/webui/static/app/epggrab.js +++ b/src/webui/static/app/epggrab.js @@ -77,7 +77,7 @@ tvheadend.epggrab = function() { { root: 'epggrabSettings' }, [ 'module', 'interval', - 'channel_rename', 'channel_renumber', 'channel_reicon', + 'channel_rename', 'channel_renumber', 'channel_reicon' ] ); @@ -172,12 +172,12 @@ tvheadend.epggrab = function() { */ var channelRename = new Ext.form.Checkbox({ name : 'channel_rename', - fieldLabel : 'Update channel name', + fieldLabel : 'Update channel name' }); var channelRenumber = new Ext.form.Checkbox({ name : 'channel_renumber', - fieldLabel : 'Update channel number', + fieldLabel : 'Update channel number' }); var channelReicon = new Ext.form.Checkbox({ @@ -200,7 +200,7 @@ tvheadend.epggrab = function() { intervalUnit, channelRename, channelRenumber, - channelReicon, + channelReicon ] }); @@ -231,14 +231,14 @@ tvheadend.epggrab = function() { header : 'Module', dataIndex : 'name', width : 200, - sortable : false, + sortable : false }, { header : 'Path', dataIndex : 'path', width : 300, - sortable : false, - }, + sortable : false + } ]); var externalGrid = new Ext.grid.EditorGridPanel({ @@ -249,9 +249,9 @@ tvheadend.epggrab = function() { height : 150, frame : false, viewConfig : { - forceFit : true, + forceFit : true }, - iconCls : 'icon-grid', + iconCls : 'icon-grid' }); var externalPanel = new Ext.form.FieldSet({ @@ -287,7 +287,7 @@ tvheadend.epggrab = function() { header : 'Module', dataIndex : 'name', width : 200, - sortable : false, + sortable : false } ]); @@ -299,9 +299,9 @@ tvheadend.epggrab = function() { height : 150, frame : false, viewConfig : { - forceFit : true, + forceFit : true }, - iconCls : 'icon-grid', + iconCls : 'icon-grid' }); var otaPanel = new Ext.form.FieldSet({ @@ -312,7 +312,7 @@ tvheadend.epggrab = function() { collapsed : true, items : [ otaGrid - ], + ] }); /* **************************************************************** @@ -323,7 +323,7 @@ tvheadend.epggrab = function() { text : "Save configuration", tooltip : 'Save changes made to configuration below', iconCls :'save', - handler : saveChanges, + handler : saveChanges }); var helpButton = new Ext.Button({ @@ -349,7 +349,7 @@ tvheadend.epggrab = function() { items : [ simplePanel, externalPanel, - otaPanel, + otaPanel ], tbar: [ saveButton, diff --git a/src/webui/static/app/iptv.js b/src/webui/static/app/iptv.js index 397df19a..af92f903 100644 --- a/src/webui/static/app/iptv.js +++ b/src/webui/static/app/iptv.js @@ -4,7 +4,7 @@ tvheadend.servicetypeStore = new Ext.data.JsonStore({ url : '/iptv/services', baseParams : { op : 'servicetypeList' }, fields : [ 'val', 'str' ], - autoLoad : true, + autoLoad : true }); /** @@ -109,7 +109,7 @@ tvheadend.iptv = function(adapterId) { editable : false, mode : 'local', triggerAction : 'all', - store : tvheadend.servicetypeStore, + store : tvheadend.servicetypeStore }), renderer: function(value, metadata, record, row, col, store) { var val = value ? tvheadend.servicetypeStore.getById(value) : null;