You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/12/14 16:45:26 UTC
svn commit: r487242 [19/20] - in
/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo: ./ nls/ src/
src/behavior/ src/cal/ src/charting/ src/charting/svg/ src/charting/vml/
src/collections/ src/crypto/ src/data/ src/data/core/ src/data/old/
src/dat...
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/TreeSelectorV3.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/TreeSelectorV3.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/TreeSelectorV3.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/TreeSelectorV3.js Thu Dec 14 07:45:13 2006
@@ -1,19 +1,25 @@
dojo.provide("dojo.widget.TreeSelectorV3");dojo.require("dojo.widget.HtmlWidget");dojo.require("dojo.widget.TreeCommon");dojo.widget.defineWidget(
-"dojo.widget.TreeSelectorV3",[dojo.widget.HtmlWidget, dojo.widget.TreeCommon],function() {this.eventNames = {};this.listenedTrees = {};this.selectedNodes = [];this.lastClicked = {}},{listenTreeEvents: ["afterTreeCreate","afterCollapse","afterChangeTree", "afterDetach", "beforeTreeDestroy", "afterNavigate"],listenNodeFilter: function(elem) { return elem instanceof dojo.widget.Widget},allowedMulti: true,dblselectTimeout: 300,eventNamesDefault: {select : "select",deselect : "deselect",dblselect: "dblselect"},onAfterTreeCreate: function(message) {var tree = message.source;dojo.event.browser.addListener(tree.domNode, "onclick", dojo.lang.hitch(this, this.onTreeClick));if (dojo.render.html.ie) {dojo.event.browser.addListener(tree.domNode, "ondblclick", dojo.lang.hitch(this, this.onTreeDblClick));}
+"dojo.widget.TreeSelectorV3",[dojo.widget.HtmlWidget, dojo.widget.TreeCommon],function() {this.eventNames = {};this.listenedTrees = {};this.selectedNodes = [];this.lastClicked = {}},{listenTreeEvents: ["afterTreeCreate","afterCollapse","afterChangeTree", "afterDetach", "beforeTreeDestroy", "afterNavigate"],listenNodeFilter: function(elem) { return elem instanceof dojo.widget.Widget},allowedMulti: true,dblselectTimeout: 300,eventNamesDefault: {select : "select",deselect : "deselect",dblselect: "dblselect"
+},onAfterTreeCreate: function(message) {var tree = message.source;dojo.event.browser.addListener(tree.domNode, "onclick", dojo.lang.hitch(this, this.onTreeClick));if (dojo.render.html.ie) {dojo.event.browser.addListener(tree.domNode, "ondblclick", dojo.lang.hitch(this, this.onTreeDblClick));}
dojo.event.browser.addListener(tree.domNode, "onKey", dojo.lang.hitch(this, this.onKey));},onKey: function(e) {if (!e.key || e.altKey) { return; }
-if (e.key == ' ') {var node = this.domElement2TreeNode(e.target);if (node){this.processNode(node, e);}}},onAfterNavigate: function(message) {this.processNode(message.node, message.event);},onAfterChangeTree: function(message) {if (!message.oldTree && message.node.selected) {this.select(message.node);}
-if (!message.newTree || !this.listenedTrees[message.newTree.widgetId]) {if (this.selectedNode && message.node.children) {this.deselectIfAncestorMatch(message.node);}}},initialize: function(args) {for(name in this.eventNamesDefault) {if (dojo.lang.isUndefined(this.eventNames[name])) {this.eventNames[name] = this.widgetId+"/"+this.eventNamesDefault[name];}}},onBeforeTreeDestroy: function(message) {this.unlistenTree(message.source);},onAfterCollapse: function(message) {this.deselectIfAncestorMatch(message.source);},onTreeDblClick: function(event) {this.onTreeClick(event);},checkSpecialEvent: function(event) {return event.shiftKey || event.ctrlKey;},onTreeClick: function(event) {var node = this.domElement2TreeNode(event.target);if (!node) {return;}
+if (e.key == ' ') {var node = this.domElement2TreeNode(e.target);if (node){this.processNode(node, e);}}
+},onAfterNavigate: function(message) {this.processNode(message.node, message.event);},onAfterChangeTree: function(message) {if (!message.oldTree && message.node.selected) {this.select(message.node);}
+if (!message.newTree || !this.listenedTrees[message.newTree.widgetId]) {if (this.selectedNode && message.node.children) {this.deselectIfAncestorMatch(message.node);}}
+},initialize: function(args) {for(name in this.eventNamesDefault) {if (dojo.lang.isUndefined(this.eventNames[name])) {this.eventNames[name] = this.widgetId+"/"+this.eventNamesDefault[name];}}
+},onBeforeTreeDestroy: function(message) {this.unlistenTree(message.source);},onAfterCollapse: function(message) {this.deselectIfAncestorMatch(message.source);},onTreeDblClick: function(event) {this.onTreeClick(event);},checkSpecialEvent: function(event) {return event.shiftKey || event.ctrlKey;},onTreeClick: function(event) {var node = this.domElement2TreeNode(event.target);if (!node) {return;}
var checkLabelClick = function(domElement) {return domElement === node.labelNode;}
if (this.checkPathCondition(event.target, checkLabelClick)) {this.processNode(node, event);}},processNode: function(node, event) {if (node.actionIsDisabled(node.actions.SELECT)) {return;}
if (dojo.lang.inArray(this.selectedNodes, node)) {if(this.checkSpecialEvent(event)){this.deselect(node);return;}
var _this = this;var i=0;var selectedNode;while(this.selectedNodes.length > i) {selectedNode = this.selectedNodes[i];if (selectedNode !== node) {this.deselect(selectedNode);continue;}
i++;}
var wasJustClicked = this.checkRecentClick(node)
-eventName = wasJustClicked ? this.eventNames.dblselect : this.eventNames.select;if (wasJustClicked) {eventName = this.eventNames.dblselect;this.forgetLastClicked();} else {eventName = this.eventNames.select;this.setLastClicked(node)}
+eventName = wasJustClicked ? this.eventNames.dblselect : this.eventNames.select;if (wasJustClicked) {eventName = this.eventNames.dblselect;this.forgetLastClicked();} else {eventName = this.eventNames.select;this.setLastClicked(node)
+}
dojo.event.topic.publish(eventName, { node: node });return;}
this.deselectIfNoMulti(event);this.setLastClicked(node);this.select(node);},forgetLastClicked: function() {this.lastClicked = {}},setLastClicked: function(node) {this.lastClicked.date = new Date();this.lastClicked.node = node;},checkRecentClick: function(node) {var diff = new Date() - this.lastClicked.date;if (this.lastClicked.node && diff < this.dblselectTimeout) {return true;} else {return false;}},deselectIfNoMulti: function(event) {if (!this.checkSpecialEvent(event) || !this.allowedMulti) {this.deselectAll();}},deselectIfAncestorMatch: function(ancestor) {var _this = this;dojo.lang.forEach(this.selectedNodes, function(node) {var selectedNode = node;node = node.parent
while (node && node.isTreeNode) {if (node === ancestor) {_this.deselect(selectedNode);return;}
node = node.parent;}});},onAfterDetach: function(message) {this.deselectIfAncestorMatch(message.child);},select: function(node) {var index = dojo.lang.find(this.selectedNodes, node, true);if (index >=0 ) {return;}
this.selectedNodes.push(node);dojo.event.topic.publish(this.eventNames.select, {node: node} );},deselect: function(node){var index = dojo.lang.find(this.selectedNodes, node, true);if (index < 0) {return;}
-this.selectedNodes.splice(index, 1);dojo.event.topic.publish(this.eventNames.deselect, {node: node} );},deselectAll: function() {while (this.selectedNodes.length) {this.deselect(this.selectedNodes[0]);}}});
\ No newline at end of file
+this.selectedNodes.splice(index, 1);dojo.event.topic.publish(this.eventNames.deselect, {node: node} );},deselectAll: function() {while (this.selectedNodes.length) {this.deselect(this.selectedNodes[0]);}}
+});
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/TreeToggleOnSelect.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/TreeToggleOnSelect.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/TreeToggleOnSelect.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/TreeToggleOnSelect.js Thu Dec 14 07:45:13 2006
@@ -1,4 +1,5 @@
dojo.provide("dojo.widget.TreeToggleOnSelect");dojo.require("dojo.widget.HtmlWidget");dojo.widget.defineWidget(
"dojo.widget.TreeToggleOnSelect",dojo.widget.HtmlWidget,{selector: "",controller: "",selectEvent: "select",initialize: function() {this.selector = dojo.widget.byId(this.selector);this.controller = dojo.widget.byId(this.controller);dojo.event.topic.subscribe(this.selector.eventNames[this.selectEvent], this, "onSelectEvent");},onSelectEvent: function(message) {var node = message.node
-node.isExpanded ? this.controller.collapse(node) : this.controller.expand(node)}});
\ No newline at end of file
+node.isExpanded ? this.controller.collapse(node) : this.controller.expand(node)
+}});
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/TreeV3.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/TreeV3.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/TreeV3.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/TreeV3.js Thu Dec 14 07:45:13 2006
@@ -1,11 +1,19 @@
dojo.provide("dojo.widget.TreeV3");dojo.require("dojo.widget.TreeWithNode");dojo.require("dojo.widget.*");dojo.require("dojo.event.*");dojo.require("dojo.io.*");dojo.require("dojo.widget.HtmlWidget");dojo.require("dojo.widget.TreeNodeV3");dojo.widget.defineWidget(
-"dojo.widget.TreeV3",[dojo.widget.HtmlWidget, dojo.widget.TreeWithNode],function() {this.eventNames = {};this.DndAcceptTypes = [];this.actionsDisabled = [];this.listeners = [];this.tree = this;},{DndMode: "",defaultChildWidget: null,defaultChildTitle: "New Node",eagerWidgetInstantiation: false,eventNamesDefault: {afterTreeCreate: "afterTreeCreate",beforeTreeDestroy: "beforeTreeDestroy",beforeNodeDestroy: "beforeNodeDestroy",afterChangeTree: "afterChangeTree",afterSetFolder: "afterSetFolder",afterUnsetFolder: "afterUnsetFolder",beforeMoveFrom: "beforeMoveFrom",beforeMoveTo: "beforeMoveTo",afterMoveFrom: "afterMoveFrom",afterMoveTo: "afterMoveTo",afterAddChild: "afterAddChild",afterDetach: "afterDetach",afterExpand: "afterExpand",beforeExpand: "beforeExpand",afterSetTitle: "afterSetTitle",afterCollapse: "afterCollapse",beforeCollapse: "beforeCollapse",afterNavigate: "afterNavigate"},classPrefix: "Tree",style: "",allowAddChildToLeaf: true,unsetFolderOnEmpty: true,DndModes: {BET
WEEN: 1,ONTO: 2},DndAcceptTypes: "",templateCssPath: dojo.uri.dojoUri("src/widget/templates/TreeV3.css"),templateString: '<div style="${this.style}">\n</div>',isExpanded: true,isTree: true,createNode: function(data) {data.tree = this.widgetId;if (data.widgetName) {return dojo.widget.createWidget(data.widgetName, data);} else if (this.defaultChildWidget.prototype.createSimple) {return this.defaultChildWidget.prototype.createSimple(data);} else {var ns = this.defaultChildWidget.prototype.ns;var wt = this.defaultChildWidget.prototype.widgetType;return dojo.widget.createWidget(ns + ":" + wt, data);}},makeNodeTemplate: function() {var domNode = document.createElement("div");dojo.html.setClass(domNode, this.classPrefix+"Node "+this.classPrefix+"ExpandLeaf "+this.classPrefix+"ChildrenNo");dojo.widget.wai.setAttr(domNode, "waiRole", "role", "presentation");this.nodeTemplate = domNode;var expandNode = document.createElement("div");var clazz = this.classPrefix+"Expand";dojo.widget.wai
.setAttr(expandNode, "waiRole", "role", "presentation");if (dojo.render.html.ie) {clazz = clazz + ' ' + this.classPrefix+"IEExpand";}
+"dojo.widget.TreeV3",[dojo.widget.HtmlWidget, dojo.widget.TreeWithNode],function() {this.eventNames = {};this.DndAcceptTypes = [];this.actionsDisabled = [];this.listeners = [];this.tree = this;},{DndMode: "",defaultChildWidget: null,defaultChildTitle: "New Node",eagerWidgetInstantiation: false,eventNamesDefault: {afterTreeCreate: "afterTreeCreate",beforeTreeDestroy: "beforeTreeDestroy",beforeNodeDestroy: "beforeNodeDestroy",afterChangeTree: "afterChangeTree",afterSetFolder: "afterSetFolder",afterUnsetFolder: "afterUnsetFolder",beforeMoveFrom: "beforeMoveFrom",beforeMoveTo: "beforeMoveTo",afterMoveFrom: "afterMoveFrom",afterMoveTo: "afterMoveTo",afterAddChild: "afterAddChild",afterDetach: "afterDetach",afterExpand: "afterExpand",beforeExpand: "beforeExpand",afterSetTitle: "afterSetTitle",afterCollapse: "afterCollapse",beforeCollapse: "beforeCollapse",afterNavigate: "afterNavigate"
+},classPrefix: "Tree",style: "",allowAddChildToLeaf: true,unsetFolderOnEmpty: true,DndModes: {BETWEEN: 1,ONTO: 2
+},DndAcceptTypes: "",templateCssPath: dojo.uri.dojoUri("src/widget/templates/TreeV3.css"),templateString: '<div style="${this.style}">\n</div>',isExpanded: true,isTree: true,createNode: function(data) {data.tree = this.widgetId;if (data.widgetName) {return dojo.widget.createWidget(data.widgetName, data);} else if (this.defaultChildWidget.prototype.createSimple) {return this.defaultChildWidget.prototype.createSimple(data);} else {var ns = this.defaultChildWidget.prototype.ns;var wt = this.defaultChildWidget.prototype.widgetType;return dojo.widget.createWidget(ns + ":" + wt, data);}},makeNodeTemplate: function() {var domNode = document.createElement("div");dojo.html.setClass(domNode, this.classPrefix+"Node "+this.classPrefix+"ExpandLeaf "+this.classPrefix+"ChildrenNo");dojo.widget.wai.setAttr(domNode, "waiRole", "role", "presentation");this.nodeTemplate = domNode;var expandNode = document.createElement("div");var clazz = this.classPrefix+"Expand";dojo.widget.wai.setAttr(expand
Node, "waiRole", "role", "presentation");if (dojo.render.html.ie) {clazz = clazz + ' ' + this.classPrefix+"IEExpand";}
dojo.html.setClass(expandNode, clazz);this.expandNodeTemplate = expandNode;var labelNode = document.createElement("span");dojo.html.setClass(labelNode, this.classPrefix+"Label");dojo.widget.wai.setAttr(labelNode, "waiRole", "role", "treeitem");this.labelNodeTemplate = labelNode;var contentNode = document.createElement("div");dojo.widget.wai.setAttr(contentNode, "waiRole", "role", "presentation");var clazz = this.classPrefix+"Content";if (dojo.render.html.ie && !dojo.render.html.ie70) {clazz = clazz + ' ' + this.classPrefix+"IEContent";}
-dojo.html.setClass(contentNode, clazz);this.contentNodeTemplate = contentNode;domNode.appendChild(expandNode);domNode.appendChild(contentNode);contentNode.appendChild(labelNode);},makeContainerNodeTemplate: function() {var div = document.createElement('div');div.style.display = 'none';dojo.html.setClass(div, this.classPrefix+"Container");dojo.widget.wai.setAttr(div, "waiRole", "role", "presentation");this.containerNodeTemplate = div;},actions: {ADDCHILD: "ADDCHILD"},getInfo: function() {var info = {widgetId: this.widgetId,objectId: this.objectId}
-return info;},adjustEventNames: function() {for(var name in this.eventNamesDefault) {if (dojo.lang.isUndefined(this.eventNames[name])) {this.eventNames[name] = this.widgetId+"/"+this.eventNamesDefault[name];}}},adjustDndMode: function() {var _this = this;var DndMode = 0;dojo.lang.forEach(this.DndMode.split(';'),function(elem) {var mode = _this.DndModes[dojo.string.trim(elem).toUpperCase()];if (mode) DndMode = DndMode | mode;}
+dojo.html.setClass(contentNode, clazz);this.contentNodeTemplate = contentNode;domNode.appendChild(expandNode);domNode.appendChild(contentNode);contentNode.appendChild(labelNode);},makeContainerNodeTemplate: function() {var div = document.createElement('div');div.style.display = 'none';dojo.html.setClass(div, this.classPrefix+"Container");dojo.widget.wai.setAttr(div, "waiRole", "role", "presentation");this.containerNodeTemplate = div;},actions: {ADDCHILD: "ADDCHILD"
+},getInfo: function() {var info = {widgetId: this.widgetId,objectId: this.objectId
+}
+return info;},adjustEventNames: function() {for(var name in this.eventNamesDefault) {if (dojo.lang.isUndefined(this.eventNames[name])) {this.eventNames[name] = this.widgetId+"/"+this.eventNamesDefault[name];}}
+},adjustDndMode: function() {var _this = this;var DndMode = 0;dojo.lang.forEach(this.DndMode.split(';'),function(elem) {var mode = _this.DndModes[dojo.string.trim(elem).toUpperCase()];if (mode) DndMode = DndMode | mode;}
);this.DndMode = DndMode;},destroy: function() {dojo.event.topic.publish(this.tree.eventNames.beforeTreeDestroy, { source: this } );return dojo.widget.HtmlWidget.prototype.destroy.apply(this, arguments);},initialize: function(args){this.domNode.widgetId = this.widgetId;for(var i=0; i<this.actionsDisabled.length;i++) {this.actionsDisabled[i] = this.actionsDisabled[i].toUpperCase();}
if (!args.defaultChildWidget) {this.defaultChildWidget = dojo.widget.TreeNodeV3;} else {this.defaultChildWidget = dojo.lang.getObjPathValue(args.defaultChildWidget);}
-this.adjustEventNames();this.adjustDndMode();this.makeNodeTemplate();this.makeContainerNodeTemplate();this.containerNode = this.domNode;dojo.html.setClass(this.domNode, this.classPrefix+"Container");dojo.widget.wai.setAttr(this.domNode, "waiRole", "role", "tree");var _this = this;dojo.lang.forEach(this.listeners,function(elem) {var t = dojo.lang.isString(elem) ? dojo.widget.byId(elem) : elem;t.listenTree(_this)}
+this.adjustEventNames();this.adjustDndMode();this.makeNodeTemplate();this.makeContainerNodeTemplate();this.containerNode = this.domNode;dojo.html.setClass(this.domNode, this.classPrefix+"Container");dojo.widget.wai.setAttr(this.domNode, "waiRole", "role", "tree");var _this = this;dojo.lang.forEach(this.listeners,function(elem) {var t = dojo.lang.isString(elem) ? dojo.widget.byId(elem) : elem;t.listenTree(_this)
+}
);},postCreate: function() {dojo.event.topic.publish(this.eventNames.afterTreeCreate, { source: this } );},move: function(child, newParent, index) {if (!child.parent) {dojo.raise(this.widgetType+": child can be moved only while it's attached");}
-var oldParent = child.parent;var oldTree = child.tree;var oldIndex = child.getParentIndex();var newTree = newParent.tree;var newParent = newParent;var newIndex = index;var message = {oldParent: oldParent, oldTree: oldTree, oldIndex: oldIndex,newParent: newParent, newTree: newTree, newIndex: newIndex,child: child};dojo.event.topic.publish(oldTree.eventNames.beforeMoveFrom, message);dojo.event.topic.publish(newTree.eventNames.beforeMoveTo, message);this.doMove.apply(this, arguments);dojo.event.topic.publish(oldTree.eventNames.afterMoveFrom, message);dojo.event.topic.publish(newTree.eventNames.afterMoveTo, message);},doMove: function(child, newParent, index) {child.doDetach();newParent.doAddChild(child, index);},toString: function() {return "["+this.widgetType+" ID:"+this.widgetId +"]"}});
\ No newline at end of file
+var oldParent = child.parent;var oldTree = child.tree;var oldIndex = child.getParentIndex();var newTree = newParent.tree;var newParent = newParent;var newIndex = index;var message = {oldParent: oldParent, oldTree: oldTree, oldIndex: oldIndex,newParent: newParent, newTree: newTree, newIndex: newIndex,child: child
+};dojo.event.topic.publish(oldTree.eventNames.beforeMoveFrom, message);dojo.event.topic.publish(newTree.eventNames.beforeMoveTo, message);this.doMove.apply(this, arguments);dojo.event.topic.publish(oldTree.eventNames.afterMoveFrom, message);dojo.event.topic.publish(newTree.eventNames.afterMoveTo, message);},doMove: function(child, newParent, index) {child.doDetach();newParent.doAddChild(child, index);},toString: function() {return "["+this.widgetType+" ID:"+this.widgetId+"]"
+}});
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/TreeWithNode.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/TreeWithNode.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/TreeWithNode.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/TreeWithNode.js Thu Dec 14 07:45:13 2006
@@ -1,19 +1,23 @@
dojo.require("dojo.lang.declare");dojo.provide("dojo.widget.TreeWithNode");dojo.declare(
-"dojo.widget.TreeWithNode",null,function(){ },{loadStates: {UNCHECKED: "UNCHECKED",LOADING: "LOADING",LOADED: "LOADED"},state: "UNCHECKED",objectId: "",isContainer: true,lockLevel: 0,lock: function() {this.lockLevel++;},unlock: function() {if (!this.lockLevel) {dojo.raise(this.widgetType+" unlock: not locked");}
+"dojo.widget.TreeWithNode",null,function(){ },{loadStates: {UNCHECKED: "UNCHECKED",LOADING: "LOADING",LOADED: "LOADED"
+},state: "UNCHECKED",objectId: "",isContainer: true,lockLevel: 0,lock: function() {this.lockLevel++;},unlock: function() {if (!this.lockLevel) {dojo.raise(this.widgetType+" unlock: not locked");}
this.lockLevel--;},expandLevel: 0,loadLevel: 0,hasLock: function() {return this.lockLevel>0;},isLocked: function() {var node = this;while (true) {if (node.lockLevel) {return true;}
if (!node.parent || node.isTree) {break;}
node = node.parent;}
return false;},flushLock: function() {this.lockLevel = 0;},actionIsDisabled: function(action) {var disabled = false;if (dojo.lang.inArray(this.actionsDisabled, action)) {disabled = true;}
if (this.isTreeNode) {if (!this.tree.allowAddChildToLeaf && action == this.actions.ADDCHILD && !this.isFolder) {disabled = true;}}
return disabled;},actionIsDisabledNow: function(action) {return this.actionIsDisabled(action) || this.isLocked();},setChildren: function(childrenArray) {if (this.isTreeNode && !this.isFolder) {this.setFolder();} else if (this.isTreeNode) {this.state = this.loadStates.LOADED;}
-var hadChildren = this.children.length > 0;if (hadChildren && childrenArray){this.destroyChildren()}
+var hadChildren = this.children.length > 0;if (hadChildren && childrenArray){this.destroyChildren()
+}
if (childrenArray) {this.children = childrenArray;}
var hasChildren = this.children.length > 0;if (this.isTreeNode && hasChildren != hadChildren) {this.viewSetHasChildren();}
for(var i=0; i<this.children.length; i++) {var child = this.children[i];if (!(child instanceof dojo.widget.Widget)) {child = this.children[i] = this.tree.createNode(child);var childWidgetCreated = true;} else {var childWidgetCreated = false;}
if (!child.parent) {child.parent = this;if (this.tree !== child.tree) {child.updateTree(this.tree);}
-child.viewAddLayout();this.containerNode.appendChild(child.domNode);var message = {child: child,index: i,parent: this,childWidgetCreated: childWidgetCreated}
+child.viewAddLayout();this.containerNode.appendChild(child.domNode);var message = {child: child,index: i,parent: this,childWidgetCreated: childWidgetCreated
+}
delete dojo.widget.manager.topWidgets[child.widgetId];dojo.event.topic.publish(this.tree.eventNames.afterAddChild, message);}
-if (this.tree.eagerWidgetInstantiation && child.children.length) {child.setChildren();}}},doAddChild: function(child, index) {return this.addChild(child, index, true);},addChild: function(child, index, dontPublishEvent) {if (dojo.lang.isUndefined(index)) {index = this.children.length;}
+if (this.tree.eagerWidgetInstantiation && child.children.length) {child.setChildren();}}
+},doAddChild: function(child, index) {return this.addChild(child, index, true);},addChild: function(child, index, dontPublishEvent) {if (dojo.lang.isUndefined(index)) {index = this.children.length;}
if (!child.isTreeNode){dojo.raise("You can only add TreeNode widgets to a "+this.widgetType+" widget!");return;}
this.children.splice(index, 0, child);child.parent = this;child.addedTo(this, index, dontPublishEvent);delete dojo.widget.manager.topWidgets[child.widgetId];},onShow: function() {this.animationInProgress=false;},onHide: function() {this.animationInProgress=false;}});
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/ValidationTextbox.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/ValidationTextbox.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/ValidationTextbox.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/ValidationTextbox.js Thu Dec 14 07:45:13 2006
@@ -5,5 +5,6 @@
this.highlight();},updateClass: function(className){var pre = this.classPrefix;dojo.html.removeClass(this.textbox,pre+"Empty");dojo.html.removeClass(this.textbox,pre+"Valid");dojo.html.removeClass(this.textbox,pre+"Invalid");dojo.html.addClass(this.textbox,pre+className);},highlight: function() {if (this.isEmpty()) {this.updateClass("Empty");}else if (this.isValid() && this.isInRange() ){this.updateClass("Valid");}else if(this.textbox.value != this.promptMessage){this.updateClass("Invalid");}else{this.updateClass("Empty");}},onfocus: function(evt) {if ( !this.listenOnKeyPress) {this.updateClass("Empty");}},onblur: function(evt) {this.filter();this.update();},onkeyup: function(evt){if(this.listenOnKeyPress){this.update();}else if (this.textbox.value != this.lastCheckedValue){this.updateClass("Empty");}},postMixInProperties: function(localProperties, frag) {dojo.widget.ValidationTextbox.superclass.postMixInProperties.apply(this, arguments);this.messages = dojo.i18n.getLocaliza
tion("dojo.widget", "validate", this.lang);dojo.lang.forEach(["invalidMessage", "missingMessage", "rangeMessage"], function(prop) {if(this[prop]){ this.messages[prop] = this[prop]; }}, this);},fillInTemplate: function() {dojo.widget.ValidationTextbox.superclass.fillInTemplate.apply(this, arguments);this.textbox.isValid = function() { this.isValid.call(this); };this.textbox.isMissing = function() { this.isMissing.call(this); };this.textbox.isInRange = function() { this.isInRange.call(this); };dojo.html.setClass(this.invalidSpan,this.invalidClass);this.update();this.filter();if(dojo.render.html.ie){ dojo.html.addClass(this.domNode, "ie"); }
if(dojo.render.html.moz){ dojo.html.addClass(this.domNode, "moz"); }
if(dojo.render.html.opera){ dojo.html.addClass(this.domNode, "opera"); }
-if(dojo.render.html.safari){ dojo.html.addClass(this.domNode, "safari"); }}}
+if(dojo.render.html.safari){ dojo.html.addClass(this.domNode, "safari"); }}
+}
);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Widget.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Widget.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Widget.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Widget.js Thu Dec 14 07:45:13 2006
@@ -1,5 +1,6 @@
-dojo.provide("dojo.widget.Widget");dojo.require("dojo.lang.func");dojo.require("dojo.lang.array");dojo.require("dojo.lang.extras");dojo.require("dojo.lang.declare");dojo.require("dojo.ns");dojo.require("dojo.widget.Manager");dojo.require("dojo.event.*");dojo.require("dojo.a11y");dojo.declare("dojo.widget.Widget", null,function(){this.children = [];this.extraArgs = {};},{parent: null,isTopLevel: false,disabled: false,isContainer: false,widgetId: "",widgetType: "Widget",ns: "dojo",getNamespacedType: function(){return (this.ns ? this.ns + ":" + this.widgetType : this.widgetType).toLowerCase();},toString: function(){return '[Widget ' + this.getNamespacedType() + ', ' + (this.widgetId || 'NO ID') + ']';},repr: function(){return this.toString();},enable: function(){this.disabled = false;},disable: function(){this.disabled = true;},onResized: function(){this.notifyChildrenOfResize();},notifyChildrenOfResize: function(){for(var i=0; i<this.children.length; i++){var child = this.chi
ldren[i];if( child.onResized ){child.onResized();}}},create: function(args, fragment, parent, ns){if(ns){this.ns = ns;}
+dojo.provide("dojo.widget.Widget");dojo.require("dojo.lang.func");dojo.require("dojo.lang.array");dojo.require("dojo.lang.extras");dojo.require("dojo.lang.declare");dojo.require("dojo.ns");dojo.require("dojo.widget.Manager");dojo.require("dojo.event.*");dojo.require("dojo.a11y");dojo.declare("dojo.widget.Widget", null,function(){this.children = [];this.extraArgs = {};},{parent: null,isTopLevel: false,disabled: false,isContainer: false,widgetId: "",widgetType: "Widget",ns: "dojo",getNamespacedType: function(){return (this.ns ? this.ns + ":" + this.widgetType : this.widgetType).toLowerCase();},toString: function(){return '[Widget ' + this.getNamespacedType() + ', ' + (this.widgetId || 'NO ID') + ']';},repr: function(){return this.toString();},enable: function(){this.disabled = false;},disable: function(){this.disabled = true;},onResized: function(){this.notifyChildrenOfResize();},notifyChildrenOfResize: function(){for(var i=0; i<this.children.length; i++){var child = this.chi
ldren[i];if( child.onResized ){child.onResized();}}
+},create: function(args, fragment, parent, ns){if(ns){this.ns = ns;}
this.satisfyPropertySets(args, fragment, parent);this.mixInProperties(args, fragment, parent);this.postMixInProperties(args, fragment, parent);dojo.widget.manager.add(this);this.buildRendering(args, fragment, parent);this.initialize(args, fragment, parent);this.postInitialize(args, fragment, parent);this.postCreate(args, fragment, parent);return this;},destroy: function(finalize){if(this.parent){this.parent.removeChild(this);}
this.destroyChildren();this.uninitialize();this.destroyRendering(finalize);dojo.widget.manager.removeById(this.widgetId);},destroyChildren: function(){var widget;var i=0;while(this.children.length > i){widget = this.children[i];if (widget instanceof dojo.widget.Widget) {this.removeChild(widget);widget.destroy();continue;}
i++;}},getChildrenOfType: function(type, recurse){var ret = [];var isFunc = dojo.lang.isFunction(type);if(!isFunc){type = type.toLowerCase();}
@@ -12,12 +13,16 @@
dojo.widget.lcArgsCache[this.widgetType] = lcArgs;}
var visited = {};for(var x in args){if(!this[x]){var y = lcArgs[(new String(x)).toLowerCase()];if(y){args[y] = args[x];x = y;}}
if(visited[x]){ continue; }
-visited[x] = true;if((typeof this[x]) != (typeof undef)){if(typeof args[x] != "string"){this[x] = args[x];}else{if(dojo.lang.isString(this[x])){this[x] = args[x];}else if(dojo.lang.isNumber(this[x])){this[x] = new Number(args[x]);}else if(dojo.lang.isBoolean(this[x])){this[x] = (args[x].toLowerCase()=="false") ? false : true;}else if(dojo.lang.isFunction(this[x])){if(args[x].search(/[^\w\.]+/i) == -1){this[x] = dojo.evalObjPath(args[x], false);}else{var tn = dojo.lang.nameAnonFunc(new Function(args[x]), this);dojo.event.kwConnect({srcObj: this,srcFunc: x,adviceObj: this,adviceFunc: tn});}}else if(dojo.lang.isArray(this[x])){this[x] = args[x].split(";");} else if (this[x] instanceof Date) {this[x] = new Date(Number(args[x]));}else if(typeof this[x] == "object"){if (this[x] instanceof dojo.uri.Uri){this[x] = dojo.uri.dojoUri(args[x]);}else{var pairs = args[x].split(";");for(var y=0; y<pairs.length; y++){var si = pairs[y].indexOf(":");if((si != -1)&&(pairs[y].length>si)){this[x
][pairs[y].substr(0, si).replace(/^\s+|\s+$/g, "")] = pairs[y].substr(si+1);}}}}else{this[x] = args[x];}}}else{this.extraArgs[x.toLowerCase()] = args[x];}}},postMixInProperties: function(args, frag, parent){},initialize: function(args, frag, parent){return false;},postInitialize: function(args, frag, parent){return false;},postCreate: function(args, frag, parent){return false;},uninitialize: function(){return false;},buildRendering: function(args, frag, parent){dojo.unimplemented("dojo.widget.Widget.buildRendering, on "+this.toString()+", ");return false;},destroyRendering: function(){dojo.unimplemented("dojo.widget.Widget.destroyRendering");return false;},addedTo: function(parent){},addChild: function(child){dojo.unimplemented("dojo.widget.Widget.addChild");return false;},removeChild: function(widget){for(var x=0; x<this.children.length; x++){if(this.children[x] === widget){this.children.splice(x, 1);widget.parent=null;break;}}
+visited[x] = true;if((typeof this[x]) != (typeof undef)){if(typeof args[x] != "string"){this[x] = args[x];}else{if(dojo.lang.isString(this[x])){this[x] = args[x];}else if(dojo.lang.isNumber(this[x])){this[x] = new Number(args[x]);}else if(dojo.lang.isBoolean(this[x])){this[x] = (args[x].toLowerCase()=="false") ? false : true;}else if(dojo.lang.isFunction(this[x])){if(args[x].search(/[^\w\.]+/i) == -1){this[x] = dojo.evalObjPath(args[x], false);}else{var tn = dojo.lang.nameAnonFunc(new Function(args[x]), this);dojo.event.kwConnect({srcObj: this,srcFunc: x,adviceObj: this,adviceFunc: tn
+});}}else if(dojo.lang.isArray(this[x])){this[x] = args[x].split(";");} else if (this[x] instanceof Date) {this[x] = new Date(Number(args[x]));}else if(typeof this[x] == "object"){if (this[x] instanceof dojo.uri.Uri){this[x] = dojo.uri.dojoUri(args[x]);}else{var pairs = args[x].split(";");for(var y=0; y<pairs.length; y++){var si = pairs[y].indexOf(":");if((si != -1)&&(pairs[y].length>si)){this[x][pairs[y].substr(0, si).replace(/^\s+|\s+$/g, "")] = pairs[y].substr(si+1);}}
+}}else{this[x] = args[x];}}
+}else{this.extraArgs[x.toLowerCase()] = args[x];}}
+},postMixInProperties: function(args, frag, parent){},initialize: function(args, frag, parent){return false;},postInitialize: function(args, frag, parent){return false;},postCreate: function(args, frag, parent){return false;},uninitialize: function(){return false;},buildRendering: function(args, frag, parent){dojo.unimplemented("dojo.widget.Widget.buildRendering, on "+this.toString()+", ");return false;},destroyRendering: function(){dojo.unimplemented("dojo.widget.Widget.destroyRendering");return false;},addedTo: function(parent){},addChild: function(child){dojo.unimplemented("dojo.widget.Widget.addChild");return false;},removeChild: function(widget){for(var x=0; x<this.children.length; x++){if(this.children[x] === widget){this.children.splice(x, 1);widget.parent=null;break;}}
return widget;},getPreviousSibling: function(){var idx = this.getParentIndex();if (idx<=0) return null;return this.parent.children[idx-1];},getSiblings: function(){return this.parent.children;},getParentIndex: function(){return dojo.lang.indexOf(this.parent.children, this, true);},getNextSibling: function(){var idx = this.getParentIndex();if (idx == this.parent.children.length-1){return null;}
if (idx < 0){return null;}
return this.parent.children[idx+1];}});dojo.widget.lcArgsCache = {};dojo.widget.tags = {};dojo.widget.tags["dojo:propertyset"] = function(fragment, widgetParser, parentComp){var properties = widgetParser.parseProperties(fragment["dojo:propertyset"]);}
dojo.widget.tags["dojo:connect"] = function(fragment, widgetParser, parentComp){var properties = widgetParser.parseProperties(fragment["dojo:connect"]);}
-dojo.widget.buildWidgetFromParseTree = function( type,frag,parser,parentComp,insertionIndex,localProps){dojo.a11y.setAccessibleMode();var stype = type.split(":");stype = (stype.length == 2) ? stype[1] : type;var localProperties = localProps || parser.parseProperties(frag[frag["ns"]+":"+stype]);var twidget = dojo.widget.manager.getImplementation(stype,null,null,frag["ns"]);if(!twidget){throw new Error('cannot find "' + type + '" widget');}else if (!twidget.create){throw new Error('"' + type + '" widget object has no "create" method and does not appear to implement *Widget');}
+dojo.widget.buildWidgetFromParseTree = function(type,frag,parser,parentComp,insertionIndex,localProps){dojo.a11y.setAccessibleMode();var stype = type.split(":");stype = (stype.length == 2) ? stype[1] : type;var localProperties = localProps || parser.parseProperties(frag[frag["ns"]+":"+stype]);var twidget = dojo.widget.manager.getImplementation(stype,null,null,frag["ns"]);if(!twidget){throw new Error('cannot find "' + type + '" widget');}else if (!twidget.create){throw new Error('"' + type + '" widget object has no "create" method and does not appear to implement *Widget');}
localProperties["dojoinsertionindex"] = insertionIndex;var ret = twidget.create(localProperties, frag, parentComp, frag["ns"]);return ret;}
dojo.widget.defineWidget = function(widgetClass, renderer, superclasses, init, props){if(dojo.lang.isString(arguments[3])){dojo.widget._defineWidget(arguments[0], arguments[3], arguments[1], arguments[4], arguments[2]);}else{var args = [ arguments[0] ], p = 3;if(dojo.lang.isString(arguments[1])){args.push(arguments[1], arguments[2]);}else{args.push('', arguments[1]);p = 2;}
if(dojo.lang.isFunction(arguments[p])){args.push(arguments[p], arguments[p+1]);}else{args.push(null, arguments[p]);}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Wizard.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Wizard.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Wizard.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Wizard.js Thu Dec 14 07:45:13 2006
@@ -14,4 +14,5 @@
"dojo.widget.WizardPane",dojo.widget.ContentPane,{canGoBack: true,passFunction: "",doneFunction: "",postMixInProperties: function(args, frag) {if (this.passFunction) {this.passFunction = dj_global[this.passFunction];}
if (this.doneFunction) {this.doneFunction = dj_global[this.doneFunction];}
dojo.widget.WizardPane.superclass.postMixInProperties.apply(this, arguments);},_checkPass: function() {if (this.passFunction && dojo.lang.isFunction(this.passFunction)) {var failMessage = this.passFunction();if (failMessage) {alert(failMessage);return false;}}
-return true;},done: function() {if (this.doneFunction && dojo.lang.isFunction(this.doneFunction)) {this.doneFunction();}}});
\ No newline at end of file
+return true;},done: function() {if (this.doneFunction && dojo.lang.isFunction(this.doneFunction)) {this.doneFunction();}}
+});
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/YahooMap.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/YahooMap.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/YahooMap.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/YahooMap.js Thu Dec 14 07:45:13 2006
@@ -2,8 +2,10 @@
dojo.provide("dojo.widget.YahooMap");dojo.require("dojo.event.*");dojo.require("dojo.math");dojo.require("dojo.widget.*");dojo.require("dojo.widget.HtmlWidget");(function(){var yappid = djConfig["yAppId"]||djConfig["yahooAppId"]||"dojotoolkit";if(!dojo.hostenv.post_load_){if(yappid == "dojotoolkit"){dojo.debug("please provide a unique Yahoo App ID in djConfig.yahooAppId when using the map widget");}
var tag = "<scr"+"ipt src='http://api.maps.yahoo.com/ajaxymap?v=3.0&appid="+yappid+"'></scri"+"pt>";if(!dj_global["YMap"]){document.write(tag);}}else{dojo.debug("cannot initialize map system after the page has been loaded! Please either manually include the script block provided by Yahoo in your page or require() the YahooMap widget before onload has fired");}})();dojo.widget.defineWidget(
"dojo.widget.YahooMap",dojo.widget.HtmlWidget,function(){this.map=null;this.datasrc="";this.data=[];this.width=0;this.height=0;this.controls=["zoomlong","maptype","pan"];},{isContainer: false,templatePath:null,templateCssPath:null,findCenter:function(aPts){var start=new YGeoPoint(37,-90);if(aPts.length==0) return start;var minLat,maxLat, minLon, maxLon, cLat, cLon;minLat=maxLat=aPts[0].Lat;minLon=maxLon=aPts[0].Lon;for(var i=0; i<aPts.length; i++){minLat=Math.min(minLat,aPts[i].Lat);maxLat=Math.max(maxLat,aPts[i].Lat);minLon=Math.min(minLon,aPts[i].Lon);maxLon=Math.max(maxLon,aPts[i].Lon);}
-cLat=dojo.math.round((minLat+maxLat)/2,6);cLon=dojo.math.round((minLon+maxLon)/2,6);return new YGeoPoint(cLat,cLon);},setControls:function(){var methodmap={maptype:"addTypeControl",pan:"addPanControl",zoomlong:"addZoomLong",zoomshort:"addZoomShort"}
-var c=this.controls;for(var i=0; i<c.length; i++){var controlMethod=methodmap[c[i].toLowerCase()];if(this.map[controlMethod]){this.map[controlMethod]();}}},parse:function(table){this.data=[];var h=table.getElementsByTagName("thead")[0];if(!h){return;}
+cLat=dojo.math.round((minLat+maxLat)/2,6);cLon=dojo.math.round((minLon+maxLon)/2,6);return new YGeoPoint(cLat,cLon);},setControls:function(){var methodmap={maptype:"addTypeControl",pan:"addPanControl",zoomlong:"addZoomLong",zoomshort:"addZoomShort"
+}
+var c=this.controls;for(var i=0; i<c.length; i++){var controlMethod=methodmap[c[i].toLowerCase()];if(this.map[controlMethod]){this.map[controlMethod]();}}
+},parse:function(table){this.data=[];var h=table.getElementsByTagName("thead")[0];if(!h){return;}
var a=[];var cols=h.getElementsByTagName("td");if(cols.length==0){cols=h.getElementsByTagName("th");}
for(var i=0; i<cols.length; i++){var c=cols[i].innerHTML.toLowerCase();if(c=="long") c="lng";a.push(c);}
var b=table.getElementsByTagName("tbody")[0];if(!b){return;}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/__package__.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/__package__.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/__package__.js Thu Dec 14 07:45:13 2006
@@ -1,2 +1,3 @@
-dojo.kwCompoundRequire({common: ["dojo.xml.Parse","dojo.widget.Widget","dojo.widget.Parse","dojo.widget.Manager"],browser: ["dojo.widget.DomWidget","dojo.widget.HtmlWidget"],dashboard: ["dojo.widget.DomWidget","dojo.widget.HtmlWidget"],svg: ["dojo.widget.SvgWidget"],rhino: ["dojo.widget.SwtWidget"]});dojo.provide("dojo.widget.*");
\ No newline at end of file
+dojo.kwCompoundRequire({common: ["dojo.xml.Parse","dojo.widget.Widget","dojo.widget.Parse","dojo.widget.Manager"],browser: ["dojo.widget.DomWidget","dojo.widget.HtmlWidget"],dashboard: ["dojo.widget.DomWidget","dojo.widget.HtmlWidget"],svg: ["dojo.widget.SvgWidget"],rhino: ["dojo.widget.SwtWidget"]
+});dojo.provide("dojo.widget.*");
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/demoEngine/DemoNavigator.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/demoEngine/DemoNavigator.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/demoEngine/DemoNavigator.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/demoEngine/DemoNavigator.js Thu Dec 14 07:45:13 2006
@@ -1,8 +1,11 @@
dojo.provide("dojo.widget.demoEngine.DemoNavigator");dojo.require("dojo.widget.*");dojo.require("dojo.widget.HtmlWidget");dojo.require("dojo.widget.Button");dojo.require("dojo.widget.demoEngine.DemoItem");dojo.require("dojo.io.*");dojo.require("dojo.lfx.*");dojo.require("dojo.lang.common");dojo.require("dojo.i18n.common");dojo.requireLocalization("dojo.widget", "DemoEngine", null, "ROOT");dojo.widget.defineWidget("my.widget.demoEngine.DemoNavigator",dojo.widget.HtmlWidget,{templatePath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoNavigator.html"),templateCssPath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoNavigator.css"),postMixInProperties: function(){dojo.widget.HtmlWidget.superclass.postMixInProperties.apply(this, arguments);this.messages = dojo.i18n.getLocalization("dojo.widget", "DemoEngine", this.lang);},postCreate: function() {dojo.html.addClass(this.domNode,this.domNodeClass);dojo.html.addClass(this.demoListWrapperNode,this.demoListWrapperClass);
dojo.html.addClass(this.demoListContainerNode,this.demoListContainerClass);if (dojo.render.html.ie) {dojo.debug("render ie");dojo.html.hide(this.demoListWrapperNode);} else {dojo.debug("render non-ie");dojo.lfx.html.fadeHide(this.demoListWrapperNode, 0).play();}
this.getRegistry(this.demoRegistryUrl);this.demoContainer = dojo.widget.createWidget("DemoContainer",{returnImage: this.returnImage},this.demoNode);dojo.event.connect(this.demoContainer,"returnToDemos", this, "returnToDemos");this.demoContainer.hide();},returnToDemos: function() {this.demoContainer.hide();if (dojo.render.html.ie) {dojo.debug("render ie");dojo.html.show(this.navigationContainer) ;} else {dojo.debug("render non-ie");dojo.lfx.html.fadeShow(this.navigationContainer,250).play();}
-dojo.lang.forEach(this.categoriesChildren, dojo.lang.hitch(this, function(child){child.checkSize();}));dojo.lang.forEach(this.demoListChildren, dojo.lang.hitch(this, function(child){child.checkSize();}));},show: function() {dojo.html.show(this.domNode);dojo.html.setOpacity(this.domNode,1);dojo.html.setOpacity(this.navigationContainer,1);dojo.lang.forEach(this.categoriesChildren, dojo.lang.hitch(this, function(child){child.checkSize();}));dojo.lang.forEach(this.demoListChildren, dojo.lang.hitch(this, function(child){child.checkSize();}));},getRegistry: function(url) {dojo.io.bind({url: url,load: dojo.lang.hitch(this,this.processRegistry),mimetype: "text/json"});},processRegistry: function(type,registry,e) {dojo.debug("Processing Registry");this.registry = registry;dojo.lang.forEach(this.registry.navigation, dojo.lang.hitch(this,this.addCategory));},addCategory: function(category) {var newCat = dojo.widget.createWidget("Button",{caption: category.name});if(!dojo.lang.isObject(
this.registry.categories)) {this.registry.categories=function(){};}
-this.registry.categories[category.name] = category;this.categoriesChildren.push(newCat);this.categoriesButtonsNode.appendChild(newCat.domNode);newCat.domNode.categoryName = category.name;dojo.event.connect(newCat,"onClick", this, "onSelectCategory");},addDemo: function(demoName) {var demo = this.registry.definitions[demoName];if (dojo.render.html.ie) {dojo.html.show(this.demoListWrapperNode)} else {dojo.lfx.html.fadeShow(this.demoListWrapperNode, 250).play();}
+dojo.lang.forEach(this.categoriesChildren, dojo.lang.hitch(this, function(child){child.checkSize();}));dojo.lang.forEach(this.demoListChildren, dojo.lang.hitch(this, function(child){child.checkSize();}));},show: function() {dojo.html.show(this.domNode);dojo.html.setOpacity(this.domNode,1);dojo.html.setOpacity(this.navigationContainer,1);dojo.lang.forEach(this.categoriesChildren, dojo.lang.hitch(this, function(child){child.checkSize();}));dojo.lang.forEach(this.demoListChildren, dojo.lang.hitch(this, function(child){child.checkSize();}));},getRegistry: function(url) {dojo.io.bind({url: url,load: dojo.lang.hitch(this,this.processRegistry),mimetype: "text/json"
+});},processRegistry: function(type,registry,e) {dojo.debug("Processing Registry");this.registry = registry;dojo.lang.forEach(this.registry.navigation, dojo.lang.hitch(this,this.addCategory));},addCategory: function(category) {var newCat = dojo.widget.createWidget("Button",{caption: category.name});if(!dojo.lang.isObject(this.registry.categories)) {this.registry.categories=function(){};}
+this.registry.categories[category.name] = category;this.categoriesChildren.push(newCat);this.categoriesButtonsNode.appendChild(newCat.domNode);newCat.domNode.categoryName = category.name;dojo.event.connect(newCat,"onClick", this, "onSelectCategory");},addDemo: function(demoName) {var demo = this.registry.definitions[demoName];if (dojo.render.html.ie) {dojo.html.show(this.demoListWrapperNode)
+} else {dojo.lfx.html.fadeShow(this.demoListWrapperNode, 250).play();}
var newDemo = dojo.widget.createWidget("DemoItem",{viewDemoImage: this.viewDemoImage, name: demoName, description: demo.description, thumbnail: demo.thumbnail});this.demoListChildren.push(newDemo);this.demoListContainerNode.appendChild(newDemo.domNode);dojo.event.connect(newDemo,"onSelectDemo",this,"onSelectDemo");},onSelectCategory: function(e) {catName = e.currentTarget.categoryName;dojo.debug("Selected Category: " + catName);dojo.lang.forEach(this.demoListChildren, function(child) {child.destroy();});this.demoListChildren=[];dojo.lang.forEach(this.registry.categories[catName].demos, dojo.lang.hitch(this,function(demoName){this.addDemo(demoName);}));},onSelectDemo: function(e) {dojo.debug("Demo Selected: " + e.target.name);if (dojo.render.html.ie) {dojo.debug("render ie");dojo.html.hide(this.navigationContainer) ;this.demoContainer.show();this.demoContainer.showDemo();} else {dojo.debug("render non-ie");dojo.lfx.html.fadeHide(this.navigationContainer,250,null,dojo.lang.hit
ch(this, function() {this.demoContainer.show();this.demoContainer.showDemo();})).play();}
-this.demoContainer.loadDemo(this.registry.definitions[e.target.name].url);this.demoContainer.setName(e.target.name);this.demoContainer.setSummary(this.registry.definitions[e.target.name].description);}},"",function() {this.demoRegistryUrl="demoRegistry.json";this.registry=function(){};this.categoriesNode="";this.categoriesButtonsNode="";this.navigationContainer="";this.domNodeClass="demoNavigator";this.demoNode="";this.demoContainer="";this.demoListWrapperNode="";this.demoListWrapperClass="demoNavigatorListWrapper";this.demoListContainerClass="demoNavigatorListContainer";this.returnImage="images/dojoDemos.gif";this.viewDemoImage="images/viewDemo.png";this.demoListChildren = [];this.categoriesChildren = [];}
+if(this.registry.definitions[e.target.name].url.indexOf("http://")>-1){window.open(this.registry.definitions[e.target.name].url, e.target.name);} else {this.demoContainer.loadDemo(this.registry.definitions[e.target.name].url);this.demoContainer.setName(e.target.name);this.demoContainer.setSummary(this.registry.definitions[e.target.name].description);}}
+},"",function() {this.demoRegistryUrl="demoRegistry.json";this.registry=function(){};this.categoriesNode="";this.categoriesButtonsNode="";this.navigationContainer="";this.domNodeClass="demoNavigator";this.demoNode="";this.demoContainer="";this.demoListWrapperNode="";this.demoListWrapperClass="demoNavigatorListWrapper";this.demoListContainerClass="demoNavigatorListContainer";this.returnImage="images/dojoDemos.gif";this.viewDemoImage="images/viewDemo.png";this.demoListChildren = [];this.categoriesChildren = [];}
);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/demoEngine/SourcePane.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/demoEngine/SourcePane.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/demoEngine/SourcePane.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/demoEngine/SourcePane.js Thu Dec 14 07:45:13 2006
@@ -1,3 +1,4 @@
-dojo.provide("dojo.widget.demoEngine.SourcePane");dojo.require("dojo.widget.*");dojo.require("dojo.widget.HtmlWidget");dojo.require("dojo.io.*");dojo.widget.defineWidget("my.widget.demoEngine.SourcePane",dojo.widget.HtmlWidget,{templatePath: dojo.uri.dojoUri("src/widget/demoEngine/templates/SourcePane.html"),templateCssPath: dojo.uri.dojoUri("src/widget/demoEngine/templates/SourcePane.css"),postCreate: function() {dojo.html.addClass(this.domNode,this.domNodeClass);dojo.debug("PostCreate");},getSource: function() {if (this.href) {dojo.io.bind({url: this.href,load: dojo.lang.hitch(this, "fillInSource"),mimetype: "text/plain"});}},fillInSource: function(type, source, e) {this.sourceNode.value=source;},setHref: function(url) {this.href = url;this.getSource();}},"",function() {dojo.debug("SourcePane Init");this.domNodeClass="sourcePane";this.sourceNode = "";this.href = "";}
+dojo.provide("dojo.widget.demoEngine.SourcePane");dojo.require("dojo.widget.*");dojo.require("dojo.widget.HtmlWidget");dojo.require("dojo.io.*");dojo.widget.defineWidget("my.widget.demoEngine.SourcePane",dojo.widget.HtmlWidget,{templatePath: dojo.uri.dojoUri("src/widget/demoEngine/templates/SourcePane.html"),templateCssPath: dojo.uri.dojoUri("src/widget/demoEngine/templates/SourcePane.css"),postCreate: function() {dojo.html.addClass(this.domNode,this.domNodeClass);dojo.debug("PostCreate");},getSource: function() {if (this.href) {dojo.io.bind({url: this.href,load: dojo.lang.hitch(this, "fillInSource"),mimetype: "text/plain"
+});}},fillInSource: function(type, source, e) {this.sourceNode.value=source;},setHref: function(url) {this.href = url;this.getSource();}},"",function() {dojo.debug("SourcePane Init");this.domNodeClass="sourcePane";this.sourceNode = "";this.href = "";}
);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/demoEngine/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/demoEngine/__package__.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/demoEngine/__package__.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/demoEngine/__package__.js Thu Dec 14 07:45:13 2006
@@ -1,4 +1,5 @@
dojo.kwCompoundRequire({browser: [
"dojo.widget.demoEngine.DemoItem","dojo.widget.demoEngine.DemoNavigator","dojo.widget.demoEngine.DemoPane","dojo.widget.demoEngine.SourcePane","dojo.widget.demoEngine.DemoContainer"
-]});dojo.provide("dojo.widget.demoEngine.*");
\ No newline at end of file
+]
+});dojo.provide("dojo.widget.demoEngine.*");
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/html/layout.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/html/layout.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/html/layout.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/html/layout.js Thu Dec 14 07:45:13 2006
@@ -1,15 +1,18 @@
-dojo.provide("dojo.widget.html.layout");dojo.require("dojo.lang.common");dojo.require("dojo.string.extras");dojo.require("dojo.html.style");dojo.require("dojo.html.layout");dojo.widget.html.layout = function( container, children, layoutPriority) {dojo.html.addClass(container, "dojoLayoutContainer");children = dojo.lang.filter(children, function(child, idx){child.idx = idx;return dojo.lang.inArray(["top","bottom","left","right","client","flood"], child.layoutAlign)});if(layoutPriority && layoutPriority!="none"){var rank = function(child){switch(child.layoutAlign){case "flood":
+dojo.provide("dojo.widget.html.layout");dojo.require("dojo.lang.common");dojo.require("dojo.string.extras");dojo.require("dojo.html.style");dojo.require("dojo.html.layout");dojo.widget.html.layout = function( container, children, layoutPriority) {dojo.html.addClass(container, "dojoLayoutContainer");children = dojo.lang.filter(children, function(child, idx){child.idx = idx;return dojo.lang.inArray(["top","bottom","left","right","client","flood"], child.layoutAlign)
+});if(layoutPriority && layoutPriority!="none"){var rank = function(child){switch(child.layoutAlign){case "flood":
return 1;case "left":
case "right":
return (layoutPriority=="left-right") ? 2 : 3;case "top":
case "bottom":
return (layoutPriority=="left-right") ? 3 : 2;default:
return 4;}};children.sort(function(a,b){return (rank(a)-rank(b)) || (a.idx - b.idx);});}
-var f={top: dojo.html.getPixelValue(container, "padding-top", true),left: dojo.html.getPixelValue(container, "padding-left", true)};dojo.lang.mixin(f, dojo.html.getContentBox(container));dojo.lang.forEach(children, function(child){var elm=child.domNode;var pos=child.layoutAlign;with(elm.style){left = f.left+"px";top = f.top+"px";bottom = "auto";right = "auto";}
+var f={top: dojo.html.getPixelValue(container, "padding-top", true),left: dojo.html.getPixelValue(container, "padding-left", true)
+};dojo.lang.mixin(f, dojo.html.getContentBox(container));dojo.lang.forEach(children, function(child){var elm=child.domNode;var pos=child.layoutAlign;with(elm.style){left = f.left+"px";top = f.top+"px";bottom = "auto";right = "auto";}
dojo.html.addClass(elm, "dojoAlign" + dojo.string.capitalize(pos));if ( (pos=="top")||(pos=="bottom") ) {dojo.html.setMarginBox(elm, { width: f.width });var h = dojo.html.getMarginBox(elm).height;f.height -= h;if(pos=="top"){f.top += h;}else{elm.style.top = f.top + f.height + "px";}
if(child.onResized){child.onResized();}}else if(pos=="left" || pos=="right"){var w = dojo.html.getMarginBox(elm).width;if(child.resizeTo){child.resizeTo(w, f.height);}else{dojo.html.setMarginBox(elm, { width: w, height: f.height });}
-f.width -= w;if(pos=="left"){f.left += w;}else{elm.style.left = f.left + f.width + "px";}} else if(pos=="flood" || pos=="client"){if(child.resizeTo){child.resizeTo(f.width, f.height);}else{dojo.html.setMarginBox(elm, { width: f.width, height: f.height });}}});};dojo.html.insertCssText(
+f.width -= w;if(pos=="left"){f.left += w;}else{elm.style.left = f.left + f.width + "px";}} else if(pos=="flood" || pos=="client"){if(child.resizeTo){child.resizeTo(f.width, f.height);}else{dojo.html.setMarginBox(elm, { width: f.width, height: f.height });}}
+});};dojo.html.insertCssText(
".dojoLayoutContainer{ position: relative; display: block; overflow: hidden; }\n" +
"body .dojoAlignTop, body .dojoAlignBottom, body .dojoAlignLeft, body .dojoAlignRight { position: absolute; overflow: hidden; }\n" +
"body .dojoAlignClient { position: absolute }\n" +
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/html/loader.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/html/loader.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/html/loader.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/html/loader.js Thu Dec 14 07:45:13 2006
@@ -1,6 +1,7 @@
dojo.provide("dojo.widget.html.loader");dojo.require("dojo.widget.HtmlWidget");dojo.require("dojo.io.*");dojo.require("dojo.lang.common");dojo.require("dojo.lang.extras");dojo.require("dojo.experimental");dojo.experimental("dojo.widget.html.loader");dojo.widget.html.loader = new (function(){this.toString = function(){ return "dojo.widget.html.loader"; }
-var _loader = this;dojo.addOnLoad(function(){dojo.experimental(_loader.toString());var undo = dojo.evalObjPath("dojo.undo.browser");if(djConfig["preventBackButtonFix"] && undo && !undo.initialState){undo.setInitialState(new trackerObj);}});var logger = {};var trackerObj = function(id, data){this.id = id;this.data = data};trackerObj.prototype.handle = function(type){if(typeof dojo == 'undefined'){ return; }
+var _loader = this;dojo.addOnLoad(function(){dojo.experimental(_loader.toString());var undo = dojo.evalObjPath("dojo.undo.browser");if(djConfig["preventBackButtonFix"] && undo && !undo.initialState){undo.setInitialState(new trackerObj);}});var logger = {};var trackerObj = function(id, data){this.id = id;this.data = data
+};trackerObj.prototype.handle = function(type){if(typeof dojo == 'undefined'){ return; }
var wg = dojo.widget.byId(this.id);if(wg){ wg.setContent(this.data, true); }};this._log = function(widget, data){if(widget.trackHistory){if(!logger[widget.widgetId]){logger[widget.widgetId] = { childrenIds: [], stack:[data] };}var children = logger[widget.widgetId].childrenIds;while(children && children.length){delete logger[children.pop()];}
for(var child in widget.children){logger[widget.widgetId].childrenIds = child.widgetId;}
dojo.undo.browser.addToHistory(new trackerObj(widget.widgetId, dojo.lang.shallowCopy(data, true)));}}
@@ -9,7 +10,8 @@
if(!e._text){ e._text = e.toString(); }
e.toString = function(){ return this._text; };if(typeof e.returnValue != "boolean"){e.returnValue = true;}
if(typeof e.preventDefault != "function"){e.preventDefault = function(){ this.returnValue = false; };}
-this[handler](e);if(e.returnValue){if(useAlert){alert(e.toString());}else{this.loader.callOnUnLoad.call(this, false);this.onSetContent(e.toString());}}};function downloader(bindArgs) {for(var x in this.bindArgs){bindArgs[x] = (undef(bindArgs[x]) ? this.bindArgs[x] : undefined);}
+this[handler](e);if(e.returnValue){if(useAlert){alert(e.toString());}else{this.loader.callOnUnLoad.call(this, false);this.onSetContent(e.toString());}}
+};function downloader(bindArgs) {for(var x in this.bindArgs){bindArgs[x] = (undef(bindArgs[x]) ? this.bindArgs[x] : undefined);}
var cache = this.cacheContent;if(undef(bindArgs.useCache)){ bindArgs.useCache = cache; }
if(undef(bindArgs.preventCache)){ bindArgs.preventCache = !cache; }
if(undef(bindArgs.mimetype)){ bindArgs.mimetype = "text/html"; }
@@ -26,7 +28,8 @@
path = origPath;}
fix = " " + attr[1] + "=" + attr[2] + path + attr[2];tagFix += tag.substring(0, attr.index) + fix;tag = tag.substring((attr.index + attr[0].length), tag.length);}
str += tagFix + tag;}
-return str+s;};this.htmlContentScripts = function(s, collectScripts){var scripts = [], requires = [], match = [];var attr = "", tmp = null, tag = "", sc = "", str = "";var regex = /<script([^>]*)>([\s\S]*?)<\/script>/i;var regexSrc = /src=(['"]?)([^"']*)\1/i;var regexDojoJs = /.*(\bdojo\b\.js(?:\.uncompressed\.js)?)$/;var regexInvalid = /(?:var )?\bdjConfig\b(?:[\s]*=[\s]*\{[^}]+\}|\.[\w]*[\s]*=[\s]*[^;\n]*)?;?|dojo\.hostenv\.writeIncludes\(\s*\);?/g;var regexRequires = /dojo\.(?:(?:require(?:After)?(?:If)?)|(?:widget\.(?:manager\.)?registerWidgetPackage)|(?:(?:hostenv\.)?registerModulePath)|defineNamespace)\((['"]).*?\1\)\s*;?/;while(match = regex.exec(s)){if(this.executeScripts && match[1]){if(attr = regexSrc.exec(match[1])){if(regexDojoJs.exec(attr[2])){dojo.debug("Security note! inhibit:"+attr[2]+" from beeing loaded again.");}else{scripts.push({path: attr[2]});}}}
+return str+s;};this.htmlContentScripts = function(s, collectScripts){var scripts = [], requires = [], match = [];var attr = "", tmp = null, tag = "", sc = "", str = "";var regex = /<script([^>]*)>([\s\S]*?)<\/script>/i;var regexSrc = /src=(['"]?)([^"']*)\1/i;var regexDojoJs = /.*(\bdojo\b\.js(?:\.uncompressed\.js)?)$/;var regexInvalid = /(?:var )?\bdjConfig\b(?:[\s]*=[\s]*\{[^}]+\}|\.[\w]*[\s]*=[\s]*[^;\n]*)?;?|dojo\.hostenv\.writeIncludes\(\s*\);?/g;var regexRequires = /dojo\.(?:(?:require(?:After)?(?:If)?)|(?:widget\.(?:manager\.)?registerWidgetPackage)|(?:(?:hostenv\.)?registerModulePath)|defineNamespace)\((['"]).*?\1\)\s*;?/;while(match = regex.exec(s)){if(this.executeScripts && match[1]){if(attr = regexSrc.exec(match[1])){if(regexDojoJs.exec(attr[2])){dojo.debug("Security note! inhibit:"+attr[2]+" from beeing loaded again.");}else{scripts.push({path: attr[2]});}}
+}
if(match[2]){sc = match[2].replace(regexInvalid, "");if(!sc){ continue; }
while(tmp = regexRequires.exec(sc)){requires.push(tmp[0]);sc = sc.substring(0, tmp.index) + sc.substr(tmp.index + tmp[0].length);}
if(collectScripts){scripts.push(sc);}}
@@ -34,7 +37,7 @@
if(collectScripts){var regex = /(<[a-zA-Z][a-zA-Z0-9]*\s[^>]*\S=(['"])[^>]*[^\.\]])scriptScope([^>]*>)/;str = "";while(tag = regex.exec(s)){tmp = ((tag[2]=="'") ? '"': "'");str += s.substring(0, tag.index);s = s.substr(tag.index).replace(regex, "$1dojo.widget.byId("+ tmp + this.widgetId + tmp + ").scriptScope$3");}
s = str + s;}
return {'s': s, 'requires': requires, 'scripts': scripts};};this.splitAndFixPaths = function(args){if(!args.url) { args.url = "./"; }
-url = new dojo.uri.Uri(location, args.url).toString();var ret = {'xml': "",'styles': [],'titles': [],'requires': [],'scripts': [],'url': url };if(args.content){var tmp = null, content = args.content;if(args.adjustPaths){content = _loader.htmlContentAdjustPaths.call(this, content, url);}
+url = new dojo.uri.Uri(location, args.url).toString();var ret = {'xml': "",'styles':[],'titles':[],'requires':[],'scripts':[],'url':url };if(args.content){var tmp = null, content = args.content;if(args.adjustPaths){content = _loader.htmlContentAdjustPaths.call(this, content, url);}
tmp = _loader.htmlContentBasicFix.call(this, content, url);content = tmp.s;ret.styles = tmp.styles;ret.titles = tmp.titles;if(args.collectRequires || args.collectScripts){tmp = _loader.htmlContentScripts.call(this, content, args.collectScripts);content = tmp.s;ret.requires = tmp.requires;ret.scripts = tmp.scripts;}
var match = [];if(args.bodyExtract){match = content.match(/<body[^>]*>\s*([\s\S]+)\s*<\/body>/im);if(match) { content = match[1]; }}
ret.xml = content;}
@@ -43,17 +46,23 @@
if(!widget || !(widget instanceof dojo.widget.HtmlWidget)){dojo.raise(this.toString()+" Widget isn't defined or isn't a HtmlWidget instance");}
if(widget.loader && widget.setUrl){ return; }
var widgetProto = (args.mixin) ? widget : widget.constructor.prototype;widget.loader = {isLoaded: false,styleNodes: [],addOnLoads: [],addOnUnLoads: [],callOnUnLoad:(function(canCall){return function(after){ this.abort();if(canCall){ this.onUnLoad(); }
-canCall = after;};})(false),bindObj: null,unHook: (function(w, wg){var oldProps = {isContainer: w.isContainer,adjustPats: w.adjustPaths,href: w.href,extractContent: w.extractContent,parseContent: w.parseContent,cacheContent: w.cacheContent,bindArgs: w.bindArgs,preload: w.preload,refreshOnShow: w.refreshOnShow,handler: w.handler,trackHistory: w.trackHistory,executeScripts: w.executeScripts,scriptScope: w.scriptScope,postCreate: w.postCreate,show: w.show,refresh: w.refresh,loadContents: w.loadContents,abort: w.abort,destroy: w.destroy,onLoad: w.onLoad,onUnLoad: w.onUnLoad,addOnLoad: w.addOnLoad,addOnUnLoad: w.addOnUnLoad,onDownloadStart: w.onDownloadStart,onDownloadEnd: w.onDownloadEnd,onDownloadError: w.onDownloadError,onContentError: w.onContentError,onExecError: w.onExecError,onSetContent: w.onSetContent,setUrl: w.setUrl,setContent: w.setContent,onContentParse: w.onContentParse,onExecScript: w.onExecScript,setHandler: w.setHandler};return function(){if(wg.abort){ wg.abort()
; }
+canCall = after;};})(false),bindObj: null,unHook: (function(w, wg){var oldProps = {isContainer: w.isContainer,adjustPats: w.adjustPaths,href: w.href,extractContent: w.extractContent,parseContent: w.parseContent,cacheContent: w.cacheContent,bindArgs: w.bindArgs,preload: w.preload,refreshOnShow: w.refreshOnShow,handler: w.handler,trackHistory: w.trackHistory,executeScripts: w.executeScripts,scriptScope: w.scriptScope,postCreate: w.postCreate,show: w.show,refresh: w.refresh,loadContents: w.loadContents,abort: w.abort,destroy: w.destroy,onLoad: w.onLoad,onUnLoad: w.onUnLoad,addOnLoad: w.addOnLoad,addOnUnLoad: w.addOnUnLoad,onDownloadStart: w.onDownloadStart,onDownloadEnd: w.onDownloadEnd,onDownloadError: w.onDownloadError,onContentError: w.onContentError,onExecError: w.onExecError,onSetContent: w.onSetContent,setUrl: w.setUrl,setContent: w.setContent,onContentParse: w.onContentParse,onExecScript: w.onExecScript,setHandler: w.setHandler
+};return function(){if(wg.abort){ wg.abort(); }
if((w != wg) && (dojo.widget.byType(wg.widgetType).length>1)){ return; }
for(var x in oldProps){if(oldProps[x]===undefined){delete w[x]; continue;}
w[x] = oldProps[x];}
-delete wg._loader_defined;delete wg.loader;};})(widgetProto, widget)};if(widgetProto._loader_defined || widget._loader_defined){ return; }
-dojo.mixin(widgetProto, {isContainer: true,adjustPaths: undef(widgetProto.adjustPaths) ? true : widgetProto.adjustPaths,href: undef(widgetProto.href) ? "" : widgetProto.href,extractContent: undef(widgetProto.extractContent) ? true : widgetProto.extractContent,parseContent: undef(widgetProto.parseContent) ? true : widgetProto.parseContent,cacheContent: undef(widgetProto.cacheContent) ? true : widgetProto.cacheContent,bindArgs: undef(widgetProto.bindArgs) ? {} : widgetProto.bindArgs,preload: undef(widgetProto.preload) ? false : widgetProto.preload,refreshOnShow: undef(widgetProto.refreshOnShow) ? false : widgetProto.refreshOnShow,handler: undef(widgetProto.handler) ? "" : widgetProto.handler,executeScripts: undef(widgetProto.executeScripts) ? false : widgetProto.executeScripts,trackHistory: undef(widgetProto.tracHistory) ? false : widgetProto.trackHistory,scriptScope: null});widgetProto.postCreate = (function(postCreate){return function(){if(widgetProto.constructor.
superclass.postCreate != postCreate){postCreate.apply(this, arguments);}else{widgetProto.constructor.superclass.postCreate.apply(this, arguments);}
+delete wg._loader_defined;delete wg.loader;};})(widgetProto, widget)
+};if(widgetProto._loader_defined || widget._loader_defined){ return; }
+dojo.mixin(widgetProto, {isContainer: true,adjustPaths: undef(widgetProto.adjustPaths) ? true : widgetProto.adjustPaths,href: undef(widgetProto.href) ? "" : widgetProto.href,extractContent: undef(widgetProto.extractContent) ? true : widgetProto.extractContent,parseContent: undef(widgetProto.parseContent) ? true : widgetProto.parseContent,cacheContent: undef(widgetProto.cacheContent) ? true : widgetProto.cacheContent,bindArgs:undef(widgetProto.bindArgs) ? {} : widgetProto.bindArgs,preload: undef(widgetProto.preload) ? false : widgetProto.preload,refreshOnShow:undef(widgetProto.refreshOnShow) ? false : widgetProto.refreshOnShow,handler: undef(widgetProto.handler) ? "" : widgetProto.handler,executeScripts: undef(widgetProto.executeScripts) ? false : widgetProto.executeScripts,trackHistory:undef(widgetProto.tracHistory) ? false : widgetProto.trackHistory,scriptScope: null
+});widgetProto.postCreate = (function(postCreate){return function(){if(widgetProto.constructor.superclass.postCreate != postCreate){postCreate.apply(this, arguments);}else{widgetProto.constructor.superclass.postCreate.apply(this, arguments);}
if(this.handler!==""){ this.setHandler(this.handler); }
-if(this.isShowing() || this.preload){this.loadContents();if(!this.href){_loader._log(this,(this.domNode||this.containerNode).innerHTML);}}}})(widgetProto.postCreate);widgetProto.show = (function(show){return function(){if(this.refreshOnShow){this.refresh();}else{this.loadContents();}
-if((widgetProto.constructor.superclass.show == show) || !isFunc(show)){widgetProto.constructor.superclass.show.apply(this, arguments);}else{show.apply(this, arguments);}};})(widgetProto.show);widgetProto.destroy = (function(destroy){return function(destroy){this.onUnLoad();this.abort();this.loader.unHook();if((widgetProto.constructor.superclass.destroy != destroy) && isFunc(destroy)){destroy.apply(this, arguments);}else{widgetProto.constructor.superclass.destroy.apply(this, arguments);}}})(widgetProto.destroy);if(!widgetProto.refresh){widgetProto.refresh = function(){this.loader.isLoaded = false;this.loadContents();};}
+if(this.isShowing() || this.preload){this.loadContents();if(!this.href){_loader._log(this,(this.domNode||this.containerNode).innerHTML);}}
+}})(widgetProto.postCreate);widgetProto.show = (function(show){return function(){if(this.refreshOnShow){this.refresh();}else{this.loadContents();}
+if((widgetProto.constructor.superclass.show == show) || !isFunc(show)){widgetProto.constructor.superclass.show.apply(this, arguments);}else{show.apply(this, arguments);}};})(widgetProto.show);widgetProto.destroy = (function(destroy){return function(destroy){this.onUnLoad();this.abort();this.loader.unHook();if((widgetProto.constructor.superclass.destroy != destroy) && isFunc(destroy)){destroy.apply(this, arguments);}else{widgetProto.constructor.superclass.destroy.apply(this, arguments);}}
+})(widgetProto.destroy);if(!widgetProto.refresh){widgetProto.refresh = function(){this.loader.isLoaded = false;this.loadContents();};}
if(!widgetProto.loadContents){widgetProto.loadContents = function(){if(this.loader.isLoaded){ return; }
-if(isFunc(this.handler)){runHandler.call(this);}else if(this.href !== ""){handleDefaults.call(this, "Loading...", "onDownloadStart");var self = this, url = this.href;downloader.call(this, {url: url,load: function(type, data, xhr){self.onDownloadEnd.call(self, url, data);},error: function(type, err, xhr){var e = {responseText: xhr.responseText,status: xhr.status,statusText: xhr.statusText,responseHeaders: (xhr.getAllResponseHeaders) ? xhr.getAllResponseHeaders():[],_text: "Error loading '" + url + "' (" + xhr.status + " "+ xhr.statusText + ")"};handleDefaults.call(self, e, "onDownloadError");self.onLoad();}});}};}
+if(isFunc(this.handler)){runHandler.call(this);}else if(this.href !== ""){handleDefaults.call(this, "Loading...", "onDownloadStart");var self = this, url = this.href;downloader.call(this, {url: url,load: function(type, data, xhr){self.onDownloadEnd.call(self, url, data);},error: function(type, err, xhr){var e = {responseText: xhr.responseText,status: xhr.status,statusText: xhr.statusText,responseHeaders: (xhr.getAllResponseHeaders) ? xhr.getAllResponseHeaders():[],_text: "Error loading '" + url + "' (" + xhr.status + " "+ xhr.statusText + ")"
+};handleDefaults.call(self, e, "onDownloadError");self.onLoad();}});}};}
if(!widgetProto.abort){widgetProto.abort = function(){if(!this.loader || !this.loader.bindObj || !this.loader.bindObj.abort){ return; }
this.loader.bindObj.abort();this.loader.bindObj = null;};}
if(!widgetProto.onLoad){widgetProto.onLoad = function(){stackRunner.call(this, this.loader.addOnLoads);this.loader.isLoaded = true;};}
@@ -68,14 +77,18 @@
if(!widgetProto.onSetContent){widgetProto.onSetContent = function(cont){this.destroyChildren();var styleNodes = this.loader.styleNodes;while(styleNodes.length){var st = styleNodes.pop();if(st && st.parentNode){st.parentNode.removeChild(st);}}
var node = this.containerNode || this.domNode;while(node.firstChild){try{dojo.event.browser.clean(node.firstChild);}catch(e){}
node.removeChild(node.firstChild);}
-try{if(typeof cont != "string"){node.appendChild(cont);}else{try{node.innerHTML = cont;}catch(e){var tmp;(tmp = dojo.doc().createElement("div")).innerHTML = cont;while(tmp.firstChild){node.appendChild(tmp.removeChild(tmp.firstChild));}}}}catch(e){e._text = "Could'nt load content: "+e;var useAlert = (this.loader._onSetContent_err == e._text);this.loader._onSetContent_err = e._text;handleDefaults.call(this, e, "onContentError", useAlert);}};}
-if(!widgetProto.setUrl){widgetProto.setUrl = function(url){this.href = url;this.loader.isLoaded = false;if ( this.preload || this.isShowing() ){this.loadContents();}}}
+try{if(typeof cont != "string"){node.appendChild(cont);}else{try{node.innerHTML = cont;}catch(e){var tmp;(tmp = dojo.doc().createElement("div")).innerHTML = cont;while(tmp.firstChild){node.appendChild(tmp.removeChild(tmp.firstChild));}}
+}}catch(e){e._text = "Could'nt load content: "+e;var useAlert = (this.loader._onSetContent_err == e._text);this.loader._onSetContent_err = e._text;handleDefaults.call(this, e, "onContentError", useAlert);}};}
+if(!widgetProto.setUrl){widgetProto.setUrl = function(url){this.href = url;this.loader.isLoaded = false;if ( this.preload || this.isShowing() ){this.loadContents();}}
+}
if(!widgetProto.setContent){widgetProto.setContent = function(data, dontLog){this.loader.callOnUnLoad.call(this, true);if(!data||dojo.html.isNode(data)){this.onSetContent(data);refreshed.call(this);}else{if(typeof data.xml != 'string'){this.href = "";var args = {content: data,url: this.href,adjustPaths: this.adjustPaths,collectScripts: this.executeScripts,collectRequires: this.parseContent,bodyExtract: this.extractContent };data = _loader.splitAndFixPaths.call(this, args);}else if(data.url!="./"){this.url = data.url;}
this.onSetContent(data.xml);for(var i = 0, styles = data.styles; i < styles.length; i++){if(styles[i].path){this.loader.styleNodes.push(dojo.html.insertCssFile(styles[i].path));}else{this.loader.styleNodes.push(dojo.html.insertCssText(styles[i]));}}
-if(this.parseContent){for(var i = 0, requires = data.requires; i < requires.length; i++){try{eval(requires[i]);} catch(e){e._text = "dojo.widget.html.loader.hookUp: error in package loading calls, "+(e.description||e);handleDefaults.call(this, e, "onContentError", true);}}}
+if(this.parseContent){for(var i = 0, requires = data.requires; i < requires.length; i++){try{eval(requires[i]);} catch(e){e._text = "dojo.widget.html.loader.hookUp: error in package loading calls, "+(e.description||e);handleDefaults.call(this, e, "onContentError", true);}}
+}
if(dojo.hostenv.isXDomain && data.requires.length){dojo.addOnLoad(function(){asyncParse.call(this, data);if(!dontLog){_loader._log(this, data);}});dontLog = true;}else{asyncParse.call(this, data);}}if(!dontLog){}};}
if(!widgetProto.onContentParse){widgetProto.onContentParse = function(){var node = this.containerNode || this.domNode;var parser = new dojo.xml.Parse();var frag = parser.parseElement(node, null, true);dojo.widget.getParser().createSubComponents(frag, this);};}
-if(!widgetProto.onExecScript){widgetProto.onExecScript = function(scripts){var self = this, tmp = "", code = "";for(var i = 0; i < scripts.length; i++){if(scripts[i].path){var url = scripts[i].path;downloader.call(this,{'url': url,'load': function(type, scriptStr){(function(){tmp = scriptStr; scripts[i] = scriptStr;}).call(self);},'error': function(type, error){error._text = type + " downloading remote script";handleDefaults.call(self, error, "onExecError", true);},'mimetype': "text/plain",'sync': true});code += tmp;}else{code += scripts[i];}}
+if(!widgetProto.onExecScript){widgetProto.onExecScript = function(scripts){var self = this, tmp = "", code = "";for(var i = 0; i < scripts.length; i++){if(scripts[i].path){var url = scripts[i].path;downloader.call(this,{'url': url,'load': function(type, scriptStr){(function(){tmp = scriptStr; scripts[i] = scriptStr;}).call(self);},'error': function(type, error){error._text = type + " downloading remote script";handleDefaults.call(self, error, "onExecError", true);},'mimetype': "text/plain",'sync': true
+});code += tmp;}else{code += scripts[i];}}
try{delete this.scriptScope;this.scriptScope = new (new Function('_container_', code+'; return this;'))(self);}catch(e){e._text = "Error running scripts from content:\n"+(e.description||e.toString());handleDefaults.call(this, e, "onExecError", true);}};}
if(!widgetProto.setHandler){widgetProto.setHandler = function(handler) {var fcn = dojo.lang.isFunction(handler) ? handler : window[handler];if(!isFunc(fcn)) {handleDefaults.call(this, "Unable to set handler, '" + handler + "' not a function.", "onExecError", true);return;}
this.handler = function() {return fcn.apply(this, arguments);};};}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/html/stabile.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/html/stabile.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/html/stabile.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/html/stabile.js Thu Dec 14 07:45:13 2006
@@ -1,5 +1,6 @@
-dojo.provide("dojo.widget.html.stabile");dojo.widget.html.stabile = {_sqQuotables: new RegExp("([\\\\'])", "g"),_depth: 0,_recur: false,depthLimit: 2};dojo.widget.html.stabile.getState = function(id){dojo.widget.html.stabile.setup();return dojo.widget.html.stabile.widgetState[id];}
+dojo.provide("dojo.widget.html.stabile");dojo.widget.html.stabile = {_sqQuotables: new RegExp("([\\\\'])", "g"),_depth: 0,_recur: false,depthLimit: 2
+};dojo.widget.html.stabile.getState = function(id){dojo.widget.html.stabile.setup();return dojo.widget.html.stabile.widgetState[id];}
dojo.widget.html.stabile.setState = function(id, state, isCommit){dojo.widget.html.stabile.setup();dojo.widget.html.stabile.widgetState[id] = state;if(isCommit){dojo.widget.html.stabile.commit(dojo.widget.html.stabile.widgetState);}}
dojo.widget.html.stabile.setup = function(){if(!dojo.widget.html.stabile.widgetState){var text = dojo.widget.html.stabile._getStorage().value;dojo.widget.html.stabile.widgetState = text ? dj_eval("("+text+")") : {};}}
dojo.widget.html.stabile.commit = function(state){dojo.widget.html.stabile._getStorage().value = dojo.widget.html.stabile.description(state);}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/svg/Chart.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/svg/Chart.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/svg/Chart.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/svg/Chart.js Thu Dec 14 07:45:13 2006
@@ -1,6 +1,10 @@
dojo.provide("dojo.widget.svg.Chart");dojo.require("dojo.widget.HtmlWidget");dojo.require("dojo.widget.Chart");dojo.require("dojo.html.layout");dojo.require("dojo.math");dojo.require("dojo.svg");dojo.require("dojo.gfx.color");dojo.require("dojo.json");dojo.widget.defineWidget(
-"dojo.widget.svg.Chart",[dojo.widget.HtmlWidget, dojo.widget.Chart],function(){this.templatePath=null;this.templateCssPath=null;this._isInitialize=false;this.hasData=false;this.vectorNode=null;this.plotArea=null;this.dataGroup=null;this.axisGroup=null;this.properties={height:0,width:0,defaultWidth:600,defaultHeight:400,plotType:null,padding:{top:10,bottom:2,left:60,right:30},axes:{x:{plotAt:0,label:"",unitLabel:"",unitType:Number,nUnitsToShow:10,range:{min:0,max:200}},y:{plotAt:0,label:"",unitLabel:"",unitType:Number,nUnitsToShow:10,range:{min:0,max:200}}}};},{parseProperties:function(node){var bRangeX=false;var bRangeY=false;if (node.getAttribute("width")){this.properties.width=node.getAttribute("width");}
+"dojo.widget.svg.Chart",[dojo.widget.HtmlWidget, dojo.widget.Chart],function(){this.templatePath=null;this.templateCssPath=null;this._isInitialize=false;this.hasData=false;this.vectorNode=null;this.plotArea=null;this.dataGroup=null;this.axisGroup=null;this.properties={height:0,width:0,defaultWidth:600,defaultHeight:400,plotType:null,padding:{top:10,bottom:2,left:60,right:30
+},axes:{x:{plotAt:0,label:"",unitLabel:"",unitType:Number,nUnitsToShow:10,range:{min:0,max:200
+}},y:{plotAt:0,label:"",unitLabel:"",unitType:Number,nUnitsToShow:10,range:{min:0,max:200
+}}
+}};},{parseProperties:function(node){var bRangeX=false;var bRangeY=false;if (node.getAttribute("width")){this.properties.width=node.getAttribute("width");}
if (node.getAttribute("height")){this.properties.height=node.getAttribute("height");}
if (node.getAttribute("plotType")){this.properties.plotType=node.getAttribute("plotType");}
if (node.getAttribute("padding")){if (node.getAttribute("padding").indexOf(",") > -1)
@@ -19,7 +23,8 @@
dojo.svg.g.resume();},postCreate:function(){var table=this.domNode.getElementsByTagName("table")[0];if (table){var ranges=this.parseProperties(table);var bRangeX=false;var bRangeY=false;var axisValues = this.parseData(table);if(!bRangeX){this.properties.axes.x.range={min:axisValues.x.min, max:axisValues.x.max};}
if(!bRangeY){this.properties.axes.y.range={min:axisValues.y.min, max:axisValues.y.max};}
this.setAxesPlot(table);this.domNode.removeChild(table);}
-if(this.series.length>0){this.render();}}}
+if(this.series.length>0){this.render();}}
+}
);dojo.widget.svg.Chart.Plotter=new function(){var self=this;var plotters = {};var types=dojo.widget.Chart.PlotTypes;this.getX=function(value, chart){var v=parseFloat(value);var min=chart.properties.axes.x.range.min;var max=chart.properties.axes.x.range.max;var ofst=0-min;min+=ofst; max+=ofst; v+=ofst;var xmin=chart.properties.padding.left;var xmax=chart.properties.width-chart.properties.padding.right;var x=(v*((xmax-xmin)/max))+xmin;return x;};this.getY=function(value, chart){var v=parseFloat(value);var max=chart.properties.axes.y.range.max;var min=chart.properties.axes.y.range.min;var ofst=0;if(min<0)ofst+=Math.abs(min);min+=ofst; max+=ofst; v+=ofst;var ymin=chart.properties.height-chart.properties.padding.bottom;var ymax=chart.properties.padding.top;var y=(((ymin-ymax)/(max-min))*(max-v))+ymax;return y;};this.addPlotter=function(name, func){plotters[name]=func;};this.plot=function(series, chart){if (series.values.length==0) return;if (series.plotType && plotters[series.pl
otType]){return plotters[series.plotType](series, chart);}
else if (chart.plotType && plotters[chart.plotType]){return plotters[chart.plotType](series, chart);}};plotters["bar"]=function(series, chart){var space=1;var lastW = 0;for (var i=0; i<series.values.length; i++){var x=self.getX(series.values[i].x, chart);var w;if (i==series.values.length-1){w=lastW;} else{w=self.getX(series.values[i+1].x, chart)-x-space;lastW=w;}
x-=(w/2);var yA=self.getY(chart.properties.axes.x.plotAt, chart);var y=self.getY(series.values[i].value, chart);var h=Math.abs(yA-y);if (parseFloat(series.values[i].value)<chart.properties.axes.x.plotAt){var oy=yA;yA=y;y=oy;}