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 [7/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/data...
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/HtmlDragCopy.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/HtmlDragCopy.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/HtmlDragCopy.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/HtmlDragCopy.js Thu Dec 14 07:45:13 2006
@@ -1,7 +1,8 @@
dojo.provide("dojo.dnd.HtmlDragCopy");dojo.require("dojo.dnd.*");dojo.declare("dojo.dnd.HtmlDragCopySource", dojo.dnd.HtmlDragSource,function(node, type, copyOnce){this.copyOnce = copyOnce;this.makeCopy = true;},{onDragStart: function(){var dragObj = new dojo.dnd.HtmlDragCopyObject(this.dragObject, this.type, this);if(this.dragClass) { dragObj.dragClass = this.dragClass; }
if (this.constrainToContainer) {dragObj.constrainTo(this.constrainingContainer || this.domNode.parentNode);}
-return dragObj;},onSelected: function() {for (var i=0; i<this.dragObjects.length; i++) {dojo.dnd.dragManager.selectedSources.push(new dojo.dnd.HtmlDragCopySource(this.dragObjects[i]));}}});dojo.declare("dojo.dnd.HtmlDragCopyObject", dojo.dnd.HtmlDragObject,function(dragObject, type, source){this.copySource = source;},{onDragStart: function(e) {dojo.dnd.HtmlDragCopyObject.superclass.onDragStart.apply(this, arguments);if(this.copySource.makeCopy) {this.sourceNode = this.domNode;this.domNode = this.domNode.cloneNode(true);}},onDragEnd: function(e){switch(e.dragStatus){case "dropFailure":
+return dragObj;},onSelected: function() {for (var i=0; i<this.dragObjects.length; i++) {dojo.dnd.dragManager.selectedSources.push(new dojo.dnd.HtmlDragCopySource(this.dragObjects[i]));}}
+});dojo.declare("dojo.dnd.HtmlDragCopyObject", dojo.dnd.HtmlDragObject,function(dragObject, type, source){this.copySource = source;},{onDragStart: function(e) {dojo.dnd.HtmlDragCopyObject.superclass.onDragStart.apply(this, arguments);if(this.copySource.makeCopy) {this.sourceNode = this.domNode;this.domNode = this.domNode.cloneNode(true);}},onDragEnd: function(e){switch(e.dragStatus){case "dropFailure":
var startCoords = dojo.html.getAbsolutePosition(this.dragClone, true);var endCoords = { left: this.dragStartPosition.x + 1,top: this.dragStartPosition.y + 1};var anim = dojo.lfx.slideTo(this.dragClone, endCoords, 500, dojo.lfx.easeOut);var dragObject = this;dojo.event.connect(anim, "onEnd", function (e) {dojo.lang.setTimeout(function() {dojo.html.removeNode(dragObject.dragClone);dragObject.dragClone = null;if(dragObject.copySource.makeCopy) {dojo.html.removeNode(dragObject.domNode);dragObject.domNode = dragObject.sourceNode;dragObject.sourceNode = null;}},200);});anim.play();dojo.event.topic.publish('dragEnd', { source: this } );return;}
dojo.dnd.HtmlDragCopyObject.superclass.onDragEnd.apply(this, arguments);this.copySource.dragObject = this.domNode;if(this.copySource.copyOnce){this.copySource.makeCopy = false;}
new dojo.dnd.HtmlDragCopySource(this.sourceNode, this.type, this.copySource.copyOnce);this.sourceNode = null;}});
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/HtmlDragManager.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/HtmlDragManager.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/HtmlDragManager.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/HtmlDragManager.js Thu Dec 14 07:45:13 2006
@@ -1,5 +1,7 @@
-dojo.provide("dojo.dnd.HtmlDragManager");dojo.require("dojo.dnd.DragAndDrop");dojo.require("dojo.event.*");dojo.require("dojo.lang.array");dojo.require("dojo.html.common");dojo.require("dojo.html.layout");dojo.declare("dojo.dnd.HtmlDragManager", dojo.dnd.DragManager, {disabled: false,nestedTargets: false,mouseDownTimer: null,dsCounter: 0,dsPrefix: "dojoDragSource",dropTargetDimensions: [],currentDropTarget: null,previousDropTarget: null,_dragTriggered: false,selectedSources: [],dragObjects: [],dragSources: [],currentX: null,currentY: null,lastX: null,lastY: null,mouseDownX: null,mouseDownY: null,threshold: 7,dropAcceptable: false,cancelEvent: function(e){ e.stopPropagation(); e.preventDefault();},registerDragSource: function(ds){if(ds["domNode"]){var dp = this.dsPrefix;var dpIdx = dp+"Idx_"+(this.dsCounter++);ds.dragSourceId = dpIdx;this.dragSources[dpIdx] = ds;ds.domNode.setAttribute(dp, dpIdx);if(dojo.render.html.ie){dojo.event.browser.addListener(ds.domNode, "ondragstart"
, this.cancelEvent);}}},unregisterDragSource: function(ds){if (ds["domNode"]){var dp = this.dsPrefix;var dpIdx = ds.dragSourceId;delete ds.dragSourceId;delete this.dragSources[dpIdx];ds.domNode.setAttribute(dp, null);if(dojo.render.html.ie){dojo.event.browser.removeListener(ds.domNode, "ondragstart", this.cancelEvent);}}},registerDropTarget: function(dt){this.dropTargets.push(dt);},unregisterDropTarget: function(dt){var index = dojo.lang.find(this.dropTargets, dt, true);if (index>=0) {this.dropTargets.splice(index, 1);}},getDragSource: function(e){var tn = e.target;if(tn === dojo.body()){ return; }
+dojo.provide("dojo.dnd.HtmlDragManager");dojo.require("dojo.dnd.DragAndDrop");dojo.require("dojo.event.*");dojo.require("dojo.lang.array");dojo.require("dojo.html.common");dojo.require("dojo.html.layout");dojo.declare("dojo.dnd.HtmlDragManager", dojo.dnd.DragManager, {disabled: false,nestedTargets: false,mouseDownTimer: null,dsCounter: 0,dsPrefix: "dojoDragSource",dropTargetDimensions: [],currentDropTarget: null,previousDropTarget: null,_dragTriggered: false,selectedSources: [],dragObjects: [],dragSources: [],currentX: null,currentY: null,lastX: null,lastY: null,mouseDownX: null,mouseDownY: null,threshold: 7,dropAcceptable: false,cancelEvent: function(e){ e.stopPropagation(); e.preventDefault();},registerDragSource: function(ds){if(ds["domNode"]){var dp = this.dsPrefix;var dpIdx = dp+"Idx_"+(this.dsCounter++);ds.dragSourceId = dpIdx;this.dragSources[dpIdx] = ds;ds.domNode.setAttribute(dp, dpIdx);if(dojo.render.html.ie){dojo.event.browser.addListener(ds.domNode, "ondragstart"
, this.cancelEvent);}}
+},unregisterDragSource: function(ds){if (ds["domNode"]){var dp = this.dsPrefix;var dpIdx = ds.dragSourceId;delete ds.dragSourceId;delete this.dragSources[dpIdx];ds.domNode.setAttribute(dp, null);if(dojo.render.html.ie){dojo.event.browser.removeListener(ds.domNode, "ondragstart", this.cancelEvent);}}
+},registerDropTarget: function(dt){this.dropTargets.push(dt);},unregisterDropTarget: function(dt){var index = dojo.lang.find(this.dropTargets, dt, true);if (index>=0) {this.dropTargets.splice(index, 1);}},getDragSource: function(e){var tn = e.target;if(tn === dojo.body()){ return; }
var ta = dojo.html.getAttribute(tn, this.dsPrefix);while((!ta)&&(tn)){tn = tn.parentNode;if((!tn)||(tn === dojo.body())){ return; }
ta = dojo.html.getAttribute(tn, this.dsPrefix);}
return this.dragSources[ta];},onKeyDown: function(e){},onMouseDown: function(e){if(this.disabled) { return; }
@@ -14,7 +16,8 @@
if(this.currentDropTarget) {e.dragObject = tempDragObj;var ce = this.currentDropTarget.domNode.childNodes;if(ce.length > 0){e.dropTarget = ce[0];while(e.dropTarget == tempDragObj.domNode){e.dropTarget = e.dropTarget.nextSibling;}}else{e.dropTarget = this.currentDropTarget.domNode;}
if(this.dropAcceptable){ret = this.currentDropTarget.onDrop(e);}else{this.currentDropTarget.onDragOut(e);}}
e.dragStatus = this.dropAcceptable && ret ? "dropSuccess" : "dropFailure";dojo.lang.delayThese([
-function() {try{tempDragObj.dragSource.onDragEnd(e)} catch(err) {var ecopy = {};for (var i in e) {if (i=="type") {ecopy.type = "mouseup";continue;}
+function() {try{tempDragObj.dragSource.onDragEnd(e)
+} catch(err) {var ecopy = {};for (var i in e) {if (i=="type") {ecopy.type = "mouseup";continue;}
ecopy[i] = e[i];}
tempDragObj.dragSource.onDragEnd(ecopy);}}
, function() {tempDragObj.onDragEnd(e)}]);}, this);this.selectedSources = [];this.dragObjects = [];this.dragSource = null;if(this.currentDropTarget) {this.currentDropTarget.onDropEnd();}} else {}
@@ -24,7 +27,7 @@
var abs = dojo.html.getAbsolutePosition(tn, true);var bb = dojo.html.getBorderBox(tn);this.dropTargetDimensions.push([
[abs.x, abs.y],[ abs.x+bb.width, abs.y+bb.height ],tempTarget
]);}, this);dojo.profile.end("cacheTargetLocations");},onMouseMove: function(e){if((dojo.render.html.ie)&&(e.button != 1)){this.currentDropTarget = null;this.onMouseUp(e, true);return;}
-if( (this.selectedSources.length)&&
+if((this.selectedSources.length)&&
(!this.dragObjects.length) ){var dx;var dy;if(!this._dragTriggered){this._dragTriggered = (this._dragStartDistance(e.pageX, e.pageY) > this.threshold);if(!this._dragTriggered){ return; }
dx = e.pageX - this.mouseDownX;dy = e.pageY - this.mouseDownY;}
this.dragSource = this.selectedSources[0];dojo.lang.forEach(this.selectedSources, function(tempSource){if(!tempSource){ return; }
@@ -35,8 +38,9 @@
if((!this.nestedTargets)&&(dtp)&&(this.isInsideBox(e, dtp))){if(this.dropAcceptable){this.currentDropTarget.onDragMove(e, this.dragObjects);}}else{var bestBox = this.findBestTarget(e);if(bestBox.target === null){if(this.currentDropTarget){this.currentDropTarget.onDragOut(e);this.previousDropTarget = this.currentDropTarget;this.currentDropTarget = null;}
this.dropAcceptable = false;return;}
if(this.currentDropTarget !== bestBox.target){if(this.currentDropTarget){this.previousDropTarget = this.currentDropTarget;this.currentDropTarget.onDragOut(e);}
-this.currentDropTarget = bestBox.target;e.dragObjects = this.dragObjects;this.dropAcceptable = this.currentDropTarget.onDragOver(e);}else{if(this.dropAcceptable){this.currentDropTarget.onDragMove(e, this.dragObjects);}}}},findBestTarget: function(e) {var _this = this;var bestBox = new Object();bestBox.target = null;bestBox.points = null;dojo.lang.every(this.dropTargetDimensions, function(tmpDA) {if(!_this.isInsideBox(e, tmpDA)){return true;}
-bestBox.target = tmpDA[2];bestBox.points = tmpDA;return Boolean(_this.nestedTargets);});return bestBox;},isInsideBox: function(e, coords){if( (e.pageX > coords[0][0])&&
+this.currentDropTarget = bestBox.target;e.dragObjects = this.dragObjects;this.dropAcceptable = this.currentDropTarget.onDragOver(e);}else{if(this.dropAcceptable){this.currentDropTarget.onDragMove(e, this.dragObjects);}}
+}},findBestTarget: function(e) {var _this = this;var bestBox = new Object();bestBox.target = null;bestBox.points = null;dojo.lang.every(this.dropTargetDimensions, function(tmpDA) {if(!_this.isInsideBox(e, tmpDA)){return true;}
+bestBox.target = tmpDA[2];bestBox.points = tmpDA;return Boolean(_this.nestedTargets);});return bestBox;},isInsideBox: function(e, coords){if((e.pageX > coords[0][0])&&
(e.pageX < coords[1][0])&&
(e.pageY > coords[0][1])&&
(e.pageY < coords[1][1]) ){return true;}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/HtmlDragMove.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/HtmlDragMove.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/HtmlDragMove.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/HtmlDragMove.js Thu Dec 14 07:45:13 2006
@@ -1,6 +1,8 @@
dojo.provide("dojo.dnd.HtmlDragMove");dojo.require("dojo.dnd.*");dojo.declare("dojo.dnd.HtmlDragMoveSource", dojo.dnd.HtmlDragSource, {onDragStart: function(){var dragObj = new dojo.dnd.HtmlDragMoveObject(this.dragObject, this.type);if (this.constrainToContainer) {dragObj.constrainTo(this.constrainingContainer);}
-return dragObj;},onSelected: function() {for (var i=0; i<this.dragObjects.length; i++) {dojo.dnd.dragManager.selectedSources.push(new dojo.dnd.HtmlDragMoveSource(this.dragObjects[i]));}}});dojo.declare("dojo.dnd.HtmlDragMoveObject", dojo.dnd.HtmlDragObject, {onDragStart: function(e){dojo.html.clearSelection();this.dragClone = this.domNode;if(dojo.html.getComputedStyle(this.domNode, 'position') != 'absolute'){this.domNode.style.position = "relative";}
-var left = parseInt(dojo.html.getComputedStyle(this.domNode, 'left'));var top = parseInt(dojo.html.getComputedStyle(this.domNode, 'top'));this.dragStartPosition = {x: isNaN(left) ? 0 : left,y: isNaN(top) ? 0 : top};this.scrollOffset = dojo.html.getScroll().offset;this.dragOffset = {y: this.dragStartPosition.y - e.pageY,x: this.dragStartPosition.x - e.pageX};this.containingBlockPosition = {x:0, y:0};if (this.constrainToContainer) {this.constraints = this.getConstraints();}
+return dragObj;},onSelected: function() {for (var i=0; i<this.dragObjects.length; i++) {dojo.dnd.dragManager.selectedSources.push(new dojo.dnd.HtmlDragMoveSource(this.dragObjects[i]));}}
+});dojo.declare("dojo.dnd.HtmlDragMoveObject", dojo.dnd.HtmlDragObject, {onDragStart: function(e){dojo.html.clearSelection();this.dragClone = this.domNode;if(dojo.html.getComputedStyle(this.domNode, 'position') != 'absolute'){this.domNode.style.position = "relative";}
+var left = parseInt(dojo.html.getComputedStyle(this.domNode, 'left'));var top = parseInt(dojo.html.getComputedStyle(this.domNode, 'top'));this.dragStartPosition = {x: isNaN(left) ? 0 : left,y: isNaN(top) ? 0 : top
+};this.scrollOffset = dojo.html.getScroll().offset;this.dragOffset = {y: this.dragStartPosition.y - e.pageY,x: this.dragStartPosition.x - e.pageX};this.containingBlockPosition = {x:0, y:0};if (this.constrainToContainer) {this.constraints = this.getConstraints();}
dojo.event.connect(this.domNode, "onclick", this, "_squelchOnClick");},onDragEnd: function(e){},setAbsolutePosition: function(x, y){if(!this.disableY) { this.domNode.style.top = y + "px"; }
if(!this.disableX) { this.domNode.style.left = x + "px"; }},_squelchOnClick: function(e){dojo.event.browser.stopEvent(e);dojo.event.disconnect(this.domNode, "onclick", this, "_squelchOnClick");}});
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/TreeDragAndDrop.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/TreeDragAndDrop.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/TreeDragAndDrop.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/TreeDragAndDrop.js Thu Dec 14 07:45:13 2006
@@ -25,12 +25,15 @@
else if (DNDMode & dojo.widget.Tree.prototype.DNDModes.ONTO) {position = "onto";}
return position;},getTargetParentIndex: function(sourceTreeNode, position) {var index = position == "before" ? this.treeNode.getParentIndex() : this.treeNode.getParentIndex()+1;if (this.treeNode.parent === sourceTreeNode.parent
&& this.treeNode.getParentIndex() > sourceTreeNode.getParentIndex()) {index--;}
-return index;},onDrop: function(e){var position = this.position;this.onDragOut(e);var sourceTreeNode = e.dragObject.treeNode;if (!dojo.lang.isObject(sourceTreeNode)) {dojo.raise("TreeNode not found in dragObject")}
-if (position == "onto") {return this.controller.move(sourceTreeNode, this.treeNode, 0);} else {var index = this.getTargetParentIndex(sourceTreeNode, position);return this.controller.move(sourceTreeNode, this.treeNode.parent, index);}}});dojo.dnd.TreeDNDController = function(treeController) {this.treeController = treeController;this.dragSources = {};this.dropTargets = {};}
+return index;},onDrop: function(e){var position = this.position;this.onDragOut(e);var sourceTreeNode = e.dragObject.treeNode;if (!dojo.lang.isObject(sourceTreeNode)) {dojo.raise("TreeNode not found in dragObject")
+}
+if (position == "onto") {return this.controller.move(sourceTreeNode, this.treeNode, 0);} else {var index = this.getTargetParentIndex(sourceTreeNode, position);return this.controller.move(sourceTreeNode, this.treeNode.parent, index);}}
+});dojo.dnd.TreeDNDController = function(treeController) {this.treeController = treeController;this.dragSources = {};this.dropTargets = {};}
dojo.lang.extend(dojo.dnd.TreeDNDController, {listenTree: function(tree) {dojo.event.topic.subscribe(tree.eventNames.createDOMNode, this, "onCreateDOMNode");dojo.event.topic.subscribe(tree.eventNames.moveFrom, this, "onMoveFrom");dojo.event.topic.subscribe(tree.eventNames.moveTo, this, "onMoveTo");dojo.event.topic.subscribe(tree.eventNames.addChild, this, "onAddChild");dojo.event.topic.subscribe(tree.eventNames.removeNode, this, "onRemoveNode");dojo.event.topic.subscribe(tree.eventNames.treeDestroy, this, "onTreeDestroy");},unlistenTree: function(tree) {dojo.event.topic.unsubscribe(tree.eventNames.createDOMNode, this, "onCreateDOMNode");dojo.event.topic.unsubscribe(tree.eventNames.moveFrom, this, "onMoveFrom");dojo.event.topic.unsubscribe(tree.eventNames.moveTo, this, "onMoveTo");dojo.event.topic.unsubscribe(tree.eventNames.addChild, this, "onAddChild");dojo.event.topic.unsubscribe(tree.eventNames.removeNode, this, "onRemoveNode");dojo.event.topic.unsubscribe(tree.eventNames
.treeDestroy, this, "onTreeDestroy");},onTreeDestroy: function(message) {this.unlistenTree(message.source);},onCreateDOMNode: function(message) {this.registerDNDNode(message.source);},onAddChild: function(message) {this.registerDNDNode(message.child);},onMoveFrom: function(message) {var _this = this;dojo.lang.forEach(
message.child.getDescendants(),function(node) { _this.unregisterDNDNode(node); }
);},onMoveTo: function(message) {var _this = this;dojo.lang.forEach(
message.child.getDescendants(),function(node) { _this.registerDNDNode(node); }
);},registerDNDNode: function(node) {if (!node.tree.DNDMode) return;var source = null;var target = null;if (!node.actionIsDisabled(node.actions.MOVE)) {var source = new dojo.dnd.TreeDragSource(node.labelNode, this, node.tree.widgetId, node);this.dragSources[node.widgetId] = source;}
var target = new dojo.dnd.TreeDropTarget(node.labelNode, this.treeController, node.tree.DNDAcceptTypes, node);this.dropTargets[node.widgetId] = target;},unregisterDNDNode: function(node) {if (this.dragSources[node.widgetId]) {dojo.dnd.dragManager.unregisterDragSource(this.dragSources[node.widgetId]);delete this.dragSources[node.widgetId];}
-if (this.dropTargets[node.widgetId]) {dojo.dnd.dragManager.unregisterDropTarget(this.dropTargets[node.widgetId]);delete this.dropTargets[node.widgetId];}}});
\ No newline at end of file
+if (this.dropTargets[node.widgetId]) {dojo.dnd.dragManager.unregisterDropTarget(this.dropTargets[node.widgetId]);delete this.dropTargets[node.widgetId];}}
+});
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/TreeDragAndDropV3.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/TreeDragAndDropV3.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/TreeDragAndDropV3.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/TreeDragAndDropV3.js Thu Dec 14 07:45:13 2006
@@ -2,7 +2,8 @@
dojo.provide("dojo.dnd.TreeDragAndDropV3");dojo.require("dojo.dnd.HtmlDragAndDrop");dojo.require("dojo.lang.func");dojo.require("dojo.lang.array");dojo.require("dojo.lang.extras");dojo.require("dojo.Deferred");dojo.require("dojo.html.layout");dojo.dnd.TreeDragSourceV3 = function(node, syncController, type, treeNode){this.controller = syncController;this.treeNode = treeNode;dojo.dnd.HtmlDragSource.call(this, node, type);}
dojo.inherits(dojo.dnd.TreeDragSourceV3, dojo.dnd.HtmlDragSource);dojo.dnd.TreeDropTargetV3 = function(domNode, controller, type, treeNode){this.treeNode = treeNode;this.controller = controller;dojo.dnd.HtmlDropTarget.call(this, domNode, type);}
dojo.inherits(dojo.dnd.TreeDropTargetV3, dojo.dnd.HtmlDropTarget);dojo.lang.extend(dojo.dnd.TreeDropTargetV3, {autoExpandDelay: 1500,autoExpandTimer: null,position: null,indicatorStyle: "2px black groove",showIndicator: function(position) {if (this.position == position) {return;}
-this.hideIndicator();this.position = position;var node = this.treeNode;node.contentNode.style.width = dojo.html.getBorderBox(node.labelNode).width + "px";if (position == "onto") {node.contentNode.style.border = this.indicatorStyle;} else {if (position == "before") {node.contentNode.style.borderTop = this.indicatorStyle;} else if (position == "after") {node.contentNode.style.borderBottom = this.indicatorStyle;}}},hideIndicator: function() {this.treeNode.contentNode.style.borderBottom = "";this.treeNode.contentNode.style.borderTop = "";this.treeNode.contentNode.style.border = "";this.treeNode.contentNode.style.width=""
+this.hideIndicator();this.position = position;var node = this.treeNode;node.contentNode.style.width = dojo.html.getBorderBox(node.labelNode).width + "px";if (position == "onto") {node.contentNode.style.border = this.indicatorStyle;} else {if (position == "before") {node.contentNode.style.borderTop = this.indicatorStyle;} else if (position == "after") {node.contentNode.style.borderBottom = this.indicatorStyle;}}
+},hideIndicator: function() {this.treeNode.contentNode.style.borderBottom = "";this.treeNode.contentNode.style.borderTop = "";this.treeNode.contentNode.style.border = "";this.treeNode.contentNode.style.width=""
this.position = null;},onDragOver: function(e){var accepts = dojo.dnd.HtmlDropTarget.prototype.onDragOver.apply(this, arguments);if (accepts && this.treeNode.isFolder && !this.treeNode.isExpanded) {this.setAutoExpandTimer();}
if (accepts) {this.cacheNodeCoords();}
return accepts;},accepts: function(dragObjects) {var accepts = dojo.dnd.HtmlDropTarget.prototype.accepts.apply(this, arguments);if (!accepts) return false;for(var i=0; i<dragObjects.length; i++) {var sourceTreeNode = dragObjects[i].treeNode;if (sourceTreeNode === this.treeNode) return false;}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/__package__.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/__package__.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/__package__.js Thu Dec 14 07:45:13 2006
@@ -1,2 +1,3 @@
-dojo.kwCompoundRequire({common: ["dojo.dnd.DragAndDrop"],browser: ["dojo.dnd.HtmlDragAndDrop"],dashboard: ["dojo.dnd.HtmlDragAndDrop"]});dojo.provide("dojo.dnd.*");
\ No newline at end of file
+dojo.kwCompoundRequire({common: ["dojo.dnd.DragAndDrop"],browser: ["dojo.dnd.HtmlDragAndDrop"],dashboard: ["dojo.dnd.HtmlDragAndDrop"]
+});dojo.provide("dojo.dnd.*");
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/docs.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/docs.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/docs.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/docs.js Thu Dec 14 07:45:13 2006
@@ -1,42 +1,67 @@
dojo.provide("dojo.docs");dojo.require("dojo.io.*");dojo.require("dojo.event.topic");dojo.require("dojo.rpc.JotService");dojo.require("dojo.dom");dojo.require("dojo.uri.Uri");dojo.require("dojo.Deferred");dojo.require("dojo.DeferredList");dojo.docs = new function() {this._url = dojo.uri.dojoUri("docscripts");this._rpc = new dojo.rpc.JotService;this._rpc.serviceUrl = dojo.uri.dojoUri("docscripts/jsonrpc.php");};dojo.lang.mixin(dojo.docs, {_count: 0,_callbacks: {function_names: []},_cache: {},require: function( require, sync) {dojo.debug("require(): " + require);var parts = require.split("/");var size = parts.length;var deferred = new dojo.Deferred;var args = {mimetype: "text/json",load: function(type, data){dojo.debug("require(): loaded for " + require);if(parts[0] != "function_names") {for(var i = 0, part; part = parts[i]; i++){data = data[part];}}
deferred.callback(data);},error: function(){deferred.errback();}};if(location.protocol == "file:"){if(size){if(parts[parts.length - 1] == "documentation"){parts[parts.length - 1] = "meta";}
-if(parts[0] == "function_names"){args.url = [this._url, "local_json", "function_names"].join("/");}else{var dirs = parts[0].split(".");args.url = [this._url, "local_json", dirs[0]].join("/");if(dirs.length > 1){args.url = [args.url, dirs[1]].join(".");}}}}
+if(parts[0] == "function_names"){args.url = [this._url, "local_json", "function_names"].join("/");}else{var dirs = parts[0].split(".");args.url = [this._url, "local_json", dirs[0]].join("/");if(dirs.length > 1){args.url = [args.url, dirs[1]].join(".");}}
+}}
dojo.io.bind(args);return deferred;},getFunctionNames: function(){return this.require("function_names");},unFormat: function( string){var fString = string;if(string.charAt(string.length - 1) == "_"){fString = [string.substring(0, string.length - 1), "*"].join("");}
return fString;},getMeta: function( pkg, name, callback, id){if(typeof name == "function"){id = callback;callback = name;name = pkg;pkg = null;dojo.debug("getMeta(" + name + ")");}else{dojo.debug("getMeta(" + pkg + "/" + name + ")");}
-if(!id){id = "_";}},_withPkg: function( type, data, evt, input, newType){dojo.debug("_withPkg(" + evt.name + ") has package: " + data[0]);evt.pkg = data[0];if("load" == type && evt.pkg){evt.type = newType;}else{if(evt.callbacks && evt.callbacks.length){evt.callbacks.shift()("error", {}, evt, evt.input);}}},_gotMeta: function( type, data, evt){dojo.debug("_gotMeta(" + evt.name + ")");var cached = dojo.docs._getCache(evt.pkg, evt.name, "meta", "functions", evt.id);if(cached.summary){data.summary = cached.summary;}
+if(!id){id = "_";}},_withPkg: function( type, data, evt, input, newType){dojo.debug("_withPkg(" + evt.name + ") has package: " + data[0]);evt.pkg = data[0];if("load" == type && evt.pkg){evt.type = newType;}else{if(evt.callbacks && evt.callbacks.length){evt.callbacks.shift()("error", {}, evt, evt.input);}}
+},_gotMeta: function( type, data, evt){dojo.debug("_gotMeta(" + evt.name + ")");var cached = dojo.docs._getCache(evt.pkg, evt.name, "meta", "functions", evt.id);if(cached.summary){data.summary = cached.summary;}
if(evt.callbacks && evt.callbacks.length){evt.callbacks.shift()(type, data, evt, evt.input);}},getSrc: function( name, callback, id){dojo.debug("getSrc(" + name + ")");if(!id){id = "_";}},getDoc: function( name, callback, id){dojo.debug("getDoc(" + name + ")");if(!id){id = "_";}
-var input = {};input.type = "doc";input.name = name;input.callbacks = [callback];},_gotDoc: function( type, data, evt, input){dojo.debug("_gotDoc(" + evt.type + ")");evt[evt.type] = data;if(evt.expects && evt.expects.doc){for(var i = 0, expect; expect = evt.expects.doc[i]; i++){if(!(expect in evt)){dojo.debug("_gotDoc() waiting for more data");return;}}}
-var cache = dojo.docs._getCache(evt.pkg, "meta", "functions", evt.name, evt.id, "meta");var description = evt.fn.description;cache.description = description;data = {returns: evt.fn.returns,id: evt.id,variables: []}
+var input = {};input.type = "doc";input.name = name;input.callbacks = [callback];},_gotDoc: function( type, data, evt, input){dojo.debug("_gotDoc(" + evt.type + ")");evt[evt.type] = data;if(evt.expects && evt.expects.doc){for(var i = 0, expect; expect = evt.expects.doc[i]; i++){if(!(expect in evt)){dojo.debug("_gotDoc() waiting for more data");return;}}
+}
+var cache = dojo.docs._getCache(evt.pkg, "meta", "functions", evt.name, evt.id, "meta");var description = evt.fn.description;cache.description = description;data = {returns: evt.fn.returns,id: evt.id,variables: []
+}
if(!cache.parameters){cache.parameters = {};}
for(var i = 0, param; param = evt.param[i]; i++){var fName = param["DocParamForm/name"];if(!cache.parameters[fName]){cache.parameters[fName] = {};}
-cache.parameters[fName].description = param["DocParamForm/desc"]}
-data.description = cache.description;data.parameters = cache.parameters;evt.type = "doc";if(evt.callbacks && evt.callbacks.length){evt.callbacks.shift()("load", data, evt, input);}},getPkgDoc: function( name, callback){dojo.debug("getPkgDoc(" + name + ")");var input = {};},getPkgInfo: function( name, callback){dojo.debug("getPkgInfo(" + name + ")");var input = {expects: {pkginfo: ["pkgmeta", "pkgdoc"]},callback: callback};dojo.docs.getPkgMeta(input, name, dojo.docs._getPkgInfo);dojo.docs.getPkgDoc(input, name, dojo.docs._getPkgInfo);},_getPkgInfo: function( type, data, evt){dojo.debug("_getPkgInfo() for " + evt.type);var input = {};var results = {};if(typeof key == "object"){input = key;input[evt.type] = data;if(input.expects && input.expects.pkginfo){for(var i = 0, expect; expect = input.expects.pkginfo[i]; i++){if(!(expect in input)){dojo.debug("_getPkgInfo() waiting for more data");return;}}}
+cache.parameters[fName].description = param["DocParamForm/desc"]
+}
+data.description = cache.description;data.parameters = cache.parameters;evt.type = "doc";if(evt.callbacks && evt.callbacks.length){evt.callbacks.shift()("load", data, evt, input);}},getPkgDoc: function( name, callback){dojo.debug("getPkgDoc(" + name + ")");var input = {};},getPkgInfo: function( name, callback){dojo.debug("getPkgInfo(" + name + ")");var input = {expects: {pkginfo: ["pkgmeta", "pkgdoc"]
+},callback: callback
+};dojo.docs.getPkgMeta(input, name, dojo.docs._getPkgInfo);dojo.docs.getPkgDoc(input, name, dojo.docs._getPkgInfo);},_getPkgInfo: function( type, data, evt){dojo.debug("_getPkgInfo() for " + evt.type);var input = {};var results = {};if(typeof key == "object"){input = key;input[evt.type] = data;if(input.expects && input.expects.pkginfo){for(var i = 0, expect; expect = input.expects.pkginfo[i]; i++){if(!(expect in input)){dojo.debug("_getPkgInfo() waiting for more data");return;}}
+}
results = input.pkgmeta;results.description = input.pkgdoc;}
-if(input.callback){input.callback("load", results, evt);}},getInfo: function( name, callback){dojo.debug("getInfo(" + name + ")");var input = {expects: {"info": ["meta", "doc"]},callback: callback}
-dojo.docs.getMeta(input, name, dojo.docs._getInfo);dojo.docs.getDoc(input, name, dojo.docs._getInfo);},_getInfo: function( type, data, evt, input){dojo.debug("_getInfo(" + evt.type + ")");if(input && input.expects && input.expects.info){input[evt.type] = data;for(var i = 0, expect; expect = input.expects.info[i]; i++){if(!(expect in input)){dojo.debug("_getInfo() waiting for more data");return;}}}
-if(input.callback){input.callback("load", dojo.docs._getCache(evt.pkg, "meta", "functions", evt.name, evt.id, "meta"), evt, input);}},_getMainText: function( text){dojo.debug("_getMainText()");return text.replace(/^<html[^<]*>/, "").replace(/<\/html>$/, "").replace(/<\w+\s*\/>/g, "");},getPackageMeta: function( input){dojo.debug("getPackageMeta(): " + input.package);return this.require(input.package + "/meta", input.sync);},getFunctionMeta: function( input){var package = input.package || "";var name = input.name;var id = input.id || "_";dojo.debug("getFunctionMeta(): " + name);if(!name) return;if(package){return this.require(package + "/meta/functions/" + name + "/" + id + "/meta");}else{this.getFunctionNames();}},getFunctionDocumentation: function( input){var package = input.package || "";var name = input.name;var id = input.id || "_";dojo.debug("getFunctionDocumentation(): " + name);if(!name) return;if(package){return this.require(package + "/meta/functions/" + name + "/"
+ id + "/documentation");}},_onDocSearch: function( input){var _this = this;var name = input.name.toLowerCase();if(!name) return;this.getFunctionNames().addCallback(function(data){dojo.debug("_onDocSearch(): function names loaded for " + name);var output = [];var list = [];var closure = function(pkg, fn) {return function(data){dojo.debug("_onDocSearch(): package meta loaded for: " + pkg);if(data.functions){var functions = data.functions;for(var key in functions){if(fn == key){var ids = functions[key];for(var id in ids){var fnMeta = ids[id];output.push({package: pkg,name: fn,id: id,summary: fnMeta.summary});}}}}
+if(input.callback){input.callback("load", results, evt);}},getInfo: function( name, callback){dojo.debug("getInfo(" + name + ")");var input = {expects: {"info": ["meta", "doc"]
+},callback: callback
+}
+dojo.docs.getMeta(input, name, dojo.docs._getInfo);dojo.docs.getDoc(input, name, dojo.docs._getInfo);},_getInfo: function( type, data, evt, input){dojo.debug("_getInfo(" + evt.type + ")");if(input && input.expects && input.expects.info){input[evt.type] = data;for(var i = 0, expect; expect = input.expects.info[i]; i++){if(!(expect in input)){dojo.debug("_getInfo() waiting for more data");return;}}
+}
+if(input.callback){input.callback("load", dojo.docs._getCache(evt.pkg, "meta", "functions", evt.name, evt.id, "meta"), evt, input);}},_getMainText: function( text){dojo.debug("_getMainText()");return text.replace(/^<html[^<]*>/, "").replace(/<\/html>$/, "").replace(/<\w+\s*\/>/g, "");},getPackageMeta: function( input){dojo.debug("getPackageMeta(): " + input.package);return this.require(input.package + "/meta", input.sync);},getFunctionMeta: function( input){var package = input.package || "";var name = input.name;var id = input.id || "_";dojo.debug("getFunctionMeta(): " + name);if(!name) return;if(package){return this.require(package + "/meta/functions/" + name + "/" + id + "/meta");}else{this.getFunctionNames();}},getFunctionDocumentation: function( input){var package = input.package || "";var name = input.name;var id = input.id || "_";dojo.debug("getFunctionDocumentation(): " + name);if(!name) return;if(package){return this.require(package + "/meta/functions/" + name + "/"
+ id + "/documentation");}},_onDocSearch: function( input){var _this = this;var name = input.name.toLowerCase();if(!name) return;this.getFunctionNames().addCallback(function(data){dojo.debug("_onDocSearch(): function names loaded for " + name);var output = [];var list = [];var closure = function(pkg, fn) {return function(data){dojo.debug("_onDocSearch(): package meta loaded for: " + pkg);if(data.functions){var functions = data.functions;for(var key in functions){if(fn == key){var ids = functions[key];for(var id in ids){var fnMeta = ids[id];output.push({package: pkg,name: fn,id: id,summary: fnMeta.summary
+});}}
+}}
return output;}}
pkgLoop:
for(var pkg in data){if(pkg.toLowerCase() == name){name = pkg;dojo.debug("_onDocSearch found a package");return;}
-for(var i = 0, fn; fn = data[pkg][i]; i++){if(fn.toLowerCase().indexOf(name) != -1){dojo.debug("_onDocSearch(): Search matched " + fn);var meta = _this.getPackageMeta({package: pkg});meta.addCallback(closure(pkg, fn));list.push(meta);continue pkgLoop;}}}
-list = new dojo.DeferredList(list);list.addCallback(function(results){dojo.debug("_onDocSearch(): All packages loaded");_this._printFunctionResults(results[0][1]);});});},_onDocSearchFn: function( type, data, evt){dojo.debug("_onDocSearchFn(" + evt.name + ")");var name = evt.name || evt.pkg;dojo.debug("_onDocSearchFn found a function");evt.pkgs = packages;evt.pkg = name;evt.loaded = 0;for(var i = 0, pkg; pkg = packages[i]; i++){dojo.docs.getPkgMeta(evt, pkg, dojo.docs._onDocResults);}},_onPkgResults: function( type, data, evt, input){dojo.debug("_onPkgResults(" + evt.type + ")");var description = "";var path = "";var methods = {};var requires = {};if(input){input[evt.type] = data;if(input.expects && input.expects.pkgresults){for(var i = 0, expect; expect = input.expects.pkgresults[i]; i++){if(!(expect in input)){dojo.debug("_onPkgResults() waiting for more data");return;}}}
+for(var i = 0, fn; fn = data[pkg][i]; i++){if(fn.toLowerCase().indexOf(name) != -1){dojo.debug("_onDocSearch(): Search matched " + fn);var meta = _this.getPackageMeta({package: pkg});meta.addCallback(closure(pkg, fn));list.push(meta);continue pkgLoop;}}
+}
+list = new dojo.DeferredList(list);list.addCallback(function(results){dojo.debug("_onDocSearch(): All packages loaded");_this._printFunctionResults(results[0][1]);});});},_onDocSearchFn: function( type, data, evt){dojo.debug("_onDocSearchFn(" + evt.name + ")");var name = evt.name || evt.pkg;dojo.debug("_onDocSearchFn found a function");evt.pkgs = packages;evt.pkg = name;evt.loaded = 0;for(var i = 0, pkg; pkg = packages[i]; i++){dojo.docs.getPkgMeta(evt, pkg, dojo.docs._onDocResults);}},_onPkgResults: function( type, data, evt, input){dojo.debug("_onPkgResults(" + evt.type + ")");var description = "";var path = "";var methods = {};var requires = {};if(input){input[evt.type] = data;if(input.expects && input.expects.pkgresults){for(var i = 0, expect; expect = input.expects.pkgresults[i]; i++){if(!(expect in input)){dojo.debug("_onPkgResults() waiting for more data");return;}}
+}
path = input.pkgdoc.path;description = input.pkgdoc.description;methods = input.pkgmeta.methods;requires = input.pkgmeta.requires;}
-var pkg = evt.name.replace("_", "*");var results = {path: path,description: description,size: 0,methods: [],pkg: pkg,requires: requires}
-var rePrivate = /_[^.]+$/;for(var method in methods){if(!rePrivate.test(method)){for(var pId in methods[method]){results.methods.push({pkg: pkg,name: method,id: pId,summary: methods[method][pId].summary})}}}
+var pkg = evt.name.replace("_", "*");var results = {path: path,description: description,size: 0,methods: [],pkg: pkg,requires: requires
+}
+var rePrivate = /_[^.]+$/;for(var method in methods){if(!rePrivate.test(method)){for(var pId in methods[method]){results.methods.push({pkg: pkg,name: method,id: pId,summary: methods[method][pId].summary
+})
+}}
+}
results.size = results.methods.length;dojo.docs._printPkgResult(results);},_onDocResults: function( type, data, evt, input){dojo.debug("_onDocResults(" + evt.name + "/" + input.pkg + ") " + type);++input.loaded;if(input.loaded == input.pkgs.length){var pkgs = input.pkgs;var name = input.pkg;var results = {methods: []};var rePrivate = /_[^.]+$/;data = dojo.docs._cache;for(var i = 0, pkg; pkg = pkgs[i]; i++){var methods = dojo.docs._getCache(pkg, "meta", "methods");for(var fn in methods){if(fn.toLowerCase().indexOf(name) == -1){continue;}
-if(fn != "requires" && !rePrivate.test(fn)){for(var pId in methods[fn]){var result = {pkg: pkg,name: fn,id: "_",summary: ""}
+if(fn != "requires" && !rePrivate.test(fn)){for(var pId in methods[fn]){var result = {pkg: pkg,name: fn,id: "_",summary: ""
+}
if(methods[fn][pId].summary){result.summary = methods[fn][pId].summary;}
-results.methods.push(result);}}}}
+results.methods.push(result);}}
+}}
dojo.debug("Publishing docResults");dojo.docs._printFnResults(results);}},_printFunctionResults: function(results){dojo.debug("_printFnResults(): called");},_printPkgResult: function(results){dojo.debug("_printPkgResult(): called");},_onDocSelectFunction: function( input){var name = input.name;var package = input.package || "";var id = input.id || "_";dojo.debug("_onDocSelectFunction(" + name + ")");if(!name || !package) return false;var pkgMeta = this.getPackageMeta({package: package});var meta = this.getFunctionMeta({package: package, name: name, id: id});var doc = this.getFunctionDocumentation({package: package, name: name, id: id});var list = new dojo.DeferredList([pkgMeta, meta, doc]);list.addCallback(function(results){dojo.debug("_onDocSelectFunction() loaded");for(var i = 0, result; result = results[i]; i++){dojo.debugShallow(result[1]);}});return list;},_onDocSelectPackage: function( input){dojo.debug("_onDocSelectPackage(" + input.name + ")")
-input.expects = {"pkgresults": ["pkgmeta", "pkgdoc"]};dojo.docs.getPkgMeta(input, input.name, dojo.docs._onPkgResults);dojo.docs.getPkgDoc(input, input.name, dojo.docs._onPkgResults);},_onDocSelectResults: function( type, data, evt, input){dojo.debug("_onDocSelectResults(" + evt.type + ", " + evt.name + ")");if(evt.type == "meta"){dojo.docs.getPkgMeta(input, evt.pkg, dojo.docs._onDocSelectResults);}
-if(input){input[evt.type] = data;if(input.expects && input.expects.docresults){for(var i = 0, expect; expect = input.expects.docresults[i]; i++){if(!(expect in input)){dojo.debug("_onDocSelectResults() waiting for more data");return;}}}}
-dojo.docs._printFunctionDetail(input);},_printFunctionDetail: function(results) {},selectFunction: function( name, id){},savePackage: function( callbackObject, callback, parameters){dojo.event.kwConnect({srcObj: dojo.docs,srcFunc: "_savedPkgRpc",targetObj: callbackObject,targetFunc: callback,once: true});var props = {};var cache = dojo.docs._getCache(parameters.pkg, "meta");var i = 1;if(!cache.path){var path = "id";props[["pname", i].join("")] = "DocPkgForm/require";props[["pvalue", i++].join("")] = parameters.pkg;}else{var path = cache.path;}
+input.expects = {"pkgresults": ["pkgmeta", "pkgdoc"]
+};dojo.docs.getPkgMeta(input, input.name, dojo.docs._onPkgResults);dojo.docs.getPkgDoc(input, input.name, dojo.docs._onPkgResults);},_onDocSelectResults: function( type, data, evt, input){dojo.debug("_onDocSelectResults(" + evt.type + ", " + evt.name + ")");if(evt.type == "meta"){dojo.docs.getPkgMeta(input, evt.pkg, dojo.docs._onDocSelectResults);}
+if(input){input[evt.type] = data;if(input.expects && input.expects.docresults){for(var i = 0, expect; expect = input.expects.docresults[i]; i++){if(!(expect in input)){dojo.debug("_onDocSelectResults() waiting for more data");return;}}
+}}
+dojo.docs._printFunctionDetail(input);},_printFunctionDetail: function(results) {},selectFunction: function( name, id){},savePackage: function( callbackObject, callback, parameters){dojo.event.kwConnect({srcObj: dojo.docs,srcFunc: "_savedPkgRpc",targetObj: callbackObject,targetFunc: callback,once: true
+});var props = {};var cache = dojo.docs._getCache(parameters.pkg, "meta");var i = 1;if(!cache.path){var path = "id";props[["pname", i].join("")] = "DocPkgForm/require";props[["pvalue", i++].join("")] = parameters.pkg;}else{var path = cache.path;}
props.form = "//DocPkgForm";props.path = ["/WikiHome/DojoDotDoc/", path].join("");if(parameters.description){props[["pname", i].join("")] = "main/text";props[["pvalue", i++].join("")] = parameters.description;}
-dojo.docs._rpc.callRemote("saveForm", props).addCallbacks(dojo.docs._pkgRpc, dojo.docs._pkgRpc);},_pkgRpc: function(data){if(data.name){dojo.docs._getCache(data["DocPkgForm/require"], "meta").path = data.name;dojo.docs._savedPkgRpc("load");}else{dojo.docs._savedPkgRpc("error");}},_savedPkgRpc: function(type){},functionPackages: function( name, callback, input){dojo.debug("functionPackages() name: " + name);if(!input){input = {};}
+dojo.docs._rpc.callRemote("saveForm",props).addCallbacks(dojo.docs._pkgRpc, dojo.docs._pkgRpc);},_pkgRpc: function(data){if(data.name){dojo.docs._getCache(data["DocPkgForm/require"], "meta").path = data.name;dojo.docs._savedPkgRpc("load");}else{dojo.docs._savedPkgRpc("error");}},_savedPkgRpc: function(type){},functionPackages: function( name, callback, input){dojo.debug("functionPackages() name: " + name);if(!input){input = {};}
if(!input.callbacks){input.callbacks = [];}
input.type = "function_names";input.name = name;input.callbacks.unshift(callback);input.callbacks.unshift(dojo.docs._functionPackages);},_functionPackages: function( type, data, evt){dojo.debug("_functionPackages() name: " + evt.name);evt.pkg = '';var results = [];var data = dojo.docs._cache['function_names'];for(var key in data){if(dojo.lang.inArray(data[key], evt.name)){dojo.debug("_functionPackages() package: " + key);results.push(key);}}
-if(evt.callbacks && evt.callbacks.length){evt.callbacks.shift()(type, results, evt, evt.input);}},setUserName: function( name){dojo.docs._userName = name;if(name && dojo.docs._password){dojo.docs._logIn();}},setPassword: function( password){dojo.docs._password = password;if(password && dojo.docs._userName){dojo.docs._logIn();}},_logIn: function(){dojo.io.bind({url: dojo.docs._rpc.serviceUrl.toString(),method: "post",mimetype: "text/json",content: {username: dojo.docs._userName,password: dojo.docs._password},load: function(type, data){if(data.error){dojo.docs.logInSuccess();}else{dojo.docs.logInFailure();}},error: function(){dojo.docs.logInFailure();}});},logInSuccess: function(){},logInFailure: function(){},_set: function( base, keys, value){var args = [];for(var i = 0, arg; arg = arguments[i]; i++){args.push(arg);}
+if(evt.callbacks && evt.callbacks.length){evt.callbacks.shift()(type, results, evt, evt.input);}},setUserName: function( name){dojo.docs._userName = name;if(name && dojo.docs._password){dojo.docs._logIn();}},setPassword: function( password){dojo.docs._password = password;if(password && dojo.docs._userName){dojo.docs._logIn();}},_logIn: function(){dojo.io.bind({url: dojo.docs._rpc.serviceUrl.toString(),method: "post",mimetype: "text/json",content: {username: dojo.docs._userName,password: dojo.docs._password
+},load: function(type, data){if(data.error){dojo.docs.logInSuccess();}else{dojo.docs.logInFailure();}},error: function(){dojo.docs.logInFailure();}});},logInSuccess: function(){},logInFailure: function(){},_set: function( base, keys, value){var args = [];for(var i = 0, arg; arg = arguments[i]; i++){args.push(arg);}
if(args.length < 3) return;base = args.shift();value = args.pop();var key = args.pop();for(var i = 0, arg; arg = args[i]; i++){if(typeof base[arg] != "object"){base[arg] = {};}
base = base[arg];}
base[key] = value;},_getCache: function( keys){var obj = dojo.docs._cache;for(var i = 0; i < arguments.length; i++){var arg = arguments[i];if(!obj[arg]){obj[arg] = {};}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dom.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dom.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dom.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dom.js Thu Dec 14 07:45:13 2006
@@ -1,5 +1,6 @@
-dojo.provide("dojo.dom");dojo.dom.ELEMENT_NODE = 1;dojo.dom.ATTRIBUTE_NODE = 2;dojo.dom.TEXT_NODE = 3;dojo.dom.CDATA_SECTION_NODE = 4;dojo.dom.ENTITY_REFERENCE_NODE = 5;dojo.dom.ENTITY_NODE = 6;dojo.dom.PROCESSING_INSTRUCTION_NODE = 7;dojo.dom.COMMENT_NODE = 8;dojo.dom.DOCUMENT_NODE = 9;dojo.dom.DOCUMENT_TYPE_NODE = 10;dojo.dom.DOCUMENT_FRAGMENT_NODE = 11;dojo.dom.NOTATION_NODE = 12;dojo.dom.dojoml = "http://www.dojotoolkit.org/2004/dojoml";dojo.dom.xmlns = {svg : "http://www.w3.org/2000/svg",smil : "http://www.w3.org/2001/SMIL20/",mml : "http://www.w3.org/1998/Math/MathML",cml : "http://www.xml-cml.org",xlink : "http://www.w3.org/1999/xlink",xhtml : "http://www.w3.org/1999/xhtml",xul : "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",xbl : "http://www.mozilla.org/xbl",fo : "http://www.w3.org/1999/XSL/For
mat",xsl : "http://www.w3.org/1999/XSL/Transform",xslt : "http://www.w3.org/1999/XSL/Transform",xi : "http://www.w3.org/2001/XInclude",xforms : "http://www.w3.org/2002/01/xforms",saxon : "http://icl.com/saxon",xalan : "http://xml.apache.org/xslt",xsd : "http://www.w3.org/2001/XMLSchema",dt: "http://www.w3.org/2001/XMLSchema-datatypes",xsi : "http://www.w3.org/2001/XMLSchema-instance",rdf : "http://www.w3.org/1999/02/22-rdf-syntax-ns#",rdfs : "http://www.w3.org/2000/01/rdf-schema#",dc : "http://purl.org/dc/elements/1.1/",dcq: "http://purl.org/dc/qualifiers/1.0","soap-env" : "http://schemas.xmlsoap.org/soap/envelope/",wsdl : "http://schemas.xmlsoap.org/wsdl/",AdobeExtensions : "http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"};dojo.dom.isNode = function(wh){if(typeof Element == "function") {try {return wh instanceof Element;} catch(e) {}} else {return wh && !isNaN(wh.nodeType);}}
+dojo.provide("dojo.dom");dojo.dom.ELEMENT_NODE = 1;dojo.dom.ATTRIBUTE_NODE = 2;dojo.dom.TEXT_NODE = 3;dojo.dom.CDATA_SECTION_NODE = 4;dojo.dom.ENTITY_REFERENCE_NODE = 5;dojo.dom.ENTITY_NODE = 6;dojo.dom.PROCESSING_INSTRUCTION_NODE = 7;dojo.dom.COMMENT_NODE = 8;dojo.dom.DOCUMENT_NODE = 9;dojo.dom.DOCUMENT_TYPE_NODE = 10;dojo.dom.DOCUMENT_FRAGMENT_NODE = 11;dojo.dom.NOTATION_NODE = 12;dojo.dom.dojoml = "http://www.dojotoolkit.org/2004/dojoml";dojo.dom.xmlns = {svg : "http://www.w3.org/2000/svg",smil : "http://www.w3.org/2001/SMIL20/",mml : "http://www.w3.org/1998/Math/MathML",cml : "http://www.xml-cml.org",xlink : "http://www.w3.org/1999/xlink",xhtml : "http://www.w3.org/1999/xhtml",xul : "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",xbl : "http://www.mozilla.org/xbl",fo : "http://www.w3.org/1999/XSL/For
mat",xsl : "http://www.w3.org/1999/XSL/Transform",xslt : "http://www.w3.org/1999/XSL/Transform",xi : "http://www.w3.org/2001/XInclude",xforms : "http://www.w3.org/2002/01/xforms",saxon : "http://icl.com/saxon",xalan : "http://xml.apache.org/xslt",xsd : "http://www.w3.org/2001/XMLSchema",dt: "http://www.w3.org/2001/XMLSchema-datatypes",xsi : "http://www.w3.org/2001/XMLSchema-instance",rdf : "http://www.w3.org/1999/02/22-rdf-syntax-ns#",rdfs : "http://www.w3.org/2000/01/rdf-schema#",dc : "http://purl.org/dc/elements/1.1/",dcq: "http://purl.org/dc/qualifiers/1.0","soap-env" : "http://schemas.xmlsoap.org/soap/envelope/",wsdl : "http://schemas.xmlsoap.org/wsdl/",AdobeExtensions : "http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+};dojo.dom.isNode = function(wh){if(typeof Element == "function") {try {return wh instanceof Element;} catch(e) {}} else {return wh && !isNaN(wh.nodeType);}}
dojo.dom.getUniqueId = function(){var _document = dojo.doc();do {var id = "dj_unique_" + (++arguments.callee._idIncrement);}while(_document.getElementById(id));return id;}
dojo.dom.getUniqueId._idIncrement = 0;dojo.dom.firstElement = dojo.dom.getFirstChildElement = function(parentNode, tagName){var node = parentNode.firstChild;while(node && node.nodeType != dojo.dom.ELEMENT_NODE){node = node.nextSibling;}
if(tagName && node && node.tagName && node.tagName.toLowerCase() != tagName.toLowerCase()) {node = dojo.dom.nextElement(node, tagName);}
@@ -28,7 +29,8 @@
dojo.dom.replaceNode = function(node, newNode){return node.parentNode.replaceChild(newNode, node);}
dojo.dom.destroyNode = function(node){if(node.parentNode){node = dojo.dom.removeNode(node);}
if(node.nodeType != 3){if(dojo.evalObjPath("dojo.event.browser.clean", false)){dojo.event.browser.clean(node);}
-if(dojo.render.html.ie){node.outerHTML='';}}}
+if(dojo.render.html.ie){node.outerHTML='';}}
+}
dojo.dom.removeNode = function(node){if(node && node.parentNode){return node.parentNode.removeChild(node);}}
dojo.dom.getAncestors = function(node, filterFunction, returnFirstHit){var ancestors = [];var isFunction = (filterFunction && (filterFunction instanceof Function || typeof filterFunction == "function"));while(node){if(!isFunction || filterFunction(node)){ancestors.push(node);}
if(returnFirstHit && ancestors.length > 0){return ancestors[0];}
@@ -42,7 +44,8 @@
node = node.parentNode;}
return false;}
dojo.dom.innerXML = function(node){if(node.innerXML){return node.innerXML;}else if (node.xml){return node.xml;}else if(typeof XMLSerializer != "undefined"){return (new XMLSerializer()).serializeToString(node);}}
-dojo.dom.createDocument = function(){var doc = null;var _document = dojo.doc();if(!dj_undef("ActiveXObject")){var prefixes = [ "MSXML2", "Microsoft", "MSXML", "MSXML3" ];for(var i = 0; i<prefixes.length; i++){try{doc = new ActiveXObject(prefixes[i]+".XMLDOM");}catch(e){ };if(doc){ break; }}}else if((_document.implementation)&&
+dojo.dom.createDocument = function(){var doc = null;var _document = dojo.doc();if(!dj_undef("ActiveXObject")){var prefixes = [ "MSXML2", "Microsoft", "MSXML", "MSXML3" ];for(var i = 0; i<prefixes.length; i++){try{doc = new ActiveXObject(prefixes[i]+".XMLDOM");}catch(e){ };if(doc){ break; }}
+}else if((_document.implementation)&&
(_document.implementation.createDocument)){doc = _document.implementation.createDocument("", "", null);}
return doc;}
dojo.dom.createDocumentFromText = function(str, mimetype){if(!mimetype){ mimetype = "text/xml"; }
@@ -53,7 +56,7 @@
return null;}
dojo.dom.prependChild = function(node, parent){if(parent.firstChild) {parent.insertBefore(node, parent.firstChild);} else {parent.appendChild(node);}
return true;}
-dojo.dom.insertBefore = function(node, ref, force){if( (force != true)&&
+dojo.dom.insertBefore = function(node, ref, force){if((force != true)&&
(node === ref || node.nextSibling === ref)){ return false; }
var parent = ref.parentNode;parent.insertBefore(node, ref);return true;}
dojo.dom.insertAfter = function(node, ref, force){var pn = ref.parentNode;if(ref == pn.lastChild){if((force != true)&&(node === ref)){return false;}
@@ -80,9 +83,10 @@
break;}}
return _result;}}
dojo.dom.hasParent = function(node){return Boolean(node && node.parentNode && dojo.dom.isNode(node.parentNode));}
-dojo.dom.isTag = function(node ){if(node && node.tagName) {for(var i=1; i<arguments.length; i++){if(node.tagName==String(arguments[i])){return String(arguments[i]);}}}
+dojo.dom.isTag = function(node ){if(node && node.tagName) {for(var i=1; i<arguments.length; i++){if(node.tagName==String(arguments[i])){return String(arguments[i]);}}
+}
return "";}
-dojo.dom.setAttributeNS = function( elem, namespaceURI,attrName, attrValue){if(elem == null || ((elem == undefined)&&(typeof elem == "undefined"))){dojo.raise("No element given to dojo.dom.setAttributeNS");}
+dojo.dom.setAttributeNS = function(elem, namespaceURI,attrName, attrValue){if(elem == null || ((elem == undefined)&&(typeof elem == "undefined"))){dojo.raise("No element given to dojo.dom.setAttributeNS");}
if(!((elem.setAttributeNS == undefined)&&(typeof elem.setAttributeNS == "undefined"))){elem.setAttributeNS(namespaceURI, attrName, attrValue);}else{var ownerDoc = elem.ownerDocument;var attribute = ownerDoc.createNode(
2,attrName,namespaceURI
);attribute.nodeValue = attrValue;elem.setAttributeNode(attribute);}}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/event/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/event/__package__.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/event/__package__.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/event/__package__.js Thu Dec 14 07:45:13 2006
@@ -1,2 +1,3 @@
-dojo.kwCompoundRequire({common: ["dojo.event.common", "dojo.event.topic"],browser: ["dojo.event.browser"],dashboard: ["dojo.event.browser"]});dojo.provide("dojo.event.*");
\ No newline at end of file
+dojo.kwCompoundRequire({common: ["dojo.event.common", "dojo.event.topic"],browser: ["dojo.event.browser"],dashboard: ["dojo.event.browser"]
+});dojo.provide("dojo.event.*");
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/event/browser.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/event/browser.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/event/browser.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/event/browser.js Thu Dec 14 07:45:13 2006
@@ -1,14 +1,16 @@
-dojo.provide("dojo.event.browser");dojo.require("dojo.event.common");dojo._ie_clobber = new function(){this.clobberNodes = [];function nukeProp(node, prop){try{ node[prop] = null; }catch(e){ }
-try{ delete node[prop]; }catch(e){ }
-try{ node.removeAttribute(prop); }catch(e){ }}
-this.clobber = function(nodeRef){var na;var tna;if(nodeRef){tna = nodeRef.all || nodeRef.getElementsByTagName("*");na = [nodeRef];for(var x=0; x<tna.length; x++){if(tna[x]["__doClobber__"]){na.push(tna[x]);}}}else{try{ window.onload = null; }catch(e){}
+dojo.provide("dojo.event.browser");dojo.require("dojo.event.common");dojo._ie_clobber = new function(){this.clobberNodes = [];function nukeProp(node, prop){try{ node[prop] = null; }catch(e){ }
+try{ delete node[prop]; }catch(e){ }
+try{ node.removeAttribute(prop);}catch(e){ }}
+this.clobber = function(nodeRef){var na;var tna;if(nodeRef){tna = nodeRef.all || nodeRef.getElementsByTagName("*");na = [nodeRef];for(var x=0; x<tna.length; x++){if(tna[x]["__doClobber__"]){na.push(tna[x]);}}
+}else{try{ window.onload = null; }catch(e){}
na = (this.clobberNodes.length) ? this.clobberNodes : document.all;}
tna = null;var basis = {};for(var i = na.length-1; i>=0; i=i-1){var el = na[i];try{if(el && el["__clobberAttrs__"]){for(var j=0; j<el.__clobberAttrs__.length; j++){nukeProp(el, el.__clobberAttrs__[j]);}
nukeProp(el, "__clobberAttrs__");nukeProp(el, "__doClobber__");}}catch(e){ };}
na = null;}}
if(dojo.render.html.ie){dojo.addOnUnload(function(){dojo._ie_clobber.clobber();try{if((dojo["widget"])&&(dojo.widget["manager"])){dojo.widget.manager.destroyAll();}}catch(e){}
-if(dojo.widget){for(var name in dojo.widget._templateCache){if(dojo.widget._templateCache[name].node){dojo.dom.destroyNode(dojo.widget._templateCache[name].node);dojo.widget._templateCache[name].node = null;delete dojo.widget._templateCache[name].node;}}}
+if(dojo.widget){for(var name in dojo.widget._templateCache){if(dojo.widget._templateCache[name].node){dojo.dom.destroyNode(dojo.widget._templateCache[name].node);dojo.widget._templateCache[name].node = null;delete dojo.widget._templateCache[name].node;}}
+}
try{ window.onload = null; }catch(e){}
try{ window.onunload = null; }catch(e){}
dojo._ie_clobber.clobberNodes = [];});}
@@ -27,7 +29,7 @@
if(!node["__doClobber__"]){node.__doClobber__ = true;dojo._ie_clobber.clobberNodes.push(node);node.__clobberAttrs__ = [];}}
this.addClobberNodeAttrs = function(node, props){if(!dojo.render.html.ie){ return; }
this.addClobberNode(node);for(var x=0; x<props.length; x++){node.__clobberAttrs__.push(props[x]);}}
-this.removeListener = function( node,evtName,fp,capture){if(!capture){ var capture = false; }
+this.removeListener = function( node,evtName,fp,capture){if(!capture){ var capture = false; }
evtName = dojo.event.browser.normalizedEventName(evtName);if( (evtName == "onkey") || (evtName == "key") ){if(dojo.render.html.ie){this.removeListener(node, "onkeydown", fp, capture);}
evtName = "onkeypress";}
if(evtName.substr(0,2)=="on"){ evtName = evtName.substr(2); }
@@ -48,7 +50,8 @@
dojo.event.browser.currentEvent.currentTarget = curTarget;return listener.call(curTarget, dojo.event.browser.currentEvent);}
this._stopPropagation = function(){dojo.event.browser.currentEvent.cancelBubble = true;}
this._preventDefault = function(){dojo.event.browser.currentEvent.returnValue = false;}
-this.keys = {KEY_BACKSPACE: 8,KEY_TAB: 9,KEY_CLEAR: 12,KEY_ENTER: 13,KEY_SHIFT: 16,KEY_CTRL: 17,KEY_ALT: 18,KEY_PAUSE: 19,KEY_CAPS_LOCK: 20,KEY_ESCAPE: 27,KEY_SPACE: 32,KEY_PAGE_UP: 33,KEY_PAGE_DOWN: 34,KEY_END: 35,KEY_HOME: 36,KEY_LEFT_ARROW: 37,KEY_UP_ARROW: 38,KEY_RIGHT_ARROW: 39,KEY_DOWN_ARROW: 40,KEY_INSERT: 45,KEY_DELETE: 46,KEY_HELP: 47,KEY_LEFT_WINDOW: 91,KEY_RIGHT_WINDOW: 92,KEY_SELECT: 93,KEY_NUMPAD_0: 96,KEY_NUMPAD_1: 97,KEY_NUMPAD_2: 98,KEY_NUMPAD_3: 99,KEY_NUMPAD_4: 100,KEY_NUMPAD_5: 101,KEY_NUMPAD_6: 102,KEY_NUMPAD_7: 103,KEY_NUMPAD_8: 104,KEY_NUMPAD_9: 105,KEY_NUMPAD_MULTIPLY: 106,KEY_NUMPAD_PLUS: 107,KEY_NUMPAD_ENTER: 108,KEY_NUMPAD_MINUS: 109,KEY_NUMPAD_PERIOD: 110,KEY_NUMPAD_DIVIDE: 111,KEY_F1: 112,KEY_F2: 113,KEY_F3: 114,KEY_F4: 115,KEY_F5: 116,KEY_F6: 117,KEY_F7: 118,KEY_F8: 119,KEY_F9: 120,KEY_F10: 121,KEY_F11: 122,KEY_F12: 123,KEY_F13: 124,KEY_F14: 125,KEY_F15: 126,KEY_NUM_LOCK: 144,KEY_SCROLL_LOCK: 145};this.revKeys = [];for(var key in this.keys){this.
revKeys[this.keys[key]] = key;}
+this.keys = {KEY_BACKSPACE: 8,KEY_TAB: 9,KEY_CLEAR: 12,KEY_ENTER: 13,KEY_SHIFT: 16,KEY_CTRL: 17,KEY_ALT: 18,KEY_PAUSE: 19,KEY_CAPS_LOCK: 20,KEY_ESCAPE: 27,KEY_SPACE: 32,KEY_PAGE_UP: 33,KEY_PAGE_DOWN: 34,KEY_END: 35,KEY_HOME: 36,KEY_LEFT_ARROW: 37,KEY_UP_ARROW: 38,KEY_RIGHT_ARROW: 39,KEY_DOWN_ARROW: 40,KEY_INSERT: 45,KEY_DELETE: 46,KEY_HELP: 47,KEY_LEFT_WINDOW: 91,KEY_RIGHT_WINDOW: 92,KEY_SELECT: 93,KEY_NUMPAD_0: 96,KEY_NUMPAD_1: 97,KEY_NUMPAD_2: 98,KEY_NUMPAD_3: 99,KEY_NUMPAD_4: 100,KEY_NUMPAD_5: 101,KEY_NUMPAD_6: 102,KEY_NUMPAD_7: 103,KEY_NUMPAD_8: 104,KEY_NUMPAD_9: 105,KEY_NUMPAD_MULTIPLY: 106,KEY_NUMPAD_PLUS: 107,KEY_NUMPAD_ENTER: 108,KEY_NUMPAD_MINUS: 109,KEY_NUMPAD_PERIOD: 110,KEY_NUMPAD_DIVIDE: 111,KEY_F1: 112,KEY_F2: 113,KEY_F3: 114,KEY_F4: 115,KEY_F5: 116,KEY_F6: 117,KEY_F7: 118,KEY_F8: 119,KEY_F9: 120,KEY_F10: 121,KEY_F11: 122,KEY_F12: 123,KEY_F13: 124,KEY_F14: 125,KEY_F15: 126,KEY_NUM_LOCK: 144,KEY_SCROLL_LOCK: 145
+};this.revKeys = [];for(var key in this.keys){this.revKeys[this.keys[key]] = key;}
this.fixEvent = function(evt, sender){if(!evt){if(window["event"]){evt = window.event;}}
if((evt["type"])&&(evt["type"].indexOf("key") == 0)){evt.keys = this.revKeys;for(var key in this.keys){evt[key] = this.keys[key];}
if(evt["type"] == "keydown" && dojo.render.html.ie){switch(evt.keyCode){case evt.KEY_SHIFT:
@@ -112,7 +115,8 @@
evt.key = evt.keyCode;break;default:
if(evt.ctrlKey || evt.altKey){var unifiedCharCode = evt.keyCode;if(unifiedCharCode >= 65 && unifiedCharCode <= 90 && evt.shiftKey == false){unifiedCharCode += 32;}
if(unifiedCharCode >= 1 && unifiedCharCode <= 26 && evt.ctrlKey){unifiedCharCode += 96;}
-evt.key = String.fromCharCode(unifiedCharCode);}}} else if(evt["type"] == "keypress"){if(dojo.render.html.opera){if(evt.which == 0){evt.key = evt.keyCode;}else if(evt.which > 0){switch(evt.which){case evt.KEY_SHIFT:
+evt.key = String.fromCharCode(unifiedCharCode);}}
+} else if(evt["type"] == "keypress"){if(dojo.render.html.opera){if(evt.which == 0){evt.key = evt.keyCode;}else if(evt.which > 0){switch(evt.which){case evt.KEY_SHIFT:
case evt.KEY_CTRL:
case evt.KEY_ALT:
case evt.KEY_CAPS_LOCK:
@@ -125,11 +129,13 @@
case evt.KEY_ESCAPE:
evt.key = evt.which;break;default:
var unifiedCharCode = evt.which;if((evt.ctrlKey || evt.altKey || evt.metaKey) && (evt.which >= 65 && evt.which <= 90 && evt.shiftKey == false)){unifiedCharCode += 32;}
-evt.key = String.fromCharCode(unifiedCharCode);}}}else if(dojo.render.html.ie){if(!evt.ctrlKey && !evt.altKey && evt.keyCode >= evt.KEY_SPACE){evt.key = String.fromCharCode(evt.keyCode);}}else if(dojo.render.html.safari){switch(evt.keyCode){case 25: evt.key = evt.KEY_TAB; evt.shift = true;break;case 63232: evt.key = evt.KEY_UP_ARROW; break;case 63233: evt.key = evt.KEY_DOWN_ARROW; break;case 63234: evt.key = evt.KEY_LEFT_ARROW; break;case 63235: evt.key = evt.KEY_RIGHT_ARROW; break;case 63236: evt.key = evt.KEY_F1; break;case 63237: evt.key = evt.KEY_F2; break;case 63238: evt.key = evt.KEY_F3; break;case 63239: evt.key = evt.KEY_F4; break;case 63240: evt.key = evt.KEY_F5; break;case 63241: evt.key = evt.KEY_F6; break;case 63242: evt.key = evt.KEY_F7; break;case 63243: evt.key = evt.KEY_F8; break;case 63244: evt.key = evt.KEY_F9; break;case 63245: evt.key = evt.KEY_F10; break;case 63246: evt.key = evt.KEY_F11; break;case 63247: evt.key = evt.KEY_F12; break;case 63250: evt.key
= evt.KEY_PAUSE; break;case 63272: evt.key = evt.KEY_DELETE; break;case 63273: evt.key = evt.KEY_HOME; break;case 63275: evt.key = evt.KEY_END; break;case 63276: evt.key = evt.KEY_PAGE_UP; break;case 63277: evt.key = evt.KEY_PAGE_DOWN; break;case 63302: evt.key = evt.KEY_INSERT; break;case 63248://prtscr
+evt.key = String.fromCharCode(unifiedCharCode);}}
+}else if(dojo.render.html.ie){if(!evt.ctrlKey && !evt.altKey && evt.keyCode >= evt.KEY_SPACE){evt.key = String.fromCharCode(evt.keyCode);}}else if(dojo.render.html.safari){switch(evt.keyCode){case 25: evt.key = evt.KEY_TAB; evt.shift = true;break;case 63232: evt.key = evt.KEY_UP_ARROW; break;case 63233: evt.key = evt.KEY_DOWN_ARROW; break;case 63234: evt.key = evt.KEY_LEFT_ARROW; break;case 63235: evt.key = evt.KEY_RIGHT_ARROW; break;case 63236: evt.key = evt.KEY_F1; break;case 63237: evt.key = evt.KEY_F2; break;case 63238: evt.key = evt.KEY_F3; break;case 63239: evt.key = evt.KEY_F4; break;case 63240: evt.key = evt.KEY_F5; break;case 63241: evt.key = evt.KEY_F6; break;case 63242: evt.key = evt.KEY_F7; break;case 63243: evt.key = evt.KEY_F8; break;case 63244: evt.key = evt.KEY_F9; break;case 63245: evt.key = evt.KEY_F10; break;case 63246: evt.key = evt.KEY_F11; break;case 63247: evt.key = evt.KEY_F12; break;case 63250: evt.key = evt.KEY_PAUSE; break;case 63272: evt.key = evt
.KEY_DELETE; break;case 63273: evt.key = evt.KEY_HOME; break;case 63275: evt.key = evt.KEY_END; break;case 63276: evt.key = evt.KEY_PAGE_UP; break;case 63277: evt.key = evt.KEY_PAGE_DOWN; break;case 63302: evt.key = evt.KEY_INSERT; break;case 63248://prtscr
case 63249://scrolllock
case 63289://numlock
break;default:
-evt.key = evt.charCode >= evt.KEY_SPACE ? String.fromCharCode(evt.charCode) : evt.keyCode;}}else{evt.key = evt.charCode > 0 ? String.fromCharCode(evt.charCode) : evt.keyCode;}}}
+evt.key = evt.charCode >= evt.KEY_SPACE ? String.fromCharCode(evt.charCode) : evt.keyCode;}}else{evt.key = evt.charCode > 0 ? String.fromCharCode(evt.charCode) : evt.keyCode;}}
+}
if(dojo.render.html.ie){if(!evt.target){ evt.target = evt.srcElement; }
if(!evt.currentTarget){ evt.currentTarget = (sender ? sender : evt.srcElement); }
if(!evt.layerX){ evt.layerX = evt.offsetX; }
@@ -140,4 +146,5 @@
if(evt.type == "mouseout"){ evt.relatedTarget = evt.toElement; }
this.currentEvent = evt;evt.callListener = this.callListener;evt.stopPropagation = this._stopPropagation;evt.preventDefault = this._preventDefault;}
return evt;}
-this.stopEvent = function(evt){if(window.event){evt.cancelBubble = true;evt.returnValue = false;}else{evt.preventDefault();evt.stopPropagation();}}}
+this.stopEvent = function(evt){if(window.event){evt.cancelBubble = true;evt.returnValue = false;}else{evt.preventDefault();evt.stopPropagation();}}
+}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/event/common.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/event/common.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/event/common.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/event/common.js Thu Dec 14 07:45:13 2006
@@ -1,5 +1,6 @@
-dojo.provide("dojo.event.common");dojo.require("dojo.lang.array");dojo.require("dojo.lang.extras");dojo.require("dojo.lang.func");dojo.event = new function(){this._canTimeout = dojo.lang.isFunction(dj_global["setTimeout"])||dojo.lang.isAlien(dj_global["setTimeout"]);function interpolateArgs(args, searchForNames){var dl = dojo.lang;var ao = {srcObj: dj_global,srcFunc: null,adviceObj: dj_global,adviceFunc: null,aroundObj: null,aroundFunc: null,adviceType: (args.length>2) ? args[0] : "after",precedence: "last",once: false,delay: null,rate: 0,adviceMsg: false,maxCalls: -1};switch(args.length){case 0: return;case 1: return;case 2:
+dojo.provide("dojo.event.common");dojo.require("dojo.lang.array");dojo.require("dojo.lang.extras");dojo.require("dojo.lang.func");dojo.event = new function(){this._canTimeout = dojo.lang.isFunction(dj_global["setTimeout"])||dojo.lang.isAlien(dj_global["setTimeout"]);function interpolateArgs(args, searchForNames){var dl = dojo.lang;var ao = {srcObj: dj_global,srcFunc: null,adviceObj: dj_global,adviceFunc: null,aroundObj: null,aroundFunc: null,adviceType: (args.length>2) ? args[0] : "after",precedence: "last",once: false,delay: null,rate: 0,adviceMsg: false,maxCalls: -1
+};switch(args.length){case 0: return;case 1: return;case 2:
ao.srcFunc = args[0];ao.adviceFunc = args[1];break;case 3:
if((dl.isObject(args[0]))&&(dl.isString(args[1]))&&(dl.isString(args[2]))){ao.adviceType = "after";ao.srcObj = args[0];ao.srcFunc = args[1];ao.adviceFunc = args[2];}else if((dl.isString(args[1]))&&(dl.isString(args[2]))){ao.srcFunc = args[1];ao.adviceFunc = args[2];}else if((dl.isObject(args[0]))&&(dl.isString(args[1]))&&(dl.isFunction(args[2]))){ao.adviceType = "after";ao.srcObj = args[0];ao.srcFunc = args[1];var tmpName = dl.nameAnonFunc(args[2], ao.adviceObj, searchForNames);ao.adviceFunc = tmpName;}else if((dl.isFunction(args[0]))&&(dl.isObject(args[1]))&&(dl.isString(args[2]))){ao.adviceType = "after";ao.srcObj = dj_global;var tmpName = dl.nameAnonFunc(args[0], ao.srcObj, searchForNames);ao.srcFunc = tmpName;ao.adviceObj = args[1];ao.adviceFunc = args[2];}
break;case 4:
@@ -25,7 +26,8 @@
tmpAO.srcObj = src;mjps.push(dojo.event.connect.call(dojo.event, tmpAO));});return mjps;}
var mjp = dojo.event.MethodJoinPoint.getForMethod(ao.srcObj, ao.srcFunc);if(ao.adviceFunc){var mjp2 = dojo.event.MethodJoinPoint.getForMethod(ao.adviceObj, ao.adviceFunc);}
mjp.kwAddAdvice(ao);return mjp;}
-this.log = function( a1, a2){var kwArgs;if((arguments.length == 1)&&(typeof a1 == "object")){kwArgs = a1;}else{kwArgs = {srcObj: a1,srcFunc: a2};}
+this.log = function( a1, a2){var kwArgs;if((arguments.length == 1)&&(typeof a1 == "object")){kwArgs = a1;}else{kwArgs = {srcObj: a1,srcFunc: a2
+};}
kwArgs.adviceFunc = function(){var argsStr = [];for(var x=0; x<arguments.length; x++){argsStr.push(arguments[x]);}
dojo.debug("("+kwArgs.srcObj+")."+kwArgs.srcFunc, ":", argsStr.join(", "));};this.kwConnect(kwArgs);}
this.connectBefore = function(){var args = ["before"];for(var i = 0; i < arguments.length; i++){ args.push(arguments[i]); }
@@ -55,7 +57,8 @@
(obj["nodeType"])||
(obj["addEventListener"]) ){isNode = true;dojo.event.browser.addClobberNodeAttrs(obj, [jpname, jpfuncname, funcName]);}}
var origArity = ofn.length;obj[jpfuncname] = ofn;joinpoint = obj[jpname] = new dojo.event.MethodJoinPoint(obj, jpfuncname);if(!isNode){obj[funcName] = function(){return joinpoint.run.apply(joinpoint, arguments);}}else{obj[funcName] = function(){var args = [];if(!arguments.length){var evt = null;try{if(obj.ownerDocument){evt = obj.ownerDocument.parentWindow.event;}else if(obj.documentElement){evt = obj.documentElement.ownerDocument.parentWindow.event;}else if(obj.event){evt = obj.event;}else{evt = window.event;}}catch(e){evt = window.event;}
-if(evt){args.push(dojo.event.browser.fixEvent(evt, this));}}else{for(var x=0; x<arguments.length; x++){if((x==0)&&(dojo.event.browser.isEvent(arguments[x]))){args.push(dojo.event.browser.fixEvent(arguments[x], this));}else{args.push(arguments[x]);}}}
+if(evt){args.push(dojo.event.browser.fixEvent(evt, this));}}else{for(var x=0; x<arguments.length; x++){if((x==0)&&(dojo.event.browser.isEvent(arguments[x]))){args.push(dojo.event.browser.fixEvent(arguments[x], this));}else{args.push(arguments[x]);}}
+}
return joinpoint.run.apply(joinpoint, args);}}
obj[funcName].__preJoinArity = origArity;}
return joinpoint;}
@@ -67,12 +70,13 @@
var undef;var to = {args: [],jp_: this,object: obj,proceed: function(){return callObj[callFunc].apply(callObj, to.args);}};to.args = aargs;var delay = parseInt(marr[4]);var hasDelay = ((!isNaN(delay))&&(marr[4]!==null)&&(typeof marr[4] != "undefined"));if(marr[5]){var rate = parseInt(marr[5]);var cur = new Date();var timerSet = false;if((marr["last"])&&((cur-marr.last)<=rate)){if(dojo.event._canTimeout){if(marr["delayTimer"]){clearTimeout(marr.delayTimer);}
var tod = parseInt(rate*2);var mcpy = dojo.lang.shallowCopy(marr);marr.delayTimer = setTimeout(function(){mcpy[5] = 0;unrollAdvice(mcpy);}, tod);}
return;}else{marr.last = cur;}}
-if(aroundFunc){aroundObj[aroundFunc].call(aroundObj, to);}else{if((hasDelay)&&((dojo.render.html)||(dojo.render.svg))){dj_global["setTimeout"](function(){if(msg){callObj[callFunc].call(callObj, to);}else{callObj[callFunc].apply(callObj, args);}}, delay);}else{if(msg){callObj[callFunc].call(callObj, to);}else{callObj[callFunc].apply(callObj, args);}}}};var unRollSquelch = function(){if(this.squelch){try{return unrollAdvice.apply(this, arguments);}catch(e){dojo.debug(e);}}else{return unrollAdvice.apply(this, arguments);}};if((this["before"])&&(this.before.length>0)){dojo.lang.forEach(this.before.concat(new Array()), unRollSquelch);}
+if(aroundFunc){aroundObj[aroundFunc].call(aroundObj, to);}else{if((hasDelay)&&((dojo.render.html)||(dojo.render.svg))){dj_global["setTimeout"](function(){if(msg){callObj[callFunc].call(callObj, to);}else{callObj[callFunc].apply(callObj, args);}}, delay);}else{if(msg){callObj[callFunc].call(callObj, to);}else{callObj[callFunc].apply(callObj, args);}}
+}};var unRollSquelch = function(){if(this.squelch){try{return unrollAdvice.apply(this, arguments);}catch(e){dojo.debug(e);}}else{return unrollAdvice.apply(this, arguments);}};if((this["before"])&&(this.before.length>0)){dojo.lang.forEach(this.before.concat(new Array()), unRollSquelch);}
var result;try{if((this["around"])&&(this.around.length>0)){var mi = new dojo.event.MethodInvocation(this, obj, args);result = mi.proceed();}else if(this.methodfunc){result = this.object[this.methodname].apply(this.object, args);}}catch(e){if(!this.squelch){dojo.debug(e,"when calling",this.methodname,"on",this.object,"with arguments",args);dojo.raise(e);}}
if((this["after"])&&(this.after.length>0)){dojo.lang.forEach(this.after.concat(new Array()), unRollSquelch);}
return (this.methodfunc) ? result : null;},getArr: function(kind){var type = "after";if((typeof kind == "string")&&(kind.indexOf("before")!=-1)){type = "before";}else if(kind=="around"){type = "around";}
if(!this[type]){ this[type] = []; }
-return this[type];},kwAddAdvice: function(args){this.addAdvice( args["adviceObj"], args["adviceFunc"],args["aroundObj"], args["aroundFunc"],args["adviceType"], args["precedence"],args["once"], args["delay"], args["rate"],args["adviceMsg"], args["maxCalls"]);},addAdvice: function( thisAdviceObj, thisAdvice,thisAroundObj, thisAround,adviceType, precedence,once, delay, rate, asMessage,maxCalls){var arr = this.getArr(adviceType);if(!arr){dojo.raise("bad this: " + this);}
+return this[type];},kwAddAdvice: function(args){this.addAdvice(args["adviceObj"], args["adviceFunc"],args["aroundObj"], args["aroundFunc"],args["adviceType"], args["precedence"],args["once"], args["delay"], args["rate"],args["adviceMsg"], args["maxCalls"]);},addAdvice: function(thisAdviceObj, thisAdvice,thisAroundObj, thisAround,adviceType, precedence,once, delay, rate, asMessage,maxCalls){var arr = this.getArr(adviceType);if(!arr){dojo.raise("bad this: " + this);}
var ao = [thisAdviceObj, thisAdvice, thisAroundObj, thisAround, delay, rate, asMessage, maxCalls];if(once){if(this.hasAdvice(thisAdviceObj, thisAdvice, adviceType, arr) >= 0){return;}}
if(precedence == "first"){arr.unshift(ao);}else{arr.push(ao);}},hasAdvice: function(thisAdviceObj, thisAdvice, adviceType, arr){if(!arr){ arr = this.getArr(adviceType); }
var ind = -1;for(var x=0; x<arr.length; x++){var aao = (typeof thisAdvice == "object") ? (new String(thisAdvice)).toString() : thisAdvice;var a1o = (typeof arr[x][1] == "object") ? (new String(arr[x][1])).toString() : arr[x][1];if((arr[x][0] == thisAdviceObj)&&(a1o == aao)){ind = x;}}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/event/topic.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/event/topic.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/event/topic.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/event/topic.js Thu Dec 14 07:45:13 2006
@@ -8,10 +8,12 @@
this.publishApply = function(topic, args){var topic = this.getTopic(topic);topic.sendMessage.apply(topic, args);}
this.publish = function(topic, message){var topic = this.getTopic(topic);var args = [];for(var x=1; x<arguments.length; x++){args.push(arguments[x]);}
topic.sendMessage.apply(topic, args);}}
-dojo.event.topic.TopicImpl = function(topicName){this.topicName = topicName;this.subscribe = function(listenerObject, listenerMethod){var tf = listenerMethod||listenerObject;var to = (!listenerMethod) ? dj_global : listenerObject;return dojo.event.kwConnect({srcObj: this,srcFunc: "sendMessage",adviceObj: to,adviceFunc: tf});}
-this.unsubscribe = function(listenerObject, listenerMethod){var tf = (!listenerMethod) ? listenerObject : listenerMethod;var to = (!listenerMethod) ? null : listenerObject;return dojo.event.kwDisconnect({srcObj: this,srcFunc: "sendMessage",adviceObj: to,adviceFunc: tf});}
+dojo.event.topic.TopicImpl = function(topicName){this.topicName = topicName;this.subscribe = function(listenerObject, listenerMethod){var tf = listenerMethod||listenerObject;var to = (!listenerMethod) ? dj_global : listenerObject;return dojo.event.kwConnect({srcObj:this,srcFunc:"sendMessage",adviceObj:to,adviceFunc: tf
+});}
+this.unsubscribe = function(listenerObject, listenerMethod){var tf = (!listenerMethod) ? listenerObject : listenerMethod;var to = (!listenerMethod) ? null : listenerObject;return dojo.event.kwDisconnect({srcObj:this,srcFunc:"sendMessage",adviceObj:to,adviceFunc: tf
+});}
this._getJoinPoint = function(){return dojo.event.MethodJoinPoint.getForMethod(this, "sendMessage");}
this.setSquelch = function(shouldSquelch){this._getJoinPoint().squelch = shouldSquelch;}
this.destroy = function(){this._getJoinPoint().disconnect();}
-this.registerPublisher = function( publisherObject,publisherMethod){dojo.event.connect(publisherObject, publisherMethod, this, "sendMessage");}
+this.registerPublisher = function(publisherObject,publisherMethod){dojo.event.connect(publisherObject, publisherMethod, this, "sendMessage");}
this.sendMessage = function(message){}}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/flash.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/flash.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/flash.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/flash.js Thu Dec 14 07:45:13 2006
@@ -4,20 +4,25 @@
if(fileInfo.flash6 != null && !dojo.lang.isUndefined(fileInfo.flash6)){this.flash6_version = fileInfo.flash6;}
if(fileInfo.flash8 != null && !dojo.lang.isUndefined(fileInfo.flash8)){this.flash8_version = fileInfo.flash8;}
if(!dojo.lang.isUndefined(fileInfo.visible)){this._visible = fileInfo.visible;}
-this._initialize();},useFlash6: function(){if(this.flash6_version == null){return false;}else if (this.flash6_version != null && dojo.flash.info.commVersion == 6){return true;}else{return false;}},useFlash8: function(){if(this.flash8_version == null){return false;}else if (this.flash8_version != null && dojo.flash.info.commVersion == 8){return true;}else{return false;}},addLoadedListener: function( listener){this._loadedListeners.push(listener);},addInstallingListener: function( listener){this._installingListeners.push(listener);},loaded: function(){dojo.flash.ready = true;if(dojo.flash._loadedListeners.length > 0){for(var i = 0;i < dojo.flash._loadedListeners.length; i++){dojo.flash._loadedListeners[i].call(null);}}},installing: function(){if(dojo.flash._installingListeners.length > 0){for(var i = 0; i < dojo.flash._installingListeners.length; i++){dojo.flash._installingListeners[i].call(null);}}},_initialize: function(){var installer = new dojo.flash.Install();dojo.flash.i
nstaller = installer;if(installer.needed() == true){installer.install();}else{dojo.flash.obj = new dojo.flash.Embed(this._visible);dojo.flash.obj.write(dojo.flash.info.commVersion);dojo.flash.comm = new dojo.flash.Communicator();}}};dojo.flash.Info = function(){if(dojo.render.html.ie){document.writeln('<script language="VBScript" type="text/vbscript"\>');document.writeln('Function VBGetSwfVer(i)');document.writeln(' on error resume next');document.writeln(' Dim swControl, swVersion');document.writeln(' swVersion = 0');document.writeln(' set swControl = CreateObject("ShockwaveFlash.ShockwaveFlash." + CStr(i))');document.writeln(' if (IsObject(swControl)) then');document.writeln(' swVersion = swControl.GetVariable("$version")');document.writeln(' end if');document.writeln(' VBGetSwfVer = swVersion');document.writeln('End Function');document.writeln('</script\>');}
+this._initialize();},useFlash6: function(){if(this.flash6_version == null){return false;}else if (this.flash6_version != null && dojo.flash.info.commVersion == 6){return true;}else{return false;}},useFlash8: function(){if(this.flash8_version == null){return false;}else if (this.flash8_version != null && dojo.flash.info.commVersion == 8){return true;}else{return false;}},addLoadedListener: function( listener){this._loadedListeners.push(listener);},addInstallingListener: function( listener){this._installingListeners.push(listener);},loaded: function(){dojo.flash.ready = true;if(dojo.flash._loadedListeners.length > 0){for(var i = 0;i < dojo.flash._loadedListeners.length; i++){dojo.flash._loadedListeners[i].call(null);}}
+},installing: function(){if(dojo.flash._installingListeners.length > 0){for(var i = 0; i < dojo.flash._installingListeners.length; i++){dojo.flash._installingListeners[i].call(null);}}
+},_initialize: function(){var installer = new dojo.flash.Install();dojo.flash.installer = installer;if(installer.needed() == true){installer.install();}else{dojo.flash.obj = new dojo.flash.Embed(this._visible);dojo.flash.obj.write(dojo.flash.info.commVersion);dojo.flash.comm = new dojo.flash.Communicator();}}
+};dojo.flash.Info = function(){if(dojo.render.html.ie){document.writeln('<script language="VBScript" type="text/vbscript"\>');document.writeln('Function VBGetSwfVer(i)');document.writeln(' on error resume next');document.writeln(' Dim swControl, swVersion');document.writeln(' swVersion = 0');document.writeln(' set swControl = CreateObject("ShockwaveFlash.ShockwaveFlash." + CStr(i))');document.writeln(' if (IsObject(swControl)) then');document.writeln(' swVersion = swControl.GetVariable("$version")');document.writeln(' end if');document.writeln(' VBGetSwfVer = swVersion');document.writeln('End Function');document.writeln('</script\>');}
this._detectVersion();this._detectCommunicationVersion();}
dojo.flash.Info.prototype = {version: -1,versionMajor: -1,versionMinor: -1,versionRevision: -1,capable: false,commVersion: 6,installing: false,isVersionOrAbove: function(
reqMajorVer,reqMinorVer,reqVer){reqVer = parseFloat("." + reqVer);if(this.versionMajor >= reqMajorVer && this.versionMinor >= reqMinorVer
&& this.versionRevision >= reqVer){return true;}else{return false;}},_detectVersion: function(){var versionStr;for(var testVersion = 25; testVersion > 0; testVersion--){if(dojo.render.html.ie){versionStr = VBGetSwfVer(testVersion);}else{versionStr = this._JSFlashInfo(testVersion);}
if(versionStr == -1 ){this.capable = false;return;}else if(versionStr != 0){var versionArray;if(dojo.render.html.ie){var tempArray = versionStr.split(" ");var tempString = tempArray[1];versionArray = tempString.split(",");}else{versionArray = versionStr.split(".");}
-this.versionMajor = versionArray[0];this.versionMinor = versionArray[1];this.versionRevision = versionArray[2];var versionString = this.versionMajor + "." + this.versionRevision;this.version = parseFloat(versionString);this.capable = true;break;}}},_JSFlashInfo: function(testVersion){if(navigator.plugins != null && navigator.plugins.length > 0){if(navigator.plugins["Shockwave Flash 2.0"] ||
+this.versionMajor = versionArray[0];this.versionMinor = versionArray[1];this.versionRevision = versionArray[2];var versionString = this.versionMajor + "." + this.versionRevision;this.version = parseFloat(versionString);this.capable = true;break;}}
+},_JSFlashInfo: function(testVersion){if(navigator.plugins != null && navigator.plugins.length > 0){if(navigator.plugins["Shockwave Flash 2.0"] ||
navigator.plugins["Shockwave Flash"]){var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;var descArray = flashDescription.split(" ");var tempArrayMajor = descArray[2].split(".");var versionMajor = tempArrayMajor[0];var versionMinor = tempArrayMajor[1];if(descArray[3] != ""){var tempArrayMinor = descArray[3].split("r");}else{var tempArrayMinor = descArray[4].split("r");}
var versionRevision = tempArrayMinor[1] > 0 ? tempArrayMinor[1] : 0;var version = versionMajor + "." + versionMinor + "."
+ versionRevision;return version;}}
return -1;},_detectCommunicationVersion: function(){if(this.capable == false){this.commVersion = null;return;}
if (typeof djConfig["forceFlashComm"] != "undefined" &&
typeof djConfig["forceFlashComm"] != null){this.commVersion = djConfig["forceFlashComm"];return;}
-if(dojo.render.html.safari == true || dojo.render.html.opera == true){this.commVersion = 8;}else{this.commVersion = 6;}}};dojo.flash.Embed = function(visible){this._visible = visible;}
+if(dojo.render.html.safari == true || dojo.render.html.opera == true){this.commVersion = 8;}else{this.commVersion = 6;}}
+};dojo.flash.Embed = function(visible){this._visible = visible;}
dojo.flash.Embed.prototype = {width: 215,height: 138,id: "flashObject",_visible: true,protocol: function(){switch(window.location.protocol){case "https:":
return "https";break;default:
return "http";break;}},write: function( flashVer, doExpressInstall){if(dojo.lang.isUndefined(doExpressInstall)){doExpressInstall = false;}
@@ -105,5 +110,6 @@
+" Flash Player.");window.location.href = dojo.flash.Embed.protocol() +
"://www.macromedia.com/go/getflashplayer";}else if (msg == "Download.Failed"){alert("There was an error downloading the Flash Player update. "
+ "Please try again later, or visit macromedia.com to download "
-+ "the latest version of the Flash plugin.");}}}
++ "the latest version of the Flash plugin.");}}
+}
dojo.flash.info = new dojo.flash.Info();