anomalie 4830

Elena.Budnik
1 parent eec153c1
Showing 3 changed files with 31 additions and 46 deletions Show diff stats
desktop.php
js/app/views/ExplorerUI.js
js/lib/ext-override.js
@@ -41,22 +41,22 @@
     <link rel="icon" href="favicon.ico" type="image/x-icon">
     <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> 
  
-<!--     <script type="text/javascript" src="js/lib/ext/builds/ext-core.js"></script> -->
-<!--     <script type="text/javascript" src="js/lib/ext/bootstrap.js"></script> -->
-<!--    <script type="text/javascript" src="js/lib/ext/ext-all-debug-w-comments.js"></script>--> 
+<!--  <script type="text/javascript" src="js/lib/ext/builds/ext-core.js"></script> -->
+<!--  <script type="text/javascript" src="js/lib/ext/bootstrap.js"></script> -->
+<!--  <script type="text/javascript" src="js/lib/ext/ext-all-debug-w-comments.js"></script>--> 
 	<script type="text/javascript" src="js/lib/ext/ext-all.js"></script>   
 <!--	<script type="text/javascript" src="js/lib/ext/ext-all-dev.js"> -->
-    <script type="text/javascript" src="js/lib/ext-override.js"></script>
+<!--	<script type="text/javascript" src="js/lib/ext-override.js"></script> -->
  
  
  
 <!-- Direct API -->
-    <script type="text/javascript" src="php/api.php"></script> 
+     <script type="text/javascript" src="php/api.php"></script> 
  
-  
-  <!--  <script src="help/movies/Resources/scripts/prototype.js" language="JavaScript" type="text/javascript"></script>
-    <script src="help/movies/Resources/scripts/qtp_poster.js" language="JavaScript" type="text/javascript"></script>          
-    <link href="help/movies/Resources/stylesheets/qtp_poster.css" rel="StyleSheet" type="text/css" /> --->
+ 
+<!--  <script src="help/movies/Resources/scripts/prototype.js" language="JavaScript" type="text/javascript"></script>
+      <script src="help/movies/Resources/scripts/qtp_poster.js" language="JavaScript" type="text/javascript"></script>          
+      <link href="help/movies/Resources/stylesheets/qtp_poster.css" rel="StyleSheet" type="text/css" /> --->
  
  
     <script type="text/javascript">
@@ -515,9 +515,9 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 			e.stopEvent();
  
 			// unlock selection
-			view.ownerCt.getSelectionModel().setLocked(false);
+//			view.ownerCt.getSelectionModel().setLocked(false);
 		       // already selected by default by right click
-		//	view.ownerCt.getSelectionModel().select(rec,true);
+// 			view.ownerCt.getSelectionModel().select(rec,true);
  
 			// clear menu items
 			menu.removeAll();
@@ -531,20 +531,22 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 			} 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
+				// add listener on right clicked record				
 				var onRecordClick = function (menu, item, e, eOpts)
-					{
-						//Dispatch click event to the record
-						this.onMenuItemClick(menu,item,e);
+					{	
+						if (this.myGetOwnerTree().getSelectionModel().isSelected(this)) {					 
+							//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());
@@ -626,15 +628,16 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 				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);
-				}
-			}
-		},
+//  Already done in ExtJS 4.2.4 selection model
+// 		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();                  
 				view.tip = Ext.create('Ext.tip.ToolTip', {
@@ -96,26 +96,8 @@ 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,