riojs 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/public/javascripts/components/grid_view.js

@@ -10,27 +10,38 @@ rio.components.GridView = rio.Component.create(rio.components.ListView, "GridVie
 		["rowClassName", ""],
 		["rowHoverClassName", "gridItemHover"],
 		["rowSelectedClassName", "gridItemSelected"],
-		["handleContextMenu", false]
+		["handleContextMenu", false],
+		
+		/**
+			The item object must have a unique toString value to be used as a cache key
+		*/
+		["cacheGridItems", false]
 	],
 	attrHtmls: ["header"],
 	attrEvents: ["contextMenu"],
 	methods: {
 		initialize: function($super, options) {
 			$super(options);
+
+			var cacheGridItems = this.getCacheGridItems();
+			if (cacheGridItems) {
+				this._gridItemCache = {};
+			}
 			this._listItemBuilder = function(item, renderer) {
+				if (cacheGridItems && this._gridItemCache[item]) { return this._gridItemCache[item]; }
 				var gridItem = new rio.components.GridItem({
 					item: item,
 					columns: this.getColumns(),
 					rowClassName: this.getRowClassName(),
 					hoverClassName: this.getRowHoverClassName(),
-					selectedClassName: this.getRowSelectedClassName(),
-					handleContextMenu: this.getHandleContextMenu()
+					selectedClassName: this.getRowSelectedClassName()
 				});
 				
 				if (this.getHandleContextMenu()) {
 					gridItem.observe("contextMenu", this.fire.bind(this, "contextMenu"));
 				}
 				
+				if (cacheGridItems) { this._gridItemCache[item] = gridItem; }
 				return gridItem;
 			}.bind(this);
 		},
@@ -51,6 +62,31 @@ rio.components.GridView = rio.Component.create(rio.components.ListView, "GridVie
 			boxHtml.insert(gridHtml);
 			
 			boxHtml.addClassName("gridView");
+
+			boxHtml.observe("click", function(e) {
+				var target = e.target;
+				while(target && target != boxHtml) {
+					if (target.rioComponent && Object.isFunction(target.rioComponent.click)) {
+						target.rioComponent.click(e);
+					}
+					target = target.parentNode;
+				}
+			}.bindAsEventListener(this));
+			
+			if (this.getHandleContextMenu()) {
+				boxHtml.observe("contextmenu", function(e) {
+					var target = e.target;
+					while(target && target != boxHtml) {
+						if (target.rioComponent && Object.isFunction(target.rioComponent.contextMenu)) {
+							target.rioComponent.contextMenu(e);
+							e.stop();
+							return;
+						}
+						target = target.parentNode;
+					}
+				}.bindAsEventListener(this));
+			}
+			
 			
 			return boxHtml;
 		},
@@ -75,45 +111,70 @@ rio.components.GridView = rio.Component.create(rio.components.ListView, "GridVie
 
 rio.components.GridItem = rio.Component.create(rio.components.ListItem, "GridItem", {
 	attrAccessors: [["columns", []], ["selected", false]],
-	attrReaders: ["rowClassName", "handleContextMenu"],
+	attrReaders: ["rowClassName"],
 	attrEvents: ["click", "contextMenu"],
 	methods: {
 		buildHtml: function() {
 			var rowClassName = this.getRowClassName();
 			var className = Object.isFunction(rowClassName) ? rowClassName(this.getItem()) : rowClassName;
-			var html = rio.Tag.tr(
-				this.getColumns().map(function(column) {
-					var cell = rio.Tag.td(column.renderer(this.getItem(), this));
-					cell.setStyle({
-						width: column.width,
-						textAlign: column.align || "left",
-						padding: (column.padding != undefined) ? column.padding : this.padding
+
+
+			var columns = this.getColumns();
+			var column, cell;
+			var html = rio.Tag.tr("", { className: className });
+			
+			html.rioComponent = this;
+			
+			var deferRendering = function(cell, column) {
+				var contents = column.renderer(this.getItem(), this, html);
+				if (Object.isArray(contents)) {
+					cell.update();
+					contents.each(function(content) {
+						cell.insert(content);
 					});
-					return cell;
-				}.bind(this)),
-				{
-					className: className
+				} else {
+					cell.update();
+					cell.insert(contents);
 				}
-			);
+			};
 			
-			html.addHoverClass(this.getHoverClassName());
-			html.observe("click", function(e) {
-				this.fire("click", e);
-			}.bindAsEventListener(this));
-			
-			if (this.getHandleContextMenu()) {
-				html.observe("contextmenu", function(e) {
-					this.fire("contextMenu", this, e);
-					e.stop();
-				}.bindAsEventListener(this));
+			for (var i=0, length=columns.length; i<length; i++) {
+				column = columns[i];
+
+				if (column.deferRendering) {
+					cell = rio.Tag.td(" ");
+					rio.Thread.fork(deferRendering.bind(this, cell, column), column.deferOptions);
+				} else {
+					cell = rio.Tag.td(column.renderer(this.getItem(), this, html));
+				}
+				
+				cell.setStyle({
+					width: column.width,
+					textAlign: column.align || "left",
+					padding: (column.padding != undefined) ? column.padding : this.padding
+				});
+				html.insert(cell);
 			}
-			
+
+			var hoverClassName = this.getHoverClassName();
+			if (hoverClassName) {
+				html.addHoverClass(hoverClassName);
+			}
+
 			this.bind("selected", function(selected) {
 				html[selected ? "addClassName" : "removeClassName"](this.getSelectedClassName());
 			}.bind(this));
 			
 			
 			return html;
+		},
+		
+		click: function(e) {
+			this.fire("click", e);
+		},
+		
+		contextMenu: function(e) {
+			this.fire("contextMenu", this, e)
 		}
 	}
 });

data/public/javascripts/components/input.js

@@ -22,7 +22,7 @@ rio.components.Input = rio.Component.create(rio.components.Box, "Input", {
 		["focus", false],
 		["enabled", true]
 	],
-	attrEvents: ["enter", "keyPress", "keyDown", "keyUp", "focus", "blur"],
+	attrEvents: ["enter", "escape", "keyPress", "keyDown", "keyUp", "focus", "blur"],
 	methods: {
 		buildHtml: function() {
 			var inputHtml = rio.Tag.input("", {
@@ -131,9 +131,12 @@ rio.components.Input = rio.Component.create(rio.components.Box, "Input", {
 					}, this);
 				}
 				
-				if (e.keyCode == Event.KEY_ESC && this.getRevertOnEscape()) {
-					inputHtml.value = this.getValue();
-					inputHtml.blur();
+				if (e.keyCode == Event.KEY_ESC) {
+					if (this.getRevertOnEscape()) {
+						inputHtml.value = this.getValue();
+						inputHtml.blur();
+					}
+					this.fire("escape");
 				}
 				
 				this.fire("keyDown", e);

data/public/javascripts/components/label.js

@@ -8,8 +8,12 @@ rio.components.Label = rio.Component.create(rio.components.Base, {
 			this.content.bind(function(content) {
 				labelHtml.update(content);
 			});
-			labelHtml.observe("dblclick", this.fire.curry("dblClick").bind(this));
+			labelHtml.rioComponent = this;
 			return labelHtml;
+		},
+		
+		dblClick: function(e) {
+			this.fire("dblClick", e);
 		}
 	}
 });

data/public/javascripts/components/list_item.js

@@ -12,19 +12,17 @@ rio.components.ListItem = rio.Component.create(rio.components.Base, "ListItem",
 	methods: {
 		buildHtml: function() {
 			var listItemHtml = this.getRenderer()(this.getItem());
+			listItemHtml.rioComponent = this;
 
-			listItemHtml.observe("mouseover", function() {
-				listItemHtml.addClassName(this.getHoverClassName());
-			}.bind(this));
-			listItemHtml.observe("mouseout", function() {
-				listItemHtml.removeClassName(this.getHoverClassName());
-			}.bind(this));
-			listItemHtml.observe("click", function(e) { 
-				this.click();
-				if (this.getStopClickPropogation()) {
-					e.stop();
-				}
-			}.bindAsEventListener(this));
+			var hoverClass = this.getHoverClassName();
+			if (hoverClass && !hoverClass.blank()) {
+				listItemHtml.observe("mouseover", function() {
+					listItemHtml.addClassName(hoverClass);
+				});
+				listItemHtml.observe("mouseout", function() {
+					listItemHtml.removeClassName(hoverClass);
+				});
+			}
 			
 			this.bind("selected", function(selected) {
 				listItemHtml[selected ? "addClassName" : "removeClassName"](this.getSelectedClassName());
@@ -33,8 +31,11 @@ rio.components.ListItem = rio.Component.create(rio.components.Base, "ListItem",
 			return listItemHtml;
 		},
 		
-		click: function() {
+		click: function(e) {
 			this.fire("click");	
+			if (this.getStopClickPropogation()) {
+				e.stop();
+			}
 		},
 		
 		scrollTo: function() {

data/public/javascripts/components/list_view.js

@@ -29,7 +29,17 @@ rio.components.ListView = rio.Component.create(rio.components.Box, "ListView", {
 		addBindings: function(listHtml) {
 			if (!this._unbindings) { this._unbindings = []; }
 			var unbindItems = this.bind("items", {
-				set: function(items) {
+				set: function(items, oldItems) {
+					if ((oldItems == undefined || oldItems.length == 0) && (items && items.empty())) {
+						return;
+					}
+					
+					var manageReflow = listHtml && listHtml.parentNode;
+					var reinserter;
+					if (manageReflow) {
+						reinserter = listHtml.removeToInsertLater();
+					}
+
 					listHtml.update();
 					this.setListItems([]);
 					if (items) {
@@ -37,6 +47,10 @@ rio.components.ListView = rio.Component.create(rio.components.Box, "ListView", {
 							this.insertItem(items[i], this.getListItems().size(), listHtml);
 						}
 					}
+
+					if (manageReflow) {
+						reinserter();
+					}
 				}.bind(this),
 				insert: function(val, atIndex) {
 					this.insertItem(val, atIndex, listHtml);

data/public/javascripts/components/popup.js

@@ -8,7 +8,7 @@ rio.components.Popup = rio.Component.create("Popup", {
 		["opacity", 0.8],
 		["autoCenter", true],
 		["wrapContent", true],
-		["animateOverlay", true]
+		["animateOverlay", false]
 	],
 	attrReaders: [],
 	attrHtmls: ["overlay"],

data/public/javascripts/components/textarea.js

@@ -19,16 +19,17 @@ rio.components.Textarea = rio.Component.create(rio.components.Base, "Textarea",
 	],
 	attrEvents: ["enter", "keyPress", "keyDown", "keyUp", "focus", "blur", "resize"],
 	attrHtmls: ["textarea"],
-	styles: ["height"],
 	methods: {
 		buildHtml: function() {
-			var html = rio.Tag.div("", { 
+			var html = rio.Tag.div(this.textareaHtml(), { 
 				className: this.getClassName(),
-				style: "padding-bottom: 1px"
+				style: "padding-bottom: 1px;"
 			});
-			html.addHoverClass(this.getHoverClassName());
-			html.insert(this.textareaHtml());
-			html.applyStyle({ height: this.height });
+			var hoverClass = this.getHoverClassName();
+			if (hoverClass && !hoverClass.blank()) {
+				html.addHoverClass(hoverClass);
+			}
+			html.rioComponent = this;
 			return html;
 		},
 		
@@ -150,13 +151,15 @@ rio.components.Textarea = rio.Component.create(rio.components.Base, "Textarea",
 				updateHeight();
 				this.fire("keyDown", e);
 			}.bindAsEventListener(this));
-			textareaHtml.observe('keyup', function() {
-				updateHeight();
-				this.fire("keyUp");
-			}.bind(this));
-			
+
 			return textareaHtml;			
 		},
+		
+		keyUp: function() {
+			this.resize(this.textareaHtml());
+			this.fire("keyUp");
+		},
+		
 		clear: function() {
 			this.setValue("");
 		},

data/public/javascripts/lib/attr.js

@@ -235,7 +235,7 @@ rio.Attr = {
 						if (binding.empty) { binding.empty(value.length == 0); }
 					}
 					if (binding.set) { 
-						binding.set(value);
+						binding.set(value, oldValue);
 					}
 				}
 			},

data/public/javascripts/lib/boot.js

@@ -284,6 +284,8 @@ var w = window;
 	}
 
 	document.observe('dom:loaded', function() {
+		rio.EventDelegator.enable();
+		
 		var app = rio.apps[rio.boot.appName.camelize()];
 		var pushOverride = app.environment().push == undefined ? true : app.environment().push;
 		if ((rio.environment.push && pushOverride) && !rio.push) {

data/public/javascripts/lib/console/console_commands.js

@@ -80,6 +80,34 @@ rio.ConsoleCommands = {
 			opener.rio.app.reboot();
 		}
 	},
+
+	y: {
+		description: "Dump an object as yaml",
+		action: function(prompt) {
+			yaml = rio.Yaml.dump(opener.eval(prompt.match(/^y (.*)$/)[1]));
+			this.log(yaml, "", "");
+		}
+	},
+	
+	ec: {
+		description: "Show a count of event observations",
+		action: function() {
+			var eventCounts = opener.rio.eventCounts || {};
+			var total = Object.values(eventCounts).inject(0, function(acc, c) { return acc + c });
+			
+			yaml = rio.Yaml.dump(eventCounts);
+			yaml += "\n----------------\ntotal: " + total;
+			this.log(yaml, "", "");
+		}
+	},
+
+	rec: {
+		description: "Reset the count of event observations",
+		action: function() {
+			opener.rio.eventCounts = {};
+			this.log("Event counts reset");
+		}
+	},
 	
 	bind: {
 		description: "Set the execution binding to something other than window",
@@ -150,10 +178,10 @@ rio.ConsoleCommands = {
 		}
 	},
 	
-	// perf: {
-	// 	description: "Check the status of, turn on, and turn off autocss",
-	// 	action: function(prompt) {
-	// 		this.log("Benchmarking...");
+	perf: {
+		description: "Check the status of, turn on, and turn off autocss",
+		action: function(prompt) {
+			this.log("Benchmarking...");
 	// 		var stub = function(obj, method) {
 	// 			return new opener.rio.Stub(obj, method);
 	// 		};
@@ -166,7 +194,7 @@ rio.ConsoleCommands = {
 	// 		stubs.push(stub(opener.rio.components.LineItem, "_lineItemCache").withValue({}));
 	// 
 	// 		// var count = "Model#initialize";
-	// 		opener.rio.Benchmark.start();
+	//		opener.rio.Benchmark.start();
 	// 
 	// 		try {
 	// 			// TODO: remove method
@@ -174,7 +202,7 @@ rio.ConsoleCommands = {
 	// 				items: opener.rio.models.Outline.find(41).getRootNodes().sortedLineItems
 	// 			});
 	// 			
-	// 			var startTime = new Date();
+				var startTime = new Date();
 	// 			// opener.rio.models.LineItem.findAll({ parameters: { outlineId: 196 } });
 	// 			// opener.rio.models.Outline.find(196).getLineItems()
 	// 			// opener.rio.models.Outline.find(196).getRootNodes().getSortedLineItems();
@@ -192,7 +220,29 @@ rio.ConsoleCommands = {
 	// 			// 	new opener.rio.models.LineItem({ outline: o });
 	// 			// });
 	// 			
-	// 			this.log(new Date() - startTime + " ms");
+
+				// opener.rio.Benchmark.start();
+				var runs = 1;
+				(runs).times(function() {
+					try {
+						opener.rio.app.getCurrentPage().getOutlineListPage().closePopup();
+					} catch(e) {
+					}
+					opener.rio.app.getCurrentPage().getOutlineListPage().popup();
+				});
+				this.log((new Date() - startTime)/runs + " ms");
+
+				// opener.rio.Benchmark.stop();
+				// opener.rio.Benchmark.getInstallations().each(function(installation) {
+				// 	this.log(
+				// 		installation.getObjectString() + "#" + 
+				// 		installation.getMethodName() + " - " + 
+				// 		installation.getInvocations() / 5 + ", " +
+				// 		installation.getTime() / 5
+				// 	);
+				// }.bind(this));
+
+	//			this.log(new Date() - startTime + " ms");
 	// 
 	// 			opener.rio.Benchmark.stop();
 	// 			opener.rio.Benchmark.getInstallations().each(function(installation) {
@@ -209,8 +259,8 @@ rio.ConsoleCommands = {
 	// 		} finally {
 	// 			stubs.invoke("release");
 	// 		}
-	// 	}
-	// },
+		}
+	},
 	
 	fixtures: {
 		description: "Force the fixtures to reload",