X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.ria%2Fsrc%2Fargeo-ria-lib%2Fjcr%2Fclass%2Forg%2Fargeo%2Fjcr%2Fria%2Fviews%2FTreeView.js;h=ee17460f99abda63059af94eb9b26253725967fb;hb=5defbc739b7b0d438e428a874aa46e86a9c7f78d;hp=233c316d941b04937b9cfb228ca57e1ee3860191;hpb=6df9a6dfc2547a4d6fbb073484ba6abe9bedd720;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/TreeView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/TreeView.js
index 233c316d9..ee17460f9 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/TreeView.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/TreeView.js
@@ -14,8 +14,8 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 					icon : "org.argeo.slc.ria/media-playback-start.png",
 					shortcut : null,
 					enabled : true,
-					menu : "Context",
-					toolbar : "context",
+					menu : "Zoom",
+					toolbar : "zoom",
 					callback : function(e) {
 						var selection = this.tree.getSelection();
 						if(!selection.length) return;
@@ -38,8 +38,8 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 					icon : "org.argeo.slc.ria/media-playback-start.png",
 					shortcut : null,
 					enabled : true,
-					menu : "Context",
-					toolbar : "context",
+					menu : "Zoom",
+					toolbar : "zoom",
 					submenu : [],
 					callback : function(e) {
 					},
@@ -60,7 +60,8 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 						var pathes = [];
 						parts.pop();
 						if(parts.length > 1){
-							for(var i=0;i<parts.length;i++){
+							var initLength = parts.length; 
+							for(var i=0;i<initLength;i++){
 								var newPath = parts.join("/");
 								pathes.push({label:newPath,icon:'', commandId:newPath});
 								parts.pop();
@@ -68,7 +69,51 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 						}
 						this.setMenu(pathes);
 					}
-				}				
+				},
+				"open" : {
+					label : "Open",
+					icon : "org.argeo.slc.ria/media-playback-start.png",
+					shortcut : null,
+					enabled : true,
+					menu : "Selection",
+					toolbar : "selection",
+					callback : function(e) {
+						var selection = this.tree.getSelection();
+						if(!selection.length) return;
+						var jcrNode = selection[0].getJcrNode();
+						var viewsManager = org.argeo.ria.components.ViewsManager.getInstance();						
+						var testView = viewsManager.initIViewClass(org.argeo.jcr.ria.views.PlainXmlViewer, "editor", jcrNode);
+						testView.load(jcrNode);
+						
+					},
+					selectionChange : function(viewId, selection){
+						this.setEnabled(false);
+						if(selection && selection.length && selection[0].getJcrNode){
+							this.setEnabled(true);
+						}
+					}
+				},
+				"dl" : {
+					label : "Download",
+					icon : "org.argeo.slc.ria/media-playback-start.png",
+					shortcut : null,
+					enabled : true,
+					menu : "Selection",
+					toolbar : "selection",
+					callback : function(e) {
+						var selection = this.tree.getSelection();
+						if(!selection.length) return;
+						var jcrNode = selection[0].getJcrNode();
+						var url = '/org.argeo.slc.webapp/getJcrItem.jcr?path=' + jcrNode.getPath() + '&download=true';
+						org.argeo.ria.Application.INSTANCE.javascriptDownloadLocation(url);
+					},
+					selectionChange : function(viewId, selection){
+						this.setEnabled(false);
+						if(selection && selection.length && selection[0].getJcrNode){
+							this.setEnabled(true);
+						}
+					}
+				}								
 			}
 		},
 	  	viewSelection : {
@@ -80,7 +125,7 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 	  		event : "changeInstanceId"
 	  	},
 	  	instanceLabel : {
-	  		init:"Tree View",
+	  		init:"Full Tree",
 	  		event : "changeInstanceLabel"
 	  	},
 	  	dataModel : {
@@ -117,7 +162,6 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 			var dataModel = this.getDataModel();
 			dataModel.addListener("changeContextNode", function(event){
 				var contextNode = event.getData();
-				var loader = function(){};
 				var newRoot = new org.argeo.jcr.ria.views.JcrTreeFolder(contextNode);
 				this.tree.setRoot(newRoot);
 				this.tree.setSelection([newRoot]);
@@ -131,10 +175,32 @@ qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
 					selection.push(sel[i].getJcrNode());
 					viewSelection.addNode(sel[i]);
 				}
-				this.getDataModel().setSelection(selection);
+				this.getDataModel().setSelectionWithSource(selection, this);
+			}, this);
+			dataModel.addListener("changeSelection", function(e){
+				if(this.getDataModel().getSelectionSource() == this) return;
+				var selection = this.getDataModel().getSelection();
+				// Arbitrary : for the moment, external select can only apply
+				// to children of the current selection
+				var crtSel = this.tree.getSelection();
+				if(!crtSel.length || !selection.length) return;
+				var crtTreeSel = crtSel[0];
+				if(selection[0].getParent() && crtTreeSel.getJcrNode().getPath() == selection[0].getParent().getPath()){
+					crtTreeSel.setOpen(true);
+					var crtChildren =crtTreeSel.getChildren(); 
+					for(var i=0;i<crtChildren.length;i++){
+						if(crtChildren[i].getJcrNode().getPath() == selection[0].getPath()){
+							this.tree.setSelection([crtChildren[i]]);
+							return;
+						}
+					}
+				}else if(crtTreeSel.getParent() && crtTreeSel.getJcrNode().getParent().getPath() == selection[0].getPath()){
+					this.tree.setSelection([crtTreeSel.getParent()]);
+				}
+				
 			}, this);
 			this.tree.setContextMenu(org.argeo.ria.event.CommandsManager
-					.getInstance().createMenuFromIds(["zoom_in", "zoom_out"]));				
+					.getInstance().createMenuFromIds(["open", "zoom_in", "zoom_out"]));				
 		},
 		
 		/**