cavalion-vcl 1.1.45 → 1.1.48

package/CHANGELOG.md

@@ -1,6 +1,25 @@
+### 2022/01/22 - 1.1.48
+
+* Removed obsolete files (./vcl-comps/*)
+* Adding extra onLoad-event to cavalion-blocks
+* Working on prototypes/ui/forms/Home.tree
+
+### 2022/01/18 -  1.1.47
+
+`#CVLN-20220118-1`
+
+* Workaround for weird rendering bug in ui/List
+
+### 2022/01/18 -  1.1.46
+
+* **ui/List**: Adding "ignore-busy" class behaviour
+* **ui/List**: Refactoring `groupByColumn(...)` -> `groupBy(column, ...)`
+* **ui/List**: Refactoring `render` => `render_` (vcl/Control.prototype.render was not being overridden/nameclashing)
+
+
 ### 2022/01/07 -  1.1.45
 
-* Fix for `context` parameter in data/Array:onFilterObject-event
+* **data/Array**: Fix for `context` parameter in `onFilterObject`-event
 
 ### 2022/01/04
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cavalion-vcl",
-  "version": "1.1.45",
+  "version": "1.1.48",
   "description": "Visual Component Library for vcl-comps",
   "main": "index.js",
   "scripts": {

package/src/prototypes/cavalion-blocks.js

@@ -4,8 +4,12 @@
 	align: "client",
 	onNodeCreated() {
 		var uri = this.vars("uri") || js.sf("%s<%s>", this.getSpecializer(), this.vars("specializer") || this._name);
+		var onLoad = this.vars("onLoad");
 		require("B").instantiate(uri, { owner: this }).then(_ => {
 				_.setParent(this); // TODO why can't this be in property decl?
+				if(onLoad) {
+					onLoad.apply(this, [_]);
+				}
 			});
 	}
 }];

package/src/prototypes/ui/forms/Home.tree.js

@@ -17,6 +17,7 @@ var Handlers = {
     			form_scope = form.getScope();
     			if(name === "formload" && !form_scope.left) {
 	    			root_scope.description.revertPropertyValue("content");
+	    			// root_scope.description.setContent(form.vars(["description"]) || (form.qs("#description") || {})._content);
 // console.log(js.sf("%n / description set to: %s", root_scope.description, root_scope.description._content));
     			}
     			if(form_scope.left && form_scope.left._uri.endsWith("prototypes/ui/forms/View")) {
@@ -104,6 +105,7 @@ var Handlers = {
     			form_scope = form.getScope();
     			if(name === "formload" && !form_scope.left) {
 	    			root_scope.description.revertPropertyValue("content");
+	    			// /*!!!*/root_scope.description.setContent("--reverted1--");
     			}
     			if(form_scope.left && form_scope.left._uri.endsWith("prototypes/ui/forms/View")) {
     	    		if(name === "formload") {
@@ -195,6 +197,7 @@ var Handlers = {
 		}
 
 		scope.description.revertPropertyValue("content");
+		// /*!!!*/scope.description.setContent("--reverted2--");
 // console.log(js.sf("%n / description set to: %s", scope.description, scope.description._content));
 
 		// Is there a node selected?
@@ -337,7 +340,7 @@ var Handlers = {
 			// @overrides ui/forms/Home<>
 			container.setVisible(false);
 			container.setParent(scope.client);
-			node.setText(params.title || "&nbsp;");
+			node.setText(params.text || params.title || "&nbsp;");
 			node.setVar("control", container);
 			node.setParent(parent || scope.tree);
 			node.update(function() {

package/src/ui/Form.js

@@ -27,7 +27,7 @@ define(function(require) {
 			_onReflectHash: null,
 			
 			onshow: function() {
-				/** s ../Control.prototype.onshow */
+				/** @overrides ../Control.prototype.onshow */
 				if(this.fire("onShow", arguments) !== false) {
 				    var me = this;
 				    (function() {
@@ -43,12 +43,12 @@ define(function(require) {
 				}
 			},
 			onhide: function() {
-				/** s ../Control.prototype.onhide */
+				/** @overrides ../Control.prototype.onhide */
 				if(this.fire("onHide", arguments) !== false) {
 				}
 			},
 			visibleChanged: function() {
-				/** s ../Control.prototype.visibleChanged */
+				/** @overrides ../Control.prototype.visibleChanged */
 				var r = this.inherited(arguments);
 
 				if(this.isVisible()) {

package/src/ui/List.js

@@ -102,6 +102,15 @@ define(function(require) {
 			_onColumnGetValue: null,
 			_onColumnRenderCell: null,
 
+/**--		#CVLN-20220118-1-workaround */			
+			visibleChanged() {
+				if(this.isVisible()) {
+					// this.print("#CVLN-20220118-1 Calling rowHeightChanged-workaround");
+					this._body.rowHeightChanged();
+				}
+				return this.inherited(arguments);
+			},
+
 /**--		overrides ../Component.prototype */
 			destroy: function() {
 				/** @overrides ../Component.prototype.destroy */
@@ -212,7 +221,7 @@ define(function(require) {
 					var topRow = parseInt(me._nodes.body.scrollTop / me._rowHeight, 10);
 					me._topRow = topRow;
 					
-					me.render();
+					me.render_();
 				}
 
 				return this.inherited(arguments);
@@ -336,7 +345,7 @@ define(function(require) {
 			},
 
 			notifyEvent: function(event, data) {},
-			render: function(bodyUpdateRows/*TODO*/) {
+			render_: function(bodyUpdateRows/*TODO*/) {
 				if(bodyUpdateRows) return this._body.updateRows();
 				
 				var vrc = this.getVisibleRowCount(true);
@@ -346,8 +355,6 @@ define(function(require) {
 				}
 
 				var start = this._topRow - this._rowBuffer;
-
-
 				var end = start + vrc + this._rowBuffer * 2;
 
 				if(start < 0) {
@@ -390,7 +397,7 @@ define(function(require) {
 						}
 					}, 50);
 				}
-				this._body.render();
+				this._body.render_();
 			},
 			renderCell: function(cell, row, column) {
 				var value, orgValue;
@@ -489,7 +496,7 @@ define(function(require) {
 					}
 					this.setSelection([]);
 					//this.alignControls();
-					this.render();
+					this.render_();
 				}
 			},
 
@@ -533,7 +540,7 @@ define(function(require) {
 			setVisibleRowCount: function(value) {
 				if(this._visibleRowCount !== value) {
 					this._visibleRowCount = value;
-					this.render();
+					this.render_();
 				}
 			},
 			
@@ -655,12 +662,13 @@ define(function(require) {
 				this.notifyEvent("columnsChanged");
 			},
 			updateColumns: function() {
-				this.resetColumnAutoWidth(); 
-				
 				var updateColumns = this.updateColumns;
 				this.updateColumns = function() {
 					console.log("updateColumns blocked");
 				};
+
+				this.resetColumnAutoWidth(); 
+				
 				try {
 					if(this._source !== null) {
 						var columns = [].concat(this._columns);
@@ -712,7 +720,7 @@ define(function(require) {
 				for(var i = 0; i < this._columns.length; ++i) {
 					this._columns[i].setAutoWidthValue("", true);
 				}
-				this.render();
+				this.render_();
 			},
 			getAutoColumns: function() {
 				return this._autoColumns;
@@ -751,7 +759,7 @@ define(function(require) {
 						break;
 
 					case SourceEvent.busyChanged:
-						if(data && this._topRow > 0) { /* TODO what about scrolling up? */
+						if((data && this._topRow > 0) || this.hasClass("ignore-busy")) { /* TODO what about scrolling up? */
 							return;
 						}
 						this.setTimeout("update-busy", function() {
@@ -833,10 +841,10 @@ define(function(require) {
 				}
 				return value;
 			},
-			groupByColumn(column/*, ... TODO */) {
+			groupBy(column/*, ... TODO */) {
 				var r = {};
 				this._source.getObjects().forEach((obj, row) => {
-					var value = this.getValueByColumnAndRow(column, row);
+					var value = this.valueByColumnAndRow(column, row);
 					(r[value] = r[value] || []).push(obj);
 				});
 				return r;

package/src/ui/ListBody.js

@@ -53,7 +53,7 @@ define(function(require) {
 			getList: function() {
 				return this._parent !== null ? this._parent : null;
 			},
-			render: function() {
+			render_: function() {
 				var list = this.getList();
 				if(list.getCount() === 0) {
 					this._firstRow = 0;

package/src/ui/ListColumn.js

@@ -242,9 +242,8 @@ define(function(require) {
 				return r;
 			},
 			
-			
 			groupBy: function() {
-				return this._list.groupByColumn(this);	
+				return this._list.groupBy(this);	
 			},
 
 			sizing: function(evt) {

package/src/ui/ListHeader.js

@@ -9,9 +9,7 @@ define(function(require) {
 	var ListColumn = require("js/referenceClass!./List");
 
 	var ListHeader = {
-
 		inherits: Panel,
-
 		prototype: {
 
 			"@css": {
@@ -44,30 +42,17 @@ define(function(require) {
 				}
 			},
 
-			/**
-			 *
-			constructor: function() {
-			},
-			 */
-
-			/**
-			 * @overrides ../Control.prototype
-			 */
+			/** @overrides ../Control.prototype */
 			_align: "top",
 			_autoSize: "height",
 			_content: "<div></div>",
 
-			/**
-			 * @overrides ../Control.prototype.getClientNode
-			 */
 			getClientNode: function() {
+				/** overrides ../Control.prototype.getClientNode */
 				return this._node.childNodes[0];
 			},
-
-			/**
-			 * @overrides ../Control.prototype.setParent
-			 */
 			setParent: function(value) {
+				/** overrides ../Control.prototype.setParent */
 				if(this._parent !== value) {
 					if(this._parent !== null) {
 						Method.disconnect(this._parent, "notifyEvent", this, "listNotifyEvent");
@@ -81,11 +66,8 @@ define(function(require) {
 					}
 				}
 			},
-
-			/**
-			 * @overrides ../Control.prototype.dispatchChildEvent
-			 */
 			dispatchChildEvent: function(component, name, evt, f) {
+				/** overrides ../Control.prototype.dispatchChildEvent */
 				if(component instanceof ListColumn && component._parent === this) {
 					if(name === "dragstart" && component.hasClass("size") === false) {
 						var listview = this.getList();
@@ -141,25 +123,16 @@ define(function(require) {
 				return this.inherited(arguments);
 			},
 
-			/**
-			 *
-			 */
 			listNotifyEvent: function(event, data) {
 				if(event === "setScrollLeft" && this._node !== null) {
 					this._node/*.childNodes[0]*/.scrollLeft = data;
 				}
 			},
-
-			/**
-			 *
-			 */
 			getList: function() {
 				return this._parent !== null ? this._parent : null;
 			}
 		},
-
 		properties: {
-
 			"align": {
 				set: Method,
 				type: Panel.ALIGN
@@ -172,4 +145,4 @@ define(function(require) {
 	};
 
 	return (ListHeader = Class.define(require, ListHeader));
-});
+});

package/vcl-comps/Navigator.js

@@ -1,114 +0,0 @@
-"locale, vcl/ui/Node";
-
-var Node = require("vcl/ui/Node");
-
-var locale = window.locale;
-
-var styles = {
-	
-	"#search-panel": "padding: 4px 6px;",
-	"#search": "padding: 4px; width: 100%; border-radius: 5px; border: 1px solid #f0f0f0;"
-};
-var handlers = {
-	"loaded": function() {
-		var scope = this.scope();
-		
-		scope.tree.refresh();
-		
-		// var arr = scope.nodes._array;
-		// scope.nodes.setArray(null);
-		// scope.nodes.setArray(arr);
-	}
-}
-
-var letters = "aaaaaabbccdddeeeeeeeeefgghiiijjkklllmmnnnnnnoooooppqrrssttuuuuuvvwxyzzz";
-function randomWord() {
-	var n = Math.random() * 10;
-	if(n > 7) {
-		n += Math.random() * 5;
-	}
-	
-	n = parseInt(n) + 1;
-	
-	var r = "", p;
-	while(n-- >= 0) {
-		p = parseInt(Math.random() * letters.length);
-		r += letters.substring(p, p + 1);
-	}
-	
-	return r.substring(0, 1).toUpperCase() + r.substring(1);
-}
-
-function Node_render() {
-	/**
-	 * @overrides Node.prototype.render
-	 */
-	var record = this._vars.record;
-	// this._nodes.text.innerHTML =
-	this._nodes.icon.innerHTML = String.format("<i class='fa fa-%s'></i>", record.icon);
-	this._nodes.text.textContent = record.text;
-}
-
-var ID = 7;
-
-$("vcl/ui/Form", { css: styles, handlers: handlers }, [
-	
-	$("vcl/ui/Panel#search-panel", { align: "top", autoSize: "height" }, [
-		$("vcl/ui/Input#search")
-	]),
-
-	$("vcl/data/Array#nodes", {
-		array: [
-			{ id: 1, parent: 0, text: locale("Root"), icon: "home" },
-				{ id: 2, parent: 1, text: locale("Sub1") },
-				{ id: 3, parent: 1, text: locale("Sub2") },
-				{ id: 4, parent: 1, text: locale("Sub3 ++ ") },
-					{ id: 6, parent: 4, text: "Sub3.1" },
-				{ id: 5, parent: 1, text: locale("Sub4") }
-		]
-	}),
-
-	$("vcl/ui/Tree#tree", { align: "left", width: 300,
-		onSelectionChange: function() {
-			// this.scope().console.print("selectionchange", arguments);
-		},
-		onNodesNeeded: function(parent) {
-			var scope = this.scope(), owner = this._owner;
-			
-			if(parent === null) {
-				parent = this;
-				scope.nodes.getArray().forEach(function(record) {
-					if(record.parent === 0) {
-						node = new Node(owner);
-						node.render = Node_render;
-						node.setVar("record", record);
-						node.setExpandable(true);
-						node.setParent(parent);
-					}
-				});
-			} else {
-				var parentId = parent.getVar("record.id");
-				parent.setExpandable(false);
-				// parent.addClass("loading");
-				setTimeout(function() {
-					parent.setExpandable(true);
-					parent.removeClass("loading");
-					for(var i = 0; i < 2 + Math.random() * 20; ++i) {
-						var record = {text: randomWord(), id: ID++};
-						
-						node = new Node(owner);
-						node.render = Node_render;
-						node.setVar("record", record);
-						node.setExpandable(true);
-						node.setParent(parent);
-					}
-					
-				}, Math.round(Math.random() * 500));
-			}
-		} }),//, source: "#nodes" }),
-	
-	$("vcl/ui/List", { autoColumns: true, align: "client", source: "nodes" }),
-
-	$("vcl/ui/Console#console", { align: "bottom", height: 200, onEvaluate: function(expr) { var scope = this.scope(); return eval(expr); }})
-	
-]);