roojs-ui-debug.js

roojs-ui.js
roojs-all.js
roojs-debug.js

diff --git a/roojs-all.js b/roojs-all.js
index 2dec07a..ff7a9fc 100644 (file)
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -1077,8 +1077,7 @@ this.addEvents({"click":true,"dblclick":true,"contextmenu":true,"mousedown":true
 this.relayEvents(c,["mousedown","mouseup","mouseover","mouseout","keypress"]);this.getSelectionModel().init(this);A.render();if(this.loadMask){this.loadMask=new Roo.LoadMask(this.container,Roo.apply({store:this.dataSource},this.loadMask));}if(this.toolbar&&this.toolbar.xtype){this.toolbar.container=this.getView().getHeaderPanel(true);this.toolbar=new Roo.Toolbar(this.toolbar);}if(this.footer&&this.footer.xtype){this.footer.dataSource=this.getDataSource();this.footer.container=this.getView().getFooterPanel(true);this.footer=Roo.factory(this.footer,Roo);}if(this.dropTarget&&this.dropTarget.xtype){delete this.dropTarget.xtype;this.dropTarget=new Roo.dd.DropTarget(this.getView().mainBody,this.dropTarget);}
 this.rendered=true;this.fireEvent('render',this);return this;},reconfigure:function(A,B){if(this.loadMask){this.loadMask.destroy();this.loadMask=new Roo.LoadMask(this.container,Roo.apply({store:A},this.loadMask));}
 this.view.bind(A,B);this.dataSource=A;this.colModel=B;this.view.refresh(true);},onKeyDown:function(e){this.fireEvent("keydown",e);},destroy:function(A,B){if(this.loadMask){this.loadMask.destroy();}var c=this.container;c.removeAllListeners();this.view.destroy();this.colModel.purgeListeners();if(!B){this.purgeListeners();}
-c.update("");if(A===true){c.remove();}},processEvent:function(A,e){Roo.log('grid:processEvent '+A);if(Roo.isTouch&&A=='click'){return;}
-this.fireEvent(A=='touchstart'?'click':A,e);var t=e.getTarget();var v=this.view;var B=v.findHeaderIndex(t);if(B!==false){this.fireEvent("header"+(A=='touchstart'?'click':A),this,B,e);}else {var C=v.findRowIndex(t);var D=v.findCellIndex(t);if(A=='touchstart'){A='click';if(typeof(this.selModel.getSelectedCell)!='undefined'){var cs=this.selModel.getSelectedCell();if(C==cs[0]&&D==cs[1]){A='dblclick';}}if(typeof(this.selModel.getSelections)!='undefined'){var cs=this.selModel.getSelections();var ds=this.dataSource;if(cs.length==1&&ds.getAt(C)==cs[0]){A='dblclick';}}}if(C!==false){this.fireEvent("row"+A,this,C,e);if(D!==false){this.fireEvent("cell"+A,this,C,D,e);}}}},onClick:function(e){this.processEvent("click",e);},onTouchStart:function(e){this.processEvent("touchstart",e);},onContextMenu:function(e,t){this.processEvent("contextmenu",e);},onDblClick:function(e){this.processEvent("dblclick",e);},walkCells:function(A,B,C,fn,D){var cm=this.colModel,E=cm.getColumnCount();var ds=this.dataSource,F=ds.getCount(),G=true;if(C<0){if(B<0){A--;G=false;}while(A>=0){if(!G){B=E-1;}
+c.update("");if(A===true){c.remove();}},processEvent:function(A,e){Roo.log('grid:processEvent '+A);if(A!='touchstart'){this.fireEvent(A,e);}var t=e.getTarget();var v=this.view;var B=v.findHeaderIndex(t);if(B!==false){this.fireEvent("header"+(A=='touchstart'?'click':A),this,B,e);}else {var C=v.findRowIndex(t);var D=v.findCellIndex(t);if(A=='touchstart'){A=false;if(typeof(this.selModel.getSelectedCell)!='undefined'){var cs=this.selModel.getSelectedCell();if(C==cs[0]&&D==cs[1]){A='dblclick';}}if(typeof(this.selModel.getSelections)!='undefined'){var cs=this.selModel.getSelections();var ds=this.dataSource;if(cs.length==1&&ds.getAt(C)==cs[0]){A='dblclick';}}if(!A){return;}}if(C!==false){this.fireEvent("row"+A,this,C,e);if(D!==false){this.fireEvent("cell"+A,this,C,D,e);}}}},onClick:function(e){this.processEvent("click",e);},onTouchStart:function(e){this.processEvent("touchstart",e);},onContextMenu:function(e,t){this.processEvent("contextmenu",e);},onDblClick:function(e){this.processEvent("dblclick",e);},walkCells:function(A,B,C,fn,D){var cm=this.colModel,E=cm.getColumnCount();var ds=this.dataSource,F=ds.getCount(),G=true;if(C<0){if(B<0){A--;G=false;}while(A>=0){if(!G){B=E-1;}
 G=false;while(B>=0){if(fn.call(D||this,A,B,cm)===true){return [A,B];}
 B--;}
 A--;}}else {if(B>=E){A++;G=false;}while(A<F){if(!G){B=0;}

diff --git a/roojs-debug.js b/roojs-debug.js
index 7d25451..3bfab6f 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -50816,11 +50816,11 @@ Roo.extend(Roo.grid.Grid, Roo.util.Observable, {
     processEvent : function(name, e){
         // does this fire select???
         Roo.log('grid:processEvent '  + name);
-        if (Roo.isTouch && name == 'click') {
-            return;
+        
+        if (name != 'touchstart' ) {
+            this.fireEvent(name, e);    
         }
         
-        this.fireEvent(name == 'touchstart' ? 'click' : name, e);
         var t = e.getTarget();
         var v = this.view;
         var header = v.findHeaderIndex(t);
@@ -50832,7 +50832,7 @@ Roo.extend(Roo.grid.Grid, Roo.util.Observable, {
             if (name == 'touchstart') {
                 // first touch is always a click.
                 // hopefull this happens after selection is updated.?
-                name = 'click';
+                name = false;
                 
                 if (typeof(this.selModel.getSelectedCell) != 'undefined') {
                     var cs = this.selModel.getSelectedCell();
@@ -50847,7 +50847,9 @@ Roo.extend(Roo.grid.Grid, Roo.util.Observable, {
                         name = 'dblclick';
                     }
                 }
-                
+                if (!name) {
+                    return;
+                }
             }
             
             

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index b2bd2e1..816925e 100644 (file)
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -35867,11 +35867,11 @@ Roo.extend(Roo.grid.Grid, Roo.util.Observable, {
     processEvent : function(name, e){
         // does this fire select???
         Roo.log('grid:processEvent '  + name);
-        if (Roo.isTouch && name == 'click') {
-            return;
+        
+        if (name != 'touchstart' ) {
+            this.fireEvent(name, e);    
         }
         
-        this.fireEvent(name == 'touchstart' ? 'click' : name, e);
         var t = e.getTarget();
         var v = this.view;
         var header = v.findHeaderIndex(t);
@@ -35883,7 +35883,7 @@ Roo.extend(Roo.grid.Grid, Roo.util.Observable, {
             if (name == 'touchstart') {
                 // first touch is always a click.
                 // hopefull this happens after selection is updated.?
-                name = 'click';
+                name = false;
                 
                 if (typeof(this.selModel.getSelectedCell) != 'undefined') {
                     var cs = this.selModel.getSelectedCell();
@@ -35898,7 +35898,9 @@ Roo.extend(Roo.grid.Grid, Roo.util.Observable, {
                         name = 'dblclick';
                     }
                 }
-                
+                if (!name) {
+                    return;
+                }
             }
             
             

diff --git a/roojs-ui.js b/roojs-ui.js
index 2d2cea9..502eb30 100644 (file)
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -776,8 +776,7 @@ this.addEvents({"click":true,"dblclick":true,"contextmenu":true,"mousedown":true
 this.relayEvents(c,["mousedown","mouseup","mouseover","mouseout","keypress"]);this.getSelectionModel().init(this);A.render();if(this.loadMask){this.loadMask=new Roo.LoadMask(this.container,Roo.apply({store:this.dataSource},this.loadMask));}if(this.toolbar&&this.toolbar.xtype){this.toolbar.container=this.getView().getHeaderPanel(true);this.toolbar=new Roo.Toolbar(this.toolbar);}if(this.footer&&this.footer.xtype){this.footer.dataSource=this.getDataSource();this.footer.container=this.getView().getFooterPanel(true);this.footer=Roo.factory(this.footer,Roo);}if(this.dropTarget&&this.dropTarget.xtype){delete this.dropTarget.xtype;this.dropTarget=new Roo.dd.DropTarget(this.getView().mainBody,this.dropTarget);}
 this.rendered=true;this.fireEvent('render',this);return this;},reconfigure:function(A,B){if(this.loadMask){this.loadMask.destroy();this.loadMask=new Roo.LoadMask(this.container,Roo.apply({store:A},this.loadMask));}
 this.view.bind(A,B);this.dataSource=A;this.colModel=B;this.view.refresh(true);},onKeyDown:function(e){this.fireEvent("keydown",e);},destroy:function(A,B){if(this.loadMask){this.loadMask.destroy();}var c=this.container;c.removeAllListeners();this.view.destroy();this.colModel.purgeListeners();if(!B){this.purgeListeners();}
-c.update("");if(A===true){c.remove();}},processEvent:function(A,e){Roo.log('grid:processEvent '+A);if(Roo.isTouch&&A=='click'){return;}
-this.fireEvent(A=='touchstart'?'click':A,e);var t=e.getTarget();var v=this.view;var B=v.findHeaderIndex(t);if(B!==false){this.fireEvent("header"+(A=='touchstart'?'click':A),this,B,e);}else {var C=v.findRowIndex(t);var D=v.findCellIndex(t);if(A=='touchstart'){A='click';if(typeof(this.selModel.getSelectedCell)!='undefined'){var cs=this.selModel.getSelectedCell();if(C==cs[0]&&D==cs[1]){A='dblclick';}}if(typeof(this.selModel.getSelections)!='undefined'){var cs=this.selModel.getSelections();var ds=this.dataSource;if(cs.length==1&&ds.getAt(C)==cs[0]){A='dblclick';}}}if(C!==false){this.fireEvent("row"+A,this,C,e);if(D!==false){this.fireEvent("cell"+A,this,C,D,e);}}}},onClick:function(e){this.processEvent("click",e);},onTouchStart:function(e){this.processEvent("touchstart",e);},onContextMenu:function(e,t){this.processEvent("contextmenu",e);},onDblClick:function(e){this.processEvent("dblclick",e);},walkCells:function(A,B,C,fn,D){var cm=this.colModel,E=cm.getColumnCount();var ds=this.dataSource,F=ds.getCount(),G=true;if(C<0){if(B<0){A--;G=false;}while(A>=0){if(!G){B=E-1;}
+c.update("");if(A===true){c.remove();}},processEvent:function(A,e){Roo.log('grid:processEvent '+A);if(A!='touchstart'){this.fireEvent(A,e);}var t=e.getTarget();var v=this.view;var B=v.findHeaderIndex(t);if(B!==false){this.fireEvent("header"+(A=='touchstart'?'click':A),this,B,e);}else {var C=v.findRowIndex(t);var D=v.findCellIndex(t);if(A=='touchstart'){A=false;if(typeof(this.selModel.getSelectedCell)!='undefined'){var cs=this.selModel.getSelectedCell();if(C==cs[0]&&D==cs[1]){A='dblclick';}}if(typeof(this.selModel.getSelections)!='undefined'){var cs=this.selModel.getSelections();var ds=this.dataSource;if(cs.length==1&&ds.getAt(C)==cs[0]){A='dblclick';}}if(!A){return;}}if(C!==false){this.fireEvent("row"+A,this,C,e);if(D!==false){this.fireEvent("cell"+A,this,C,D,e);}}}},onClick:function(e){this.processEvent("click",e);},onTouchStart:function(e){this.processEvent("touchstart",e);},onContextMenu:function(e,t){this.processEvent("contextmenu",e);},onDblClick:function(e){this.processEvent("dblclick",e);},walkCells:function(A,B,C,fn,D){var cm=this.colModel,E=cm.getColumnCount();var ds=this.dataSource,F=ds.getCount(),G=true;if(C<0){if(B<0){A--;G=false;}while(A>=0){if(!G){B=E-1;}
 G=false;while(B>=0){if(fn.call(D||this,A,B,cm)===true){return [A,B];}
 B--;}
 A--;}}else {if(B>=E){A++;G=false;}while(A<F){if(!G){B=0;}