jason: improve select time at 'now'

1 files changed, 384 insertions, 381 deletions

diff --git a/skins/jason/now.js b/skins/jason/now.js
index 82d970f..0e4b60a 100644
--- a/skins/jason/now.js
+++ b/skins/jason/now.js
@@ -2,101 +2,105 @@
  * jason - Javascript based skin for xxv

  * Copyright(c) 2008-2009, anbr

  * 

- * http://xxv.berlios.de/
- *
- * $Id$
- */
-
-Ext.xxv.NowStore = function() {
-    return new Ext.data.GroupingStore({
-             baseParams:{cmd:'n','__cgrp':'all'}
-            ,autoLoad:{params:{start:0, limit:configuration.pageSize}}
+ * http://xxv.berlios.de/

+ *

+ * $Id$

+ */

+

+Ext.xxv.NowStore = function() {

+    return new Ext.data.GroupingStore({

+             baseParams:{cmd:'n','__cgrp':'all'}

+            ,autoLoad:{params:{start:0, limit:configuration.pageSize}}

             ,reader: new Ext.xxv.jsonReader({

                           fields: [

-                                     {name: 'id', type: 'string'}
+                                     {name: 'id', type: 'string'}

                                     ,{name: 'title', type: 'string'}

                                     ,{name: 'subtitle', type: 'string'}

                                     ,{name: 'channel', type: 'string'}

                                     ,{name: 'chid', type: 'string'}

                                     ,{name: 'grpname', type: 'string'}

                                     ,{name: 'start', type: 'string' }

-                                    ,{name: 'stop', type: 'string' }
-                                    ,{name: 'description', type: 'string'}
-                                    ,{name: 'prozent', type: 'string'}
-                                    ,{name: 'timerid', type: 'string'}
-                                    ,{name: 'timeractiv', type: 'string'}
-                                    ,{name: 'running', type: 'string'}
-                                    ,{name: 'vps', type: 'string'} //type:'date', dateFormat:'timestamp'}
+                                    ,{name: 'stop', type: 'string' }

+                                    ,{name: 'description', type: 'string'}

+                                    ,{name: 'prozent', type: 'string'}

+                                    ,{name: 'timerid', type: 'string'}

+                                    ,{name: 'timeractiv', type: 'string'}

+                                    ,{name: 'running', type: 'string'}

+                                    ,{name: 'vps', type: 'string'} //type:'date', dateFormat:'timestamp'}

                                     ,{name: 'rang', type: 'int'} //dummy field created after onload

-                                  ]
-                      })
+                                  ]

+                      })

             ,proxy : new Ext.data.HttpProxy({

                 url: XXV.help.baseURL()

                 ,method: 'GET'

-            })
-            ,sortInfo:{field:'rang', direction:'ASC'}
-            ,groupField:'grpname'
-            ,remoteGroup:true
-    });
-}
-
+            })

+            ,sortInfo:{field:'rang', direction:'ASC'}

+            ,groupField:'grpname'

+            ,remoteGroup:true

+    });

+}

+

 Ext.xxv.NowGrid = function(viewer) {

-
+

     this.viewer = viewer;

-    this.preview = new Ext.xxv.NowPreview(viewer);
-
-    // create the data store
-    this.store = new Ext.xxv.NowStore();
+    this.preview = new Ext.xxv.NowPreview(viewer);

+

+    // create the data store

+    this.store = new Ext.xxv.NowStore();

     this.store.setDefaultSort('rang', "ASC");

-
-    var range = new Array();
-    range.push([this.szPresent,0]);
-    range.push([this.szFollowing,this.szFollowing]);
-    for(var i = 0, len = configuration.periods.length; i < len; i++){
-      range.push([configuration.periods[i],configuration.periods[i]]);
-    }
-
-    this.timefield = new Ext.form.ComboBox({
-                id:'timefield'
+

+    var range = new Array();

+    range.push([this.szPresent,0]);

+    range.push([this.szFollowing,this.szFollowing]);

+    for(var i = 0, len = configuration.periods.length; i < len; i++){

+      range.push([configuration.periods[i],configuration.periods[i]]);

+    }

+

+    this.timefield = new Ext.form.ComboBox({

+                id:'timefield'

                 ,width:75

                 ,store: new Ext.data.Store({

                     reader: new Ext.data.ArrayReader({}, [{name: 'display'},{name: 'value'} ]),

                     data: range

-                })
-                ,displayField:'display'
+                })

+                ,displayField:'display'

                 ,valueField:'value'

-                ,triggerAction: 'all'
                ,lazyRender:true

-                ,listClass: 'x-combo-list-small'
-                ,mode: 'local'
-                ,emptyText:this.szPresent
-                ,selectOnFocus:false
-                ,editable: true
-                ,maskRe: /^([0-9\:]+)$/
-                ,regex: new RegExp("^([0-9]+\:[0-9]+)|("+this.szFollowing+")$")
-                ,maxLengthText: 5
+                ,triggerAction: 'all'

+                ,lazyRender:true

+                ,listClass: 'x-combo-list-small'

+                ,mode: 'local'

+                ,emptyText:this.szPresent

+                ,selectOnFocus:false

+                ,editable: true

+                ,maskRe: /^([0-9\:]+)$/

+                ,regex: new RegExp("^([0-9]+\:[0-9]+)|("+this.szFollowing+")$")

+                ,maxLengthText: 5

 				        ,listeners: {

-						      'select': {fn:this.reload, scope:this}
+						       'select': {fn:this.reload, scope:this}

 						      ,'specialkey': {fn:this.onSpecialkey, scope:this}

-				        }
-            });
-
-    this.columns = [
-        {
           header: this.szColPosition,

+				        }

+            });

+

+    this.columns = [

+        {

+           header: this.szColPosition,

            dataIndex: 'rang',

-           width: 20,
+           width: 20,

            hidden: true

-        },{
-           id:'expand'
+        },{

+           id:'expand'

            ,header: this.szColTitle

            ,dataIndex: 'title'

            ,width: 150

-           ,renderer: { fn: this.formatTitle, scope: this }
-        },{
           header: this.szColChannel,

+           ,renderer: { fn: this.formatTitle, scope: this }

+        },{

+           header: this.szColChannel,

            dataIndex: 'channel',

-           width: 50
-        },{
           header: this.szColGrpName,

+           width: 50

+        },{

+           header: this.szColGrpName,

            dataIndex: 'grpname',

-           width: 50,
+           width: 50,

            hidden: true

         },{

            header: this.szColStart,

@@ -105,181 +109,168 @@ Ext.xxv.NowGrid = function(viewer) {
         },{

            header: this.szColStop,

            dataIndex: 'stop',

-           width: 50
+           width: 50

         }

     ];

-
-    var cm = new Ext.grid.ColumnModel(this.columns);
-    cm.defaultSortable = true;
-
+

+    var cm = new Ext.grid.ColumnModel(this.columns);

+    cm.defaultSortable = true;

+

     Ext.xxv.NowGrid.superclass.constructor.call(this, {

         region: 'center'

         ,id: 'now-grid'

-        ,loadMask: false
-        ,autoExpandColumn:'expand'
+        ,loadMask: false

+        ,autoExpandColumn:'expand'

         ,cm: cm

         ,sm: new Ext.grid.RowSelectionModel({

             singleSelect:true

         })

         ,view: new Ext.grid.GroupingView({

-             enableGroupingMenu:false
+             enableGroupingMenu:false

             ,forceFit:true

-            ,showGroupName: false
-        })
-        ,tbar:new Ext.PagingToolbar({
-             pageSize: configuration.pageSize
-            ,store: this.store
-            ,displayInfo: true
-        })
-    });
-
+            ,showGroupName: false

+        })

+        ,tbar:new Ext.PagingToolbar({

+             pageSize: configuration.pageSize

+            ,store: this.store

+            ,displayInfo: true

+        })

+    });

+

     var tbPosition = 15

-    var tb = this.topToolbar;
-    tb.insert(tbPosition+0, '-');
-    tb.insert(tbPosition+1, this.timefield);
-
+    var tb = this.topToolbar;

+    tb.insert(tbPosition+0, '-');

+    tb.insert(tbPosition+1, this.timefield);

+

     this.store.on({

-         'load' :          this.onLoad
+         'load' :          this.onLoad

         ,'beforeload'    : this.onBeforeLoad

         ,'loadexception' : this.onLoadException

         ,scope:this

-    });
-
-    this.on('rowcontextmenu', this.onContextClick, this);
-    this.getSelectionModel().on('rowselect', this.preview.select, this.preview, {buffer:50});
-    this.on('rowdblclick', this.onSelectProgram, this);
+    });

+

+    this.on('rowcontextmenu', this.onContextClick, this);

+    this.getSelectionModel().on('rowselect', this.preview.select, this.preview, {buffer:50});

+    this.on('rowdblclick', this.onSelectProgram, this);

 };

 

 Ext.extend(Ext.xxv.NowGrid, Ext.grid.GridPanel, {

-
-     szTitle         : "Program guide"
-    ,szPresent       : "Present"
-    ,szFollowing     : "Following"
-    ,szFindReRun     : "Find rerun"
-    ,szProgram       : "Show program"
-    ,szRecord        : "Record"
-    ,szEditTimer     : "Edit timer"
-    ,szDeleteTimer   : "Delete timer"
-    ,szColPosition   : "Channel position"
+

+     szTitle         : "Program guide"

+    ,szPresent       : "Present"

+    ,szFollowing     : "Following"

+    ,szFindReRun     : "Find rerun"

+    ,szProgram       : "Show program"

+    ,szRecord        : "Record"

+    ,szEditTimer     : "Edit timer"

+    ,szDeleteTimer   : "Delete timer"

+    ,szColPosition   : "Channel position"

     ,szColTitle      : "Title"

     ,szColChannel    : "Channel"

     ,szColGrpName    : "Group of channel"

     ,szColStart      : "Start"

-    ,szColStop       : "Stop"
-    ,szLoadException : "Couldn't get data!\r\n{0}"
-    ,szRecordSuccess : "Successful created timer.\r\n{0}"
-    ,szRecordFailure : "Couldn't create timer!\r\n{0}"
-    ,szDeleteSuccess : "Timer deleted successful.\r\n{0}"
-    ,szDeleteFailure : "Couldn't delete timer!\r\n{0}"
-
-    ,onLoadException :  function( scope, o, arg, e) {
-      new Ext.xxv.MessageBox().msgFailure(this.szLoadException, e.message);
-    }
-    ,onBeforeLoad : function(  store, opt ) {
-
-      delete(this.store.baseParams['data']);
-
-      var time = this.timefield.lastQuery;
-      if(!time || time == '') time = this.timefield.getValue();
-      if(!time || time == this.szPresent) {
-        store.baseParams.cmd = 'n';
-      } else if(time == this.szFollowing) {
-        store.baseParams.cmd = 'nx';
-      } else {
-        store.baseParams.cmd = 'n';
-        store.baseParams.data = time;
-      }
-      this.preview.clear();
-    }
-    ,onLoad : function( store, records, opt ) {
-      var l = records.length;
-      for (var i = 0; i < l; i++) {
-        records[i].data.rang = i;
-      }
-      if(store.baseParams.data
-        && store.baseParams.cmd != 'nx'
-        && store.reader.meta 
-        && store.reader.meta.param 
-        && store.reader.meta.param.zeit) {
-        var datum = new Date(store.reader.meta.param.zeit * 1000);
-        this.ownerCt.SetPanelTitle(datum.dateFormat('l - H:i'));
-      } else if(store.baseParams.cmd == 'nx')
-        this.ownerCt.SetPanelTitle(this.szFollowing + " - " + new Date().dateFormat('H:i'));
-      else
-        this.ownerCt.SetPanelTitle(this.szPresent + " - " + new Date().dateFormat('H:i'));
-      this.getSelectionModel().selectFirstRow();
-    }
-    ,onSpecialkey : function(f, e) {
-      if(e.getKey() == e.ENTER){
-          this.reload();
-      }
-    }
-    ,onSelectProgram : function(grid, index, e) {
+    ,szColStop       : "Stop"

+    ,szLoadException : "Couldn't get data!\r\n{0}"

+    ,szRecordSuccess : "Successful created timer.\r\n{0}"

+    ,szRecordFailure : "Couldn't create timer!\r\n{0}"

+    ,szDeleteSuccess : "Timer deleted successful.\r\n{0}"

+    ,szDeleteFailure : "Couldn't delete timer!\r\n{0}"

+

+    ,onLoadException :  function( scope, o, arg, e) {

+      new Ext.xxv.MessageBox().msgFailure(this.szLoadException, e.message);

+    }

+    ,onBeforeLoad : function(  store, opt ) {

+      this.preview.clear();

+    }

+    ,onLoad : function( store, records, opt ) {

+      var l = records.length;

+      for (var i = 0; i < l; i++) {

+        records[i].data.rang = i;

+      }

+      if(store.baseParams.data

+        && store.baseParams.cmd != 'nx'

+        && store.reader.meta 

+        && store.reader.meta.param 

+        && store.reader.meta.param.zeit) {

+        var datum = new Date(store.reader.meta.param.zeit * 1000);

+        this.ownerCt.SetPanelTitle(datum.dateFormat('l - H:i'));

+      } else if(store.baseParams.cmd == 'nx')

+        this.ownerCt.SetPanelTitle(this.szFollowing + " - " + new Date().dateFormat('H:i'));

+      else

+        this.ownerCt.SetPanelTitle(this.szPresent + " - " + new Date().dateFormat('H:i'));

+      this.getSelectionModel().selectFirstRow();

+    }

+    ,onSpecialkey : function(f, e) {

+      if(e.getKey() == e.ENTER){

+          this.reload();

+      }

+    }

+    ,onSelectProgram : function(grid, index, e) {

       e.stopEvent();

       if(this.ctxRow){

           Ext.fly(this.ctxRow).removeClass('x-node-ctx');

           this.ctxRow = null;

       }

-      var record = this.store.getAt(index);
-      var data = {'id':record.data.chid,'name':record.data.channel};
-      this.viewer.openProgram(data); 
-    }
-    ,onContextClick : function(grid, index, e){
+      var record = this.store.getAt(index);

+      var data = {'id':record.data.chid,'name':record.data.channel};

+      this.viewer.openProgram(data); 

+    }

+    ,onContextClick : function(grid, index, e){

 

-        if(!this.menu){ // create context menu on first right click
+        if(!this.menu){ // create context menu on first right click

             this.menu = new Ext.menu.Menu({

                 id:'grid-ctx',

                 items: [{

                      itemId:'s'

                     ,text: this.szFindReRun

                     ,iconCls: 'find-icon'

-                    ,scope: this
+                    ,scope: this

                     ,disabled: true

-                    ,handler: function(){ this.viewer.searchTab(this.ctxRecord); }
+                    ,handler: function(){ this.viewer.searchTab(this.ctxRecord); }

                     },{

                      itemId:'p'

                     ,text: this.szProgram

                     ,iconCls: 'program-icon'

-                    ,scope: this
+                    ,scope: this

                     ,disabled: true

-                    ,handler: function(){ 
-                      var data = {'id':this.ctxRecord.data.chid,'name':this.ctxRecord.data.channel};
-                      this.viewer.openProgram(data); }
+                    ,handler: function(){ 

+                      var data = {'id':this.ctxRecord.data.chid,'name':this.ctxRecord.data.channel};

+                      this.viewer.openProgram(data); }

                     },{

                      itemId:'tn'

                     ,text: this.szRecord

                     ,iconCls: 'record-icon'

-                    ,scope:this
+                    ,scope:this

                     ,disabled: true

-                    ,handler: function() { this.Record(this.ctxRecord); }
-                    },{
+                    ,handler: function() { this.Record(this.ctxRecord); }

+                    },{

                      itemId:'te'

                     ,text: this.szEditTimer

                     ,iconCls: 'timer-edit-icon'

-                    ,scope:this
+                    ,scope:this

                     ,disabled: true

-                    ,handler: function() { this.EditTimer(this.ctxRecord, this.store); }
-                    },{
+                    ,handler: function() { this.EditTimer(this.ctxRecord, this.store); }

+                    },{

                      itemId:'td'

                     ,text: this.szDeleteTimer

                     ,iconCls: 'timer-delete-icon'

-                    ,scope:this
+                    ,scope:this

                     ,disabled: true

-                    ,handler: function() { this.DeleteTimer(this.ctxRecord, this.store); }
+                    ,handler: function() { this.DeleteTimer(this.ctxRecord, this.store); }

                     },'-',{

                      itemId:'lst'

                     ,iconCls:'stream-icon'

                     ,text: XXV.side.webcastText

                     ,scope: this

                     ,disabled: true

-                    ,handler: function(){ XXV.side.onWebCastChannel(this.ctxRecord.data.chid); }
+                    ,handler: function(){ XXV.side.onWebCastChannel(this.ctxRecord.data.chid); }

                     },{

                      itemId:'sw'

                     ,iconCls: 'switch-icon'

                     ,text: XXV.side.switchText

                     ,scope: this

                     ,disabled: true

-                    ,handler: function(){ XXV.side.onSwitchChannel(this.ctxRecord.data.chid); }
+                    ,handler: function(){ XXV.side.onSwitchChannel(this.ctxRecord.data.chid); }

                     }

                 ]

             });

@@ -292,25 +283,25 @@ Ext.extend(Ext.xxv.NowGrid, Ext.grid.GridPanel, {
         }

         this.ctxRow = this.view.getRow(index);

         this.ctxRecord = this.store.getAt(index);

-        Ext.fly(this.ctxRow).addClass('x-node-ctx');
-
-        var timerid = this.ctxRecord.data.timerid;
-        var follow = this.store.baseParams.cmd != 'n' || this.store.baseParams.data; 
+        Ext.fly(this.ctxRow).addClass('x-node-ctx');

+

+        var timerid = this.ctxRecord.data.timerid;

+        var follow = this.store.baseParams.cmd != 'n' || this.store.baseParams.data; 

         var items = this.menu.items;

-        if(items) { items.eachKey(function(key, f) {
-                      if(follow) {
-                        if(f.itemId == 'lst') 
-                          return;
-                        if(f.itemId == 'sw') 
-                          return;
-                      }
-                      if(f.itemId == 'tn') { if(timerid) f.hide(); else f.show(); }
-                      else if(f.itemId == 'te') { if(timerid) f.show(); else f.hide(); }
-                      else if(f.itemId == 'td') { if(timerid) f.show(); else f.hide(); }
-                      if(XXV.help.cmdAllowed(f.itemId)) 
-                        f.enable();
-                      },items); 
-                  }
+        if(items) { items.eachKey(function(key, f) {

+                      if(follow) {

+                        if(f.itemId == 'lst') 

+                          return;

+                        if(f.itemId == 'sw') 

+                          return;

+                      }

+                      if(f.itemId == 'tn') { if(timerid) f.hide(); else f.show(); }

+                      else if(f.itemId == 'te') { if(timerid) f.show(); else f.hide(); }

+                      else if(f.itemId == 'td') { if(timerid) f.show(); else f.hide(); }

+                      if(XXV.help.cmdAllowed(f.itemId)) 

+                        f.enable();

+                      },items); 

+                  }

         this.menu.showAt(e.getXY());

     }

 

@@ -318,176 +309,188 @@ Ext.extend(Ext.xxv.NowGrid, Ext.grid.GridPanel, {
         if(this.ctxRow){

             Ext.fly(this.ctxRow).removeClass('x-node-ctx');

             this.ctxRow = null;

-        }
-        if(this.menu) {
-          this.menu.destroy();
-          delete this.menu;
-          this.menu = null;
+        }

+        if(this.menu) {

+          this.menu.destroy();

+          delete this.menu;

+          this.menu = null;

         }

     }

+    ,reload : function() {

+        if(this.store.baseParams.data)

+          delete(this.store.baseParams['data']);

 

-    ,reload : function() {
+        var time = this.timefield.lastQuery;

+        if(!time || time == '') time = this.timefield.getValue();

+        if(!time || time == this.szPresent) {

+          this.store.baseParams.cmd = 'n';

+        } else if(time == this.szFollowing) {

+          this.store.baseParams.cmd = 'nx';

+        } else {

+          this.store.baseParams.cmd = 'n';

+          this.store.baseParams.data = time;

+        }   

         this.store.load({params:{start:0, limit:configuration.pageSize}});

     }

-
-/******************************************************************************/
-    ,onRecordSuccess : function( response,options ) 
-    { 
-        this.viewer.loadMask.hide();
+

+/******************************************************************************/

+    ,onRecordSuccess : function( response,options ) 

+    { 

+        this.viewer.loadMask.hide();

         var json = response.responseText;

         var o = eval("("+json+")");

         if(!o || !o.data || typeof(o.data) != 'string') {

           throw {message: "Ajax.read: Json message not found"};

-        }
-        if(o.success) {
-            new Ext.xxv.MessageBox().msgSuccess(this.szRecordSuccess, o.data);
-            this.updateTimer();
-        } else {
-            new Ext.xxv.MessageBox().msgFailure(this.szRecordFailure, o.data);
-        }
-    }
-    ,onRecordFailure : function( response,options ) 
-    { 
-        this.viewer.loadMask.hide();
-        new Ext.xxv.MessageBox().msgFailure(this.szRecordFailure, response.statusText);
-    }
-    ,Record : function(record) {
-        this.RecordID(record.data.id);
-    }
-    ,RecordID : function(id) {
-        this.viewer.loadMask.show();
-        Ext.Ajax.request({
-              scope: this
-             ,url: XXV.help.cmdAJAX('tn',{ data: id, '__fast':'1' })
-             ,success: this.onRecordSuccess
-             ,failure: this.onRecordFailure
-          });
-    }
-    ,updateTimer : function() {
-      if(this.viewer.gridTimer) {
-        this.viewer.gridTimer.dataDirty = true;
-      }
-    }
-    ,EditTimer : function(record,store) {
-      var item;
-
-      if(record.data.timerid) {
-        item = {
-           cmd:   'te'
-          ,id:    record.data.timerid
-          ,title: record.data.title
-        };
-      } else {
-        item = {
-           cmd:   'tn'
-          ,id:    record.data.id
-          ,title: this.szEditTimer
-        };
-      }
-
-      if(this.viewer.formwin){
+        }

+        if(o.success) {

+            new Ext.xxv.MessageBox().msgSuccess(this.szRecordSuccess, o.data);

+            this.updateTimer();

+        } else {

+            new Ext.xxv.MessageBox().msgFailure(this.szRecordFailure, o.data);

+        }

+    }

+    ,onRecordFailure : function( response,options ) 

+    { 

+        this.viewer.loadMask.hide();

+        new Ext.xxv.MessageBox().msgFailure(this.szRecordFailure, response.statusText);

+    }

+    ,Record : function(record) {

+        this.RecordID(record.data.id);

+    }

+    ,RecordID : function(id) {

+        this.viewer.loadMask.show();

+        Ext.Ajax.request({

+              scope: this

+             ,url: XXV.help.cmdAJAX('tn',{ data: id, '__fast':'1' })

+             ,success: this.onRecordSuccess

+             ,failure: this.onRecordFailure

+          });

+    }

+    ,updateTimer : function() {

+      if(this.viewer.gridTimer) {

+        this.viewer.gridTimer.dataDirty = true;

+      }

+    }

+    ,EditTimer : function(record,store) {

+      var item;

+

+      if(record.data.timerid) {

+        item = {

+           cmd:   'te'

+          ,id:    record.data.timerid

+          ,title: record.data.title

+        };

+      } else {

+        item = {

+           cmd:   'tn'

+          ,id:    record.data.id

+          ,title: this.szEditTimer

+        };

+      }

+

+      if(this.viewer.formwin){

         this.viewer.formwin.close();

       }

-      this.viewer.formwin = new Ext.xxv.Question(item,store);
-    }
-    /******************************************************************************/
-    ,onDeleteSuccess : function( response,options ) 
-    { 
-        this.viewer.loadMask.hide(); 
-
+      this.viewer.formwin = new Ext.xxv.Question(item,store);

+    }

+    /******************************************************************************/

+    ,onDeleteSuccess : function( response,options ) 

+    { 

+        this.viewer.loadMask.hide(); 

+

         var o = eval("("+response.responseText+")");

-
-        if(o && o.data && typeof(o.data) == 'string' 
-             && o.success) {
-            new Ext.xxv.MessageBox().msgSuccess(this.szDeleteSuccess, o.data);
-    
-      	    var items = options.params.data.split(",");
-            for (var j = 0, jlen = options.store.getCount(); j < jlen; j++) {
-              var record = options.store.getAt(j);
-              for(var i = 0, len = items.length; i < len; i++){
-                if(!record || record.data.timerid != items[i]) {
-                  continue;
-                }
-                record.data.timerid = 0;
-                record.commit();
-              }
-            }
-            this.updateTimer();
-        } else {
-            var msg = '';
-            if(o && o.data && typeof(o.data) == 'string') {
-              msg = o.data;
-            }
-            new Ext.xxv.MessageBox().msgFailure(this.szDeleteFailure, msg);
-        }
-    }
-    ,onDeleteFailure : function( response,options ) 
-    { 
-        this.viewer.loadMask.hide();
-        new Ext.xxv.MessageBox().msgFailure(this.szDeleteFailure, response.statusText);
-    }
-    ,DeleteTimer : function(record) {
-        var gsm = this.getSelectionModel();
-        var sel = gsm.getSelections()
-        if(sel.length <= 0) {
-         gsm.selectRecords([record]);
-         sel.push(record);
-        }
-        var items = "";
-        for(var i = 0, len = sel.length; i < len; i++){
-          if(i != 0)
-     	      items += ',';
-          if(sel[i].data.timerid == 0) {
-            continue;
-          }
-	        items += sel[i].data.timerid;
-        }
-        this.DeleteTimerId(items, this.store);
-    }
-    ,DeleteTimerId : function( items,store ) {
-      if(items.length <= 0)
-        return;
-      this.viewer.loadMask.show(); 
-
-      Ext.Ajax.request({
-          scope: this
-         ,url: XXV.help.cmdAJAX('td')
-         ,timeout: 15000
-         ,success: this.onDeleteSuccess
-         ,failure: this.onDeleteFailure
-         ,store:   store
-         ,params:{ data: items }
-      });
-    }
-
-    ,formatTitle: function(value, p, record) {
-
-	      var style = "";
-        if(record.data.timerid) {
-	        if(record.data.timeractiv != 1) {
-	          style = " deactive";
-	        } else if(record.data.running == 1) {
-	          style = " running";
-	        } else {
-            style = " active";
-          }
-        }
-
+

+        if(o && o.data && typeof(o.data) == 'string' 

+             && o.success) {

+            new Ext.xxv.MessageBox().msgSuccess(this.szDeleteSuccess, o.data);

+    

+      	    var items = options.params.data.split(",");

+            for (var j = 0, jlen = options.store.getCount(); j < jlen; j++) {

+              var record = options.store.getAt(j);

+              for(var i = 0, len = items.length; i < len; i++){

+                if(!record || record.data.timerid != items[i]) {

+                  continue;

+                }

+                record.data.timerid = 0;

+                record.commit();

+              }

+            }

+            this.updateTimer();

+        } else {

+            var msg = '';

+            if(o && o.data && typeof(o.data) == 'string') {

+              msg = o.data;

+            }

+            new Ext.xxv.MessageBox().msgFailure(this.szDeleteFailure, msg);

+        }

+    }

+    ,onDeleteFailure : function( response,options ) 

+    { 

+        this.viewer.loadMask.hide();

+        new Ext.xxv.MessageBox().msgFailure(this.szDeleteFailure, response.statusText);

+    }

+    ,DeleteTimer : function(record) {

+        var gsm = this.getSelectionModel();

+        var sel = gsm.getSelections()

+        if(sel.length <= 0) {

+         gsm.selectRecords([record]);

+         sel.push(record);

+        }

+        var items = "";

+        for(var i = 0, len = sel.length; i < len; i++){

+          if(i != 0)

+     	      items += ',';

+          if(sel[i].data.timerid == 0) {

+            continue;

+          }

+	        items += sel[i].data.timerid;

+        }

+        this.DeleteTimerId(items, this.store);

+    }

+    ,DeleteTimerId : function( items,store ) {

+      if(items.length <= 0)

+        return;

+      this.viewer.loadMask.show(); 

+

+      Ext.Ajax.request({

+          scope: this

+         ,url: XXV.help.cmdAJAX('td')

+         ,timeout: 15000

+         ,success: this.onDeleteSuccess

+         ,failure: this.onDeleteFailure

+         ,store:   store

+         ,params:{ data: items }

+      });

+    }

+

+    ,formatTitle: function(value, p, record) {

+

+	      var style = "";

+        if(record.data.timerid) {

+	        if(record.data.timeractiv != 1) {

+	          style = " deactive";

+	        } else if(record.data.running == 1) {

+	          style = " running";

+	        } else {

+            style = " active";

+          }

+        }

+

         return String.format(

-                '<div class="topic{2}"><b>{0}</b> <span class="subtitle">{1}</span></div>'
+                '<div class="topic{2}"><b>{0}</b> <span class="subtitle">{1}</span></div>'

                 , value, record.data.subtitle, style

                 );

     }

-});
-
-Ext.xxv.NowPreview = function(viewer) {
-    this.viewer = viewer;
+});

+

+Ext.xxv.NowPreview = function(viewer) {

+    this.viewer = viewer;

     Ext.xxv.NowPreview.superclass.constructor.call(this, {

         id: 'now-preview',

         region: 'south',

         cls:'preview',

         autoScroll: true,

-        stateful:true,
+        stateful:true,

         tbar: [ {

             id:'s',

             tooltip: Ext.xxv.NowGrid.prototype.szFindReRun,

@@ -508,8 +511,8 @@ Ext.xxv.NowPreview = function(viewer) {
             iconCls: 'timer-edit-icon',

             disabled:true,

             scope: viewer,

-            handler: function(){
-              this.gridNow.EditTimer(this.gridNow.getSelectionModel().getSelected()); 
+            handler: function(){

+              this.gridNow.EditTimer(this.gridNow.getSelectionModel().getSelected()); 

             }

         },{

             id:'td',

@@ -517,51 +520,51 @@ Ext.xxv.NowPreview = function(viewer) {
             iconCls: 'timer-delete-icon',

             disabled:true,

             scope: viewer,

-            handler: function(){
-              this.gridNow.DeleteTimer(this.gridNow.getSelectionModel().getSelected()); 
+            handler: function(){

+              this.gridNow.DeleteTimer(this.gridNow.getSelectionModel().getSelected()); 

             }

         } ]

-    });
-};
-
-Ext.extend(Ext.xxv.NowPreview, Ext.Panel, {
-  select : function(sm, index, record){
+    });

+};

+

+Ext.extend(Ext.xxv.NowPreview, Ext.Panel, {

+  select : function(sm, index, record){

     if(this.body)

-      XXV.getTemplate().overwrite(this.body, record.data);
-
-    // Enable all toolbar buttons
+      XXV.getTemplate().overwrite(this.body, record.data);

+

+    // Enable all toolbar buttons

     var items = this.topToolbar.items;

-    if(items) { 
-        items.eachKey(function(key, f) {
-                  if(f.id == 'tn')      { if(record.data.timerid) f.hide(); else f.show(); }
-                  else if(f.id == 'te') { if(record.data.timerid) f.show(); else f.hide(); }
-                  else if(f.id == 'td') { if(record.data.timerid) f.show(); else f.hide(); }
-                  if(XXV.help.cmdAllowed(key)) f.enable();
-          },items); 
-      }
+    if(items) { 

+        items.eachKey(function(key, f) {

+                  if(f.id == 'tn')      { if(record.data.timerid) f.hide(); else f.show(); }

+                  else if(f.id == 'te') { if(record.data.timerid) f.show(); else f.hide(); }

+                  else if(f.id == 'td') { if(record.data.timerid) f.show(); else f.hide(); }

+                  if(XXV.help.cmdAllowed(key)) f.enable();

+          },items); 

+      }

   }

-  ,clear: function(){
+  ,clear: function(){

       if(this) {

-        if(this.body)
+        if(this.body)

            this.body.update('');

-        // Disable all items
+        // Disable all items

         var items = this.topToolbar.items;

-        if(items) { items.eachKey(function(key, f){f.disable();},items); }
-      }
-   }
-});
-
-function createNowView(viewer,id) {
-
-    viewer.gridNow = new Ext.xxv.NowGrid(viewer);
-
+        if(items) { items.eachKey(function(key, f){f.disable();},items); }

+      }

+   }

+});

+

+function createNowView(viewer,id) {

+

+    viewer.gridNow = new Ext.xxv.NowGrid(viewer);

+

     var tab = new Ext.xxv.Panel({

-            id:id,
+            id:id,

             stateful:true,

             iconCls: 'channel-icon',

             layout:'border',

             items:[

-                viewer.gridNow,
+                viewer.gridNow,

             {

                 id:'now-bottom-preview',

                 layout:'fit',

@@ -574,14 +577,14 @@ function createNowView(viewer,id) {
             }, {

                 id:'now-right-preview',

                 layout:'fit',

-                items:XXV.RightPreview ? 0 : viewer.gridNow.preview,
+                items:XXV.RightPreview ? 0 : viewer.gridNow.preview,

                 border:false,

                 region:'east',

                 width:350,

                 split: true,

                 hidden:XXV.RightPreview

-            }]
+            }]

     });

-
-    return tab;
-}
+

+    return tab;

+}