stop more context events where generic help overwrites menus

Change-Id: I5fdcc8ba2a3d929438234d6b24b0de9469baffc5
Reviewed-on: http://gerrit.tine20.com/customers/5284
Reviewed-by: Cornelius Weiss <c.weiss@metaways.de>
Tested-by: Cornelius Weiss <c.weiss@metaways.de>

diff --git a/tine20/Felamimail/js/TreePanel.js b/tine20/Felamimail/js/TreePanel.js
index a124d26..d142c58 100644 (file)
--- a/tine20/Felamimail/js/TreePanel.js
+++ b/tine20/Felamimail/js/TreePanel.js
@@ -427,7 +427,9 @@ Ext.extend(Tine.Felamimail.TreePanel, Ext.tree.TreePanel, {
      */
     onContextMenu: function(node, event) {
         this.ctxNode = node;
-        
+
+        event.stopEvent();
+
         var folder = this.app.getFolderStore().getById(node.id),
             account = folder ? this.accountStore.getById(folder.get('account_id')) :
                                this.accountStore.getById(node.id);

diff --git a/tine20/Phone/js/PhoneTreePanel.js b/tine20/Phone/js/PhoneTreePanel.js
index eaaa6ea..31c789d 100644 (file)
--- a/tine20/Phone/js/PhoneTreePanel.js
+++ b/tine20/Phone/js/PhoneTreePanel.js
@@ -58,6 +58,7 @@ Tine.Phone.PhoneTreePanel = Ext.extend(Ext.tree.TreePanel, {
         });
         
         this.on('contextmenu', function(node, event){
+            event.stopEvent();
             this.ctxNode = node;
             if (node.id != 'phone-root') {
                 contextMenu.showAt(event.getXY());

diff --git a/tine20/Tinebase/js/widgets/ContentTypeTreePanel.js b/tine20/Tinebase/js/widgets/ContentTypeTreePanel.js
index 340d4f7..0e16ddd 100644 (file)
--- a/tine20/Tinebase/js/widgets/ContentTypeTreePanel.js
+++ b/tine20/Tinebase/js/widgets/ContentTypeTreePanel.js
@@ -191,6 +191,7 @@ Ext.extend(Tine.widgets.ContentTypeTreePanel, Ext.tree.TreePanel, {
                 });
           
                 child.on('contextmenu', function(node, event) {
+                    event.stopEvent();
                     if(node.leaf) {
                         this.ctxNode = node;
                         this['contextMenu' + modelName].showAt(event.getXY());

diff --git a/tine20/Tinebase/js/widgets/grid/FilterStructureTreePanel.js b/tine20/Tinebase/js/widgets/grid/FilterStructureTreePanel.js
index 6863ea9..b0f5d51 100644 (file)
--- a/tine20/Tinebase/js/widgets/grid/FilterStructureTreePanel.js
+++ b/tine20/Tinebase/js/widgets/grid/FilterStructureTreePanel.js
@@ -91,6 +91,7 @@ Tine.widgets.grid.FilterStructureTreePanel = Ext.extend(Ext.tree.TreePanel, {
     },
     
     onContextMenu: function(node, e) {
+        e.stopEvent();
         if (this.getRootNode().childNodes.length > 2 && node.id != 'addFilterPanel') {
             this.contextMenu.contextNode = node;
             this.contextMenu.showAt(e.getXY());

diff --git a/tine20/Tinebase/js/widgets/persistentfilter/PickerPanel.js b/tine20/Tinebase/js/widgets/persistentfilter/PickerPanel.js
index e722a82..2980988 100644 (file)
--- a/tine20/Tinebase/js/widgets/persistentfilter/PickerPanel.js
+++ b/tine20/Tinebase/js/widgets/persistentfilter/PickerPanel.js
@@ -306,7 +306,8 @@ Tine.widgets.persistentfilter.PickerPanel = Ext.extend(Ext.tree.TreePanel, {
         if (! node.attributes.isPersistentFilter) {
             return;
         }
-        
+
+        e.stopEvent();
         Tine.log.debug(node);
         
         var record = this.store.getById(node.id);