Anomalie 4830; right click : select + context menu

Elena.Budnik
1 parent b2c4f9ed
Showing 2 changed files with 167 additions and 153 deletions Show diff stats
js/app/views/ExplorerUI.js
js/lib/ext-override.js
@@ -53,9 +53,9 @@ Ext.define(&#39;amdaUI.TreeToolColumn&#39;, {
     {
         if(type === "click" && e.target.tagName === "IMG") 
         {
-                var tooltype = e.target.getAttribute("tooltype");
-            if(tooltype)
-                return this.fireEvent("toolclick", view, cell, recordIndex, cellIndex, e);
+		var tooltype = e.target.getAttribute("tooltype");
+		if(tooltype)
+			return this.fireEvent("toolclick", view, cell, recordIndex, cellIndex, e);
         }
         return this.fireEvent.apply(this, arguments);
     },
@@ -287,11 +287,9 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
             store: store,
             rootVisible: false,
             animate: false,
-            hideHeaders : true,
-            //TODO deprecated
-            //multiSelect: true,
+            hideHeaders : true,        
             selModel: Ext.create('Ext.selection.TreeModel', {
-            	ignoreRightMouseSelection: true,
+         //   	ignoreRightMouseSelection: true,
             	mode: 'MULTI'
             }),
  
@@ -496,153 +494,149 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
                         }
                     },
 	    },
-            listeners: {
+	listeners: {
  
-	        itemmouseenter: function(view, record, item){		  
-		  if(record.get('isParameter')){		 
-		        var el = Ext.get(item),
-                        td = el.down('td > div');
-                        td.setStyle('cursor', 'crosshair');				
-		  }
-		  else
-		  {
-			  var el = Ext.get(item),
-              td = el.down('td > div');
-              td.setStyle('cursor', 'pointer');	
-		  }
+		itemmouseenter: function(view, record, item){		  
+			if(record.get('isParameter')){		 
+				var el = Ext.get(item),
+				td = el.down('td > div');
+				td.setStyle('cursor', 'crosshair');				
+			}
+			else
+			{
+				var el = Ext.get(item),
+				td = el.down('td > div');
+				td.setStyle('cursor', 'pointer');	
+			}
 		},
-                itemcontextmenu: function(view, rec, item, index, e){
-                	 // block other events
-                    e.stopEvent();
-                	
-                    // unlock selection
-                    view.ownerCt.getSelectionModel().setLocked(false);
-                    
-                    view.ownerCt.getSelectionModel().select(rec,true);
-                    
-                    // clear menu items
-                    menu.removeAll();
-                    var menuItems;
+		
+		itemcontextmenu: function(view, rec, item, index, e){
+			// block other events
+			e.stopEvent();
+			
+			// unlock selection
+			view.ownerCt.getSelectionModel().setLocked(false);
+		       // already selected by default by right click
+		//	view.ownerCt.getSelectionModel().select(rec,true);
+			
+			// clear menu items
+			menu.removeAll();
+			var menuItems;
  
-                    // if it's a single selection
-                    if (view.ownerCt.getSelectionModel().selected.length === 1) {
-                    	// get items menu corresponding to right clicked record
-                        menuItems = rec.getContextMenuItems(this);
-                       
-                    } else if (view.ownerCt.getSelectionModel().selected.length > 1) {
-                        // get items menu corresponding to right clicked record
-                        menuItems = rec.getContextMenuMultiItems(this);
-                        
-                    }
+			// if it's a single selection
+			if (view.ownerCt.getSelectionModel().selected.length === 1) {
+				// get items menu corresponding to right clicked record
+				menuItems = rec.getContextMenuItems(this);
+				
+			} else if (view.ownerCt.getSelectionModel().selected.length > 1) {
+				// get items menu corresponding to right clicked record
+				menuItems = rec.getContextMenuMultiItems(this);				
+			}
  
                     // if there's at least one item menu
-                    if (menuItems && menuItems.length){
-                        // add the items
-                        menu.add(menuItems);
-                        // add listener on right clicked record
-                        var onRecordClick = function (menu, item, e, eOpts)
-                			{
-                				//Dispatch click event to the record
-                				this.onMenuItemClick(menu,item,e);
-                				//Remove old click listener
-                				menu.removeListener('click',onRecordClick,this);
-                			};
-                        menu.addListener('click',onRecordClick,rec);
-                        
-                        // then show menu
-                        menu.showAt(e.getXY());
-                    }                    
-                },
+			if (menuItems && menuItems.length){
+				// add the items
+				menu.add(menuItems);
+				// add listener on right clicked record
+				var onRecordClick = function (menu, item, e, eOpts)
+					{
+						//Dispatch click event to the record
+						this.onMenuItemClick(menu,item,e);
+						//Remove old click listener
+						menu.removeListener('click',onRecordClick,this);
+					};
+				menu.addListener('click',onRecordClick,rec);				
+				// then show menu
+				menu.showAt(e.getXY());
+			}                    
+		},
  
-                itemdblclick: function(view, record, item, index, event){
-                    event.stopEvent();
-		    
-                    // first check if it is for SAVE-START-STOP plugin...		    
-		    if (Ext.PluginManager.getCount() > 0 && 
-		        record.get('nodeType') == amdaModel.TimeTableNode.nodeType && record.isLeaf()) {		        
-			var zmgr = myDesktopApp.desktop.getDesktopZIndexManager();
-			var winActive = zmgr.getActive();
-			var winId =  winActive.getId();
-			if (winId == 'explorer-win') {
-			  zmgr.eachTopDown(function(win) {
-			      var id = win.getId();
-			      if (id !==  'explorer-win') { 
-				winId = id;
-			        return false;
-			      }	
-			  }); 
-			}  		 		 
-		      }                    
+		itemdblclick: function(view, record, item, index, event){
+			event.stopEvent();
+			
+			// first check if it is for SAVE-START-STOP plugin...		    
+			if (Ext.PluginManager.getCount() > 0 && 
+				record.get('nodeType') == amdaModel.TimeTableNode.nodeType && record.isLeaf()) {		        
+				var zmgr = myDesktopApp.desktop.getDesktopZIndexManager();
+				var winActive = zmgr.getActive();
+				var winId =  winActive.getId();
+				if (winId == 'explorer-win') {
+					zmgr.eachTopDown(function(win) {
+						var id = win.getId();
+						if (id !==  'explorer-win') { 
+							winId = id;
+							return false;
+						}	
+					}); 
+				}  		 		 
+			}                    
  
-//		    var targetModuleName = myDesktopApp.getModule('explorer-win').getPinedModule();
-		    if (record.get('nodeType') == 'remoteParam' && !record.isLeaf() 
-							&& !record.get('isParameter')) {
-			myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.interop.id, true, function (module) {
-				module.createWindow(record.getBaseId());
-			});			
-				      
-		    }
+			if (record.get('nodeType') == 'remoteParam' && !record.isLeaf() 
+								&& !record.get('isParameter')) {
+				myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.interop.id, true, function (module) {
+					module.createWindow(record.getBaseId());
+				});							      
+			}
  
-		    if (record.isLeaf() || record.data.isParameter)
-		      switch (record.get('nodeType')) 
-		      {
-			case 'myData' :
-			case 'myDataParam' :
-			case 'derivedParam' :
-			case 'timeTable' :
-			case 'sharedtimeTable' :
-			case 'sharedcatalog' :
-			case 'catalog' :	
-			case 'request' :
-			case 'condition' :
-		    	    record.editLeaf();
-		    	    break;
-			case 'localParam' :
-			case 'remoteParam':
-			case 'remoteSimuParam':    
-		    	    record.createAlias(record);			  
-		    	    break;
-		        case 'bkgWorks' :                            
-		        	if (!record.get('object')) {  
-		        		AmdaAction.getObject(record.get('id'), record.get('nodeType'), record.getObjectCallback, record);
-		        	}
-		        	else {
-                                    if (record.get('status') == 'done') {
-                                        var isInteractive = false;
-                                        var isNewTab = true;	  
-                                        record.editNode(isNewTab, isInteractive);
-                                    }
-                                    else {
-                                        myDesktopApp.infoMsg('Job Status: ' + record.get('status'));
-                                    }
-		        	}
-		        	break;
-		      }
-                    
-                },
-                beforeselect: function(view,node,index,options){
-                    // if there's at least one node already selected   
-                    if(view.selected.length 
-                            //AND (the node which is beeing selected has a different nodeType than the first selected node OR the first selected node isn't a leaf
-                            && ( node.get('nodeType')!== view.selected.items[0].get('nodeType') ||  !view.selected.items[0].isLeaf())
-                            // OR the node which is beeing selected has no nodeType OR it isn't a leaf OR
-                            || !node.get('nodeType') || !node.isLeaf() 
-                    ){
-                        // clear old selection
-                        view.deselectAll();
-                    }
-                },
-                itemmousedown: function(tree,rec,item,index,event,options){
-                    if(event.button===2){
-                        // if the right clicked item is already selected
-                        if (tree.getSelectionModel().isSelected(rec)) {
-                            // lock selection to prevent the selection modification by the right click
-                            tree.getSelectionModel().setLocked(true);
-                        }
-                    }
-                },
+			if (record.isLeaf() || record.data.isParameter)
+				switch (record.get('nodeType')) 
+				{
+					case 'myData' :
+					case 'myDataParam' :
+					case 'derivedParam' :
+					case 'timeTable' :
+					case 'sharedtimeTable' :
+					case 'sharedcatalog' :
+					case 'catalog' :	
+					case 'request' :
+					case 'condition' :
+						record.editLeaf();
+						break;
+					case 'localParam' :
+					case 'remoteParam':
+					case 'remoteSimuParam':    
+						record.createAlias(record);			  
+						break;
+					case 'bkgWorks' :                            
+						if (!record.get('object')) {  
+							AmdaAction.getObject(record.get('id'), record.get('nodeType'), record.getObjectCallback, record);
+						}
+						else {
+							if (record.get('status') == 'done') {
+								var isInteractive = false;
+								var isNewTab = true;	  
+								record.editNode(isNewTab, isInteractive);
+							}
+							else {
+								myDesktopApp.infoMsg('Job Status: ' + record.get('status'));
+							}
+						}
+						break;
+				}                    
+		},
+		beforeselect: function(view,node,index,options){
+			// if there's at least one node already selected   
+			if(view.selected.length 
+				//AND (the node which is beeing selected has a different nodeType than the first selected node OR the first selected node isn't a leaf
+				&& ( node.get('nodeType')!== view.selected.items[0].get('nodeType') ||  !view.selected.items[0].isLeaf())
+				// OR the node which is beeing selected has no nodeType OR it isn't a leaf OR
+				|| !node.get('nodeType') || !node.isLeaf() 
+			){
+				// clear old selection
+				view.deselectAll();
+			}
+		},
+		itemmousedown: function(tree,rec,item,index,event,options){
+			if(event.button===2){
+				// if the right clicked item is already selected
+				if (tree.getSelectionModel().isSelected(rec)) {
+					// lock selection to prevent the selection modification by the right click
+					tree.getSelectionModel().setLocked(true);
+				}
+			}
+		},
 		afterrender: function(comp){		   
-		  	        var view = comp.getView();                  
+				var view = comp.getView();                  
 				view.tip = Ext.create('Ext.tip.ToolTip', {
 				    // The overall target element.
 				    target: view.el,
@@ -673,14 +667,15 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 		},
 		// if remote base is empty - open interoperability module
 		itemexpand: function(node) {		 
-				    if ( node.get('nodeType') == amdaModel.RemoteParamNode.nodeType 
-					&& node.getDepth() == 3 && !node.hasChildNodes()) {
-					node.addData();  
-				    }
+			if ( node.get('nodeType') == amdaModel.RemoteParamNode.nodeType 
+			&& node.getDepth() == 3 && !node.hasChildNodes()) {
+				node.addData();  
+			}
 		},
-                scope: this
-            },
-            hideHeaders: true,
+		scope: this
+	},
+	
+	hideHeaders: true,
             // must define a column with a field to enable editor
             columns: [{ 
                 xtype    : 'treetoolcolumn',
@@ -96,7 +96,26 @@ Ext.onReady(function () {
       }
     }      
     });*/  
-	
+	    
+    
+    Ext.override(Ext.selection.TreeModel, {
+	    
+	onRowClick: function (view, record, item, index, e) {
+		// Record index will be -1 if the clicked record is a metadata record and not selectable		 
+  		if (index !== -1) {
+			if (!this.allowRightMouseSelection(e)) {			      
+				return ;			 
+			}
+		   
+			//Don't process if it's a right-click over a previously selected record.
+			// if (!(e.type === 'contextmenu' && this.isSelected(record))) {
+			this.processSelection(view, record, item, index, e);
+			// }
+		} 
+	}
+    });
+ 
+    
 	/*Ext.override(Ext.selection.Model, {
 		storeHasSelected: function(record) {
 			var store = this.store,