From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Wed, 28 Apr 2010 16:17:36 +0000 (+0000)
Subject: Fake inline editor in Xml viewer
X-Git-Tag: argeo-slc-2.1.7~1336
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=40c5f7480c6339a2173454b90d59ee92e4f6e95f;hp=6df9a6dfc2547a4d6fbb073484ba6abe9bedd720;p=gpl%2Fargeo-slc.git

Fake inline editor in Xml viewer

git-svn-id: https://svn.argeo.org/slc/trunk@3515 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/JcrBrowser.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/JcrBrowser.js
index 48191b259..0c01772d5 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/JcrBrowser.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/JcrBrowser.js
@@ -12,7 +12,18 @@ qx.Class.define("org.argeo.jcr.ria.JcrBrowser",
   
   construct : function(){
 	  	this.base(arguments);
-	  	org.argeo.ria.util.Element.DEFAULT_NAMESPACE_MAP = {slc:"http://argeo.org/projects/slc/schemas"};
+	  	org.argeo.ria.util.Element.DEFAULT_NAMESPACE_MAP = 
+  		{
+	  		slc:"http://argeo.org/projects/slc/schemas",
+	  		fn:"http://www.w3.org/2005/xpath-functions", 
+			fn_old:"http://www.w3.org/2004/10/xpath-functions", 
+			xs:"http://www.w3.org/2001/XMLSchema" ,
+			jcr:"http://www.jcp.org/jcr/1.0" ,
+			mix:"http://www.jcp.org/jcr/mix/1.0", 
+			sv:"http://www.jcp.org/jcr/sv/1.0" ,
+			rep:"internal" ,
+			nt:"http://www.jcp.org/jcr/nt/1.0"
+  		};
   },
   
   statics : {
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/Node.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/Node.js
index 3cf7e4964..f8d59f7f7 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/Node.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/Node.js
@@ -50,16 +50,13 @@ qx.Class.define("org.argeo.jcr.ria.model.Node", {
 			this.getParent().removeChild(this.getName());
 		},
 		
-		fromXmlString : function(xmlString){
-			var domDocument = qx.xml.Document.fromString(xmlString);
-			var root = domDocument.documentElement;
-			this.fromDomElement(root);
-		},
-		
 		fromDomElement : function(domElement){
 			if(domElement.nodeType != 1) return;
 			for(var i=0;i<domElement.attributes.length;i++){
 				var att = domElement.attributes[i];
+				if(!this.itemIsRoot() && att.nodeName.substring(0,5) == "xmlns"){
+					continue;
+				}
 				var property = new org.argeo.jcr.ria.model.Property(att.nodeName);
 				this.addProperty(property);
 				property.fromDomElement(att);
@@ -74,6 +71,12 @@ qx.Class.define("org.argeo.jcr.ria.model.Node", {
 			//this.setLoadState("loaded");
 		},
 		
+		fromXmlString : function(xmlString){
+			var domDocument = qx.xml.Document.fromString(xmlString);
+			var root = domDocument.documentElement;
+			this.fromDomElement(root);
+		},
+		
 		toXmlString : function(recurse, childrenWriter){
 			var string = "<"+this.getName();
 			var props = this.getProperties();
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/PlainXmlViewer.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/PlainXmlViewer.js
index c21f3ac56..a164315a5 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/PlainXmlViewer.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/PlainXmlViewer.js
@@ -64,8 +64,8 @@ qx.Class.define("org.argeo.jcr.ria.views.PlainXmlViewer", {
 					return;
 				}
 				var xmlString = selection[0].toXmlString(true);
-			    var TAG_START_PATTERN = new RegExp("<([0-9a-zA-Z\.]+)([^>]*)>", "gi");
-			    var TAG_END_PATTERN = new RegExp("</([0-9a-zA-Z\.]+)>", "gi");
+			    var TAG_START_PATTERN = new RegExp("<([0-9a-zA-Z\.:]+)([^>]*)>", "gi");
+			    var TAG_END_PATTERN = new RegExp("</([0-9a-zA-Z\.:]+)>", "gi");
 			    var TAG_CLOSE_PATTERN = new RegExp("(/?>)", "gi");
 			    var TAG_ATTRIBUTE = new RegExp("\\s([0-9a-zA-Z:_]+)\\=\"([^\"]*)\"", "gi");
 			    // Not implemented yet
@@ -90,7 +90,6 @@ qx.Class.define("org.argeo.jcr.ria.views.PlainXmlViewer", {
 				xmlString = xmlString.replace(new RegExp("(xml_attvalue_end)", "g"), '</span>');
 				xmlString = '<div style="margin-left:-10px;">' + xmlString + '</div>';
 				this.htmlPane.setHtml(xmlString);
-				/*
 				var call = new qx.util.DeferredCall(function(){
 					var htmlDom = this.htmlPane.getContentElement().getDomElement();
 					var spans = qx.bom.Selector.query("span", htmlDom);
@@ -100,7 +99,6 @@ qx.Class.define("org.argeo.jcr.ria.views.PlainXmlViewer", {
 					}
 				}, this);
 				call.schedule();
-				*/
 			}, this);
 			dataModel.requireContextChange();			
 		},
@@ -109,8 +107,11 @@ qx.Class.define("org.argeo.jcr.ria.views.PlainXmlViewer", {
 			var width = qx.bom.element.Dimension.getWidth(span);
 			var value = span.innerHTML;
 			qx.bom.element.Style.set(span, "display", "none");
-			var input = qx.bom.Element.create("input", {value:value, style:'width:'+width+'px;'});
-			qx.dom.Element.insertAfter(input, span);			
+			var input = qx.bom.Element.create("input", {value:value, style:'width:'+width+'px;height:14px;border-width:1px;padding:0px;font-size:11px;'});
+			//var input = new qx.html.Input("text");
+			//input.setStyles({width:width+'px', height:'14px', borderWidth:'1px', padding:'0px', fontSize:'11px'});			
+			qx.dom.Element.insertAfter(input, span);
+			//input.setTextSelection(0);
 		},
 				
 		/**
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..9fd2e163c 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
@@ -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();