From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Wed, 28 Apr 2010 15:42:00 +0000 (+0000)
Subject: Play with context node and selection changes.
X-Git-Tag: argeo-slc-2.1.7~1337
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=6df9a6dfc2547a4d6fbb073484ba6abe9bedd720;p=gpl%2Fargeo-slc.git

Play with context node and selection changes.

git-svn-id: https://svn.argeo.org/slc/trunk@3514 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 1def8d5ae..48191b259 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
@@ -26,15 +26,18 @@ qx.Class.define("org.argeo.jcr.ria.JcrBrowser",
   	
   	initViewPanes : function(viewsManager){
   		
+  		this._tBar = new org.argeo.ria.components.ViewPane("toolbar", "");
+  		this._tBar.header.setVisibility("excluded");
+  		viewsManager.getViewPanesContainer().add(this._tBar);
+  		
   		this._splitPane = new qx.ui.splitpane.Pane("horizontal");
-		var mainPane = new org.argeo.ria.components.ViewPane("fulltree", "Full Tree");
-		this._splitPane.add(mainPane, 1);
+		var leftPane = new org.argeo.ria.components.ViewPane("treeview", "Tree View");
+		this._splitPane.add(leftPane, 1);
+		var mainPane = new org.argeo.ria.components.ViewPane("fulltree", "Editor View");
+		this._splitPane.add(mainPane, 2);
+  		viewsManager.registerViewPane(this._tBar);
 		viewsManager.registerViewPane(mainPane);      
-  		/*
-		var uploadPane = new org.argeo.ria.components.ViewPane("upload", "Upload a distribution");
-		this._splitPane.add(uploadPane, 1);
-		viewsManager.registerViewPane(uploadPane);   
-		*/   
+		viewsManager.registerViewPane(leftPane);   
 		viewsManager.getViewPanesContainer().add(this._splitPane, {flex:1});
   		
   	},
@@ -46,16 +49,23 @@ qx.Class.define("org.argeo.jcr.ria.JcrBrowser",
   			dynamic : true,
   			pathParameter:"path"
   			});  		
-  		var rootNode = new org.argeo.jcr.ria.model.Node("Root", true);
+  		var rootNode = new org.argeo.jcr.ria.model.Node("Root", nodeProvider, true);
   		rootNode.setPath('/slc');
-  		rootNode.setNodeProvider(nodeProvider);
   		var dataModel = new org.argeo.jcr.ria.model.DataModel(rootNode);
+  		
+  		var inputView = viewsManager.initIViewClass(org.argeo.jcr.ria.views.ContextNodeInputView, "toolbar", dataModel);
+  		inputView.load();
+  		
 		var testView = viewsManager.initIViewClass(org.argeo.jcr.ria.views.PlainXmlViewer, "fulltree", dataModel);
 		testView.load();
+		
+		var treeView = viewsManager.initIViewClass(org.argeo.jcr.ria.views.TreeView, "treeview", dataModel);
+		treeView.load();
   	},
   	
   	remove : function(viewsManager){
   		viewsManager.getViewPanesContainer().remove(this._splitPane);  		
+  		viewsManager.getViewPanesContainer().remove(this._tBar);
   	}
   	
   }
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/DataModel.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/DataModel.js
index 9ed620539..4432c8066 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/DataModel.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/model/DataModel.js
@@ -14,8 +14,9 @@ qx.Class.define("org.argeo.jcr.ria.model.DataModel", {
 			check : "org.argeo.jcr.ria.model.Node"
 		},
 		selection : {
-			check : "org.argeo.jcr.ria.model.Node[]",
-			event : "changeSelection"
+			check : "Array",
+			event : "changeSelection",
+			init : []
 		}
 	},
 	
@@ -28,6 +29,7 @@ qx.Class.define("org.argeo.jcr.ria.model.DataModel", {
 		requireContextChange : function(path){
 			var targetNode;
 			var rootNode = this.getRootNode();
+			this.setSelection([]);
 			if(!path){
 				targetNode = rootNode;
 			}else{
@@ -36,9 +38,8 @@ qx.Class.define("org.argeo.jcr.ria.model.DataModel", {
 					path = path.substring(0, path.length-1);
 				}
 				var base = path.substring(path.lastIndexOf("/")+1);
-				targetNode = new org.argeo.jcr.ria.model.Node(base);
+				targetNode = new org.argeo.jcr.ria.model.Node(base, rootNode.getNodeProvider());
 				rootNode.addChild(targetNode);
-				targetNode.setNodeProvider(rootNode.getNodeProvider());
 				targetNode.setPath(path);				
 			}
 			var observer = function(event){
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 fcd5e6d22..3cf7e4964 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
@@ -18,15 +18,19 @@ qx.Class.define("org.argeo.jcr.ria.model.Node", {
 			event : "changeLoadState"
 		},
 		nodeProvider : {
-			check : "org.argeo.jcr.ria.provider.INodeProvider"			
+			check : "org.argeo.jcr.ria.provider.INodeProvider",
+			nullable : true
 		}
 	},
 	
-	construct : function(nodeName, isRoot){
+	construct : function(nodeName, nodeProvider, isRoot){
 		this.base(arguments);
 		this._children = {};
 		this._properties = {};	
 		this.setName(nodeName);
+		if(nodeProvider){
+			this.setNodeProvider(nodeProvider);			
+		}
 		if(isRoot){
 			this.setPath("");
 			this.setRoot(this);
@@ -63,11 +67,11 @@ qx.Class.define("org.argeo.jcr.ria.model.Node", {
 			for(var i=0;i<domElement.childNodes.length;i++){
 				var child = domElement.childNodes[i];
 				if(child.nodeType != 1) continue;
-				var jcrChild = new org.argeo.jcr.ria.model.Node(child.nodeName);
+				var jcrChild = new org.argeo.jcr.ria.model.Node(child.nodeName, this.getNodeProvider());
 				this.addChild(jcrChild);
 				jcrChild.fromDomElement(child);
 			}
-			this.setLoadState("loaded");
+			//this.setLoadState("loaded");
 		},
 		
 		toXmlString : function(recurse, childrenWriter){
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/provider/XmlNodeProvider.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/provider/XmlNodeProvider.js
index 0f7057a37..ee9834973 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/provider/XmlNodeProvider.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/provider/XmlNodeProvider.js
@@ -33,9 +33,8 @@ qx.Class.define("org.argeo.jcr.ria.provider.XmlNodeProvider", {
 			if(this.getXmlDocLoaded()){
 				// Parse document and load
 				node.setName(this._xmlDoc.documentElement.nodeName);
-				var properties = this.getSettings();				
+				var properties = this.getSettings();					
 				// STUB : prune sub children, load only level 1
-				/*
 				var children = this._xmlDoc.documentElement.childNodes;
 				for(var i=0;i<children.length;i++){
 					var subchildren = children[i].childNodes;
@@ -43,9 +42,9 @@ qx.Class.define("org.argeo.jcr.ria.provider.XmlNodeProvider", {
 						children[i].removeChild(subchildren[j]);
 					}
 				}
-				*/
 				// END STUB
 				node.fromDomElement(this._xmlDoc.documentElement);
+				node.setLoadState("loaded");
 				if(properties.dynamic){
 					this.setXmlDocLoaded(false);
 				}
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ContextNodeInputView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ContextNodeInputView.js
new file mode 100644
index 000000000..5b94762c1
--- /dev/null
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/ContextNodeInputView.js
@@ -0,0 +1,112 @@
+qx.Class.define("org.argeo.jcr.ria.views.ContextNodeInputView", {
+	extend : qx.ui.container.Composite,
+	implement : [org.argeo.ria.components.IView], 
+
+	properties : {
+		/**
+		 * The commands definition Map that will be automatically added and wired to the menubar and toolbar.
+		 * See {@link org.argeo.ria.event.CommandsManager#definitions} for the keys to use for defining commands.
+		 */
+		commands : {
+			init : {}
+		},
+	  	viewSelection : {
+	  		nullable:false, 
+	  		check:"org.argeo.ria.components.ViewSelection"
+	  	},
+	  	instanceId : {
+	  		init:"inputViewer",
+	  		event : "changeInstanceId"
+	  	},
+	  	instanceLabel : {
+	  		init:"Xml Editor",
+	  		event : "changeInstanceLabel"
+	  	},
+	  	dataModel : {
+	  		
+	  	}
+	},
+	
+	construct : function(){
+		this.base(arguments);
+	},
+	
+	members : {
+		/**
+		 * The implementation should contain the GUI initialisation.
+		 * This is the role of the manager to actually add the graphical component to the pane, 
+		 * so it's not necessary to do it here. 
+		 * @param viewPane {org.argeo.ria.components.ViewPane} The pane manager
+		 * @param data {Mixed} Any object or data passed by the initiator of the view
+		 * @return {Boolean}
+		 */
+		init : function(viewPane, dataModel){
+			this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));			
+			this.set({
+				layout : new qx.ui.layout.HBox(),
+				dataModel : dataModel,
+				padding: 10, 
+				decorator : 'toolbar'
+			});			
+			
+			this.contextInput = new qx.ui.form.TextField();
+			this.contextInput.setWidth(100);
+			this.contextInput.setTextAlign("right");
+			this.add(this.contextInput);
+
+			var sep = new qx.ui.basic.Label(":");
+			sep.set({paddingTop:3, paddingLeft:2,paddingRight:2});
+			this.add(sep);
+			
+			this.selectionInput = new qx.ui.form.TextField();
+			this.selectionInput.setWidth(300);
+			this.add(this.selectionInput);
+			
+			this._attachInputsToDM();			
+		},
+		/**
+		 * The implementation should contain the real data loading (i.o. query...)
+		 * @return {Boolean}
+		 */
+		load : function(){
+		},
+				
+		_attachInputsToDM : function(){
+			var dm = this.getDataModel();
+			this.contextInput.addListener("keypress", function(event){
+				if(event.getKeyIdentifier() != "Enter") return;
+				var path = this.contextInput.getValue();
+				dm.requireContextChange(path);
+			}, this);
+			dm.addListener("changeContextNode", function(event){
+				var ctxtNode = event.getData();
+				this.contextInput.setValue(ctxtNode.getPath());
+			}, this);
+			dm.addListener("changeSelection", function(event){
+				var sel = event.getData();
+				if(!sel.length){
+					this.selectionInput.setValue("/");
+				}else{
+					this.selectionInput.setValue(sel[0].getPath().substring(this.contextInput.getValue().length));
+				}
+			},this);
+		},
+		
+		/**
+		 * Whether this component is already contained in a scroller (return false) or not (return true).
+		 * @return {Boolean}
+		 */
+		addScroll : function(){
+			return false;
+		},
+		/**
+		 * Called at destruction time
+		 * Perform all the clean operations (stopping polling queries, etc.) 
+		 */
+		close : function(){
+			
+		}		
+	}
+	
+	
+});
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/JcrTreeFolder.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/JcrTreeFolder.js
new file mode 100644
index 000000000..96505f8f0
--- /dev/null
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/JcrTreeFolder.js
@@ -0,0 +1,43 @@
+qx.Class.define("org.argeo.jcr.ria.views.JcrTreeFolder", {
+	extend : org.argeo.ria.components.DynamicTreeFolder,
+	properties : {
+		jcrNode : {
+			
+		}
+	},
+	construct : function(jcrNode){
+		this.base(arguments, jcrNode.getName(), org.argeo.jcr.ria.views.JcrTreeFolder.loader);
+		this.setJcrNode(jcrNode);
+	},
+	
+	statics : {
+		loader : function(treeFolder){
+			if(treeFolder.getState() == "loaded") return;
+			var jcrNode = treeFolder.getJcrNode();
+			jcrNode.addListener("changeLoadState", function(event){
+				if(event.getData() == "loaded"){
+					org.argeo.jcr.ria.views.JcrTreeFolder.jcrNodeToTreeFolder(jcrNode, treeFolder);
+				}
+			});
+			if(jcrNode.getLoadState()=="loaded"){
+				org.argeo.jcr.ria.views.JcrTreeFolder.jcrNodeToTreeFolder(jcrNode, treeFolder);
+			}else if(jcrNode.getLoadState() == "empty"){
+				//treeFolder.removeAll();
+				jcrNode.load();
+			}
+		},
+		
+		jcrNodeToTreeFolder : function(loadedNode, parentTreeFolder){
+			var children = loadedNode.getChildren();
+			for(var i=0;i<children.length;i++){
+				var newFolder = new org.argeo.jcr.ria.views.JcrTreeFolder(children[i]);
+				parentTreeFolder.add(newFolder);
+			}
+			parentTreeFolder.setState("loaded");
+		}		
+	},
+	members : {
+		openListener : function(e){
+		}		
+	}
+});
\ No newline at end of file
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 db862d20e..c21f3ac56 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
@@ -44,14 +44,10 @@ qx.Class.define("org.argeo.jcr.ria.views.PlainXmlViewer", {
 			this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));	  			
 			this.setLayout(new qx.ui.layout.VBox());
 			this.setDataModel(dataModel);
-			
-			this.input = new qx.ui.form.TextField();
-			this.add(this.input);
-			
-			this._attachInputToDM();
-			
+						
 			this.htmlPane = new qx.ui.embed.Html();
 			this.htmlPane.setOverflow("auto", "auto");
+			this.htmlPane.setDecorator("input");
 			this.add(this.htmlPane, {flex:1});
 			
 		},
@@ -61,12 +57,17 @@ qx.Class.define("org.argeo.jcr.ria.views.PlainXmlViewer", {
 		 */
 		load : function(){
 			var dataModel = this.getDataModel();
-			dataModel.addListener("changeContextNode", function(event){
-				var xmlString = event.getData().toXmlString(true);
+			dataModel.addListener("changeSelection", function(event){
+				var selection = event.getData();
+				if(!selection.length) {
+					this.htmlPane.setHtml("");
+					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_CLOSE_PATTERN = new RegExp("(/?>)", "gi");
-			    var TAG_ATTRIBUTE = new RegExp("\\s([0-9a-zA-Z:]+)\\=\"([^\"]*)\"", "gi");
+			    var TAG_ATTRIBUTE = new RegExp("\\s([0-9a-zA-Z:_]+)\\=\"([^\"]*)\"", "gi");
 			    // Not implemented yet
 			    var TAG_COMMENT = new RegExp("(<!--.*-->)", "gi");
 			    var TAG_CDATA_START = new RegExp("(\\<!\\[CDATA\\[).*", "gi");
@@ -111,21 +112,7 @@ qx.Class.define("org.argeo.jcr.ria.views.PlainXmlViewer", {
 			var input = qx.bom.Element.create("input", {value:value, style:'width:'+width+'px;'});
 			qx.dom.Element.insertAfter(input, span);			
 		},
-		
-		_attachInputToDM : function(){
-			var dm = this.getDataModel();
-			this.input.addListener("keypress", function(event){
-				if(event.getKeyIdentifier() != "Enter") return;
-				var path = this.input.getValue();
-				dm.requireContextChange(path);
-			}, this);
-			dm.addListener("changeContextNode", function(event){
-				var ctxtNode = event.getData();
-				this.input.setValue(ctxtNode.getPath());
-			}, this);
-			
-		},
-		
+				
 		/**
 		 * Whether this component is already contained in a scroller (return false) or not (return true).
 		 * @return {Boolean}
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
new file mode 100644
index 000000000..233c316d9
--- /dev/null
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/jcr/class/org/argeo/jcr/ria/views/TreeView.js
@@ -0,0 +1,156 @@
+qx.Class.define("org.argeo.jcr.ria.views.TreeView", {
+	extend : qx.ui.container.Composite,
+	implement : [org.argeo.ria.components.IView], 
+
+	properties : {
+		/**
+		 * The commands definition Map that will be automatically added and wired to the menubar and toolbar.
+		 * See {@link org.argeo.ria.event.CommandsManager#definitions} for the keys to use for defining commands.
+		 */
+		commands : {
+			init : {
+				"zoom_in" : {
+					label : "Zoom To Node",
+					icon : "org.argeo.slc.ria/media-playback-start.png",
+					shortcut : null,
+					enabled : true,
+					menu : "Context",
+					toolbar : "context",
+					callback : function(e) {
+						var selection = this.tree.getSelection();
+						if(!selection.length) return;
+						var path = selection[0].getJcrNode().getPath();
+						this.getDataModel().requireContextChange(path);
+					},
+					selectionChange : function(viewId, selection){
+						if(viewId != "treeview") return;
+						if(!selection || !selection.length) return;
+						var treeNode = selection[0];
+						if(treeNode.getParent()!=null){
+							this.setEnabled(true);
+						}else{
+							this.setEnabled(false);
+						}
+					}
+				},
+				"zoom_out" : {
+					label : "Zoom Out",
+					icon : "org.argeo.slc.ria/media-playback-start.png",
+					shortcut : null,
+					enabled : true,
+					menu : "Context",
+					toolbar : "context",
+					submenu : [],
+					callback : function(e) {
+					},
+					submenuCallback : function(commandId){
+						this.getDataModel().requireContextChange(commandId);
+					},
+					selectionChange : function(viewId, selection){
+						if(viewId != "treeview") return;
+						if(!selection || !selection.length) return;
+						var treeNode = selection[0];
+						if(treeNode.getParent()!=null || treeNode.getJcrNode().itemIsRoot()){
+							this.setEnabled(false);
+							return;
+						}
+						this.setEnabled(true);
+						var nodePath = treeNode.getJcrNode().getPath();
+						var parts = nodePath.split("\/");
+						var pathes = [];
+						parts.pop();
+						if(parts.length > 1){
+							for(var i=0;i<parts.length;i++){
+								var newPath = parts.join("/");
+								pathes.push({label:newPath,icon:'', commandId:newPath});
+								parts.pop();
+							}
+						}
+						this.setMenu(pathes);
+					}
+				}				
+			}
+		},
+	  	viewSelection : {
+	  		nullable:false, 
+	  		check:"org.argeo.ria.components.ViewSelection"
+	  	},
+	  	instanceId : {
+	  		init:"treeView",
+	  		event : "changeInstanceId"
+	  	},
+	  	instanceLabel : {
+	  		init:"Tree View",
+	  		event : "changeInstanceLabel"
+	  	},
+	  	dataModel : {
+	  		
+	  	}
+	},
+	
+	construct : function(){
+		this.base(arguments);
+	},
+	
+	members : {
+		/**
+		 * The implementation should contain the GUI initialisation.
+		 * This is the role of the manager to actually add the graphical component to the pane, 
+		 * so it's not necessary to do it here. 
+		 * @param viewPane {org.argeo.ria.components.ViewPane} The pane manager
+		 * @param data {Mixed} Any object or data passed by the initiator of the view
+		 * @return {Boolean}
+		 */
+		init : function(viewPane, dataModel){
+			this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));	  			
+			this.setLayout(new qx.ui.layout.VBox());
+			this.setDataModel(dataModel);
+			
+			this.tree = new qx.ui.tree.Tree();			
+			this.add(this.tree, {flex:1});
+		},
+		/**
+		 * The implementation should contain the real data loading (i.o. query...)
+		 * @return {Boolean}
+		 */
+		load : function(){
+			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]);
+			}, this);
+			this.tree.addListener("changeSelection", function(e){
+				var sel = this.tree.getSelection();
+				var selection = [];
+				var viewSelection = this.getViewSelection();
+				viewSelection.clear();				
+				for(var i=0;i<sel.length;i++){
+					selection.push(sel[i].getJcrNode());
+					viewSelection.addNode(sel[i]);
+				}
+				this.getDataModel().setSelection(selection);
+			}, this);
+			this.tree.setContextMenu(org.argeo.ria.event.CommandsManager
+					.getInstance().createMenuFromIds(["zoom_in", "zoom_out"]));				
+		},
+		
+		/**
+		 * Whether this component is already contained in a scroller (return false) or not (return true).
+		 * @return {Boolean}
+		 */
+		addScroll : function(){
+			return false;
+		},
+		/**
+		 * Called at destruction time
+		 * Perform all the clean operations (stopping polling queries, etc.) 
+		 */
+		close : function(){
+			
+		}		
+		
+	}
+});
\ No newline at end of file