You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/12/14 16:45:26 UTC

svn commit: r487242 [10/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...

Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/i18n/cldr/nls/zh/gregorian.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/i18n/cldr/nls/zh/gregorian.js?view=auto&rev=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/i18n/cldr/nls/zh/gregorian.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/i18n/cldr/nls/zh/gregorian.js Thu Dec 14 07:45:13 2006
@@ -0,0 +1,2 @@
+
+({"days-standAlone-narrow":["日","一","二","三","四","五","六"],"eras":["公元前","公元"],"am":"上午","months-format-abbr":["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],"days-format-abbr":["周日","周一","周二","周三","周四","周五","周六"],"pm":"下午","months-format-wide":["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],"months-standAlone-narrow":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"days-format-wide":["星期日","星期一","星期二","星期三",
 "星期四","星期五","星期六"],"field-weekday":"Day of the Week","dateFormat-medium":"yyyy MMM d","field-second":"Second","field-week":"Week","timeFormat-full":"HH:mm:ss z","field-year":"Year","field-minute":"Minute","timeFormat-medium":"HH:mm:ss","field-hour":"Hour","dateFormat-long":"yyyy MMMM d","field-day":"Day","field-dayperiod":"Dayperiod","field-month":"Month","dateFormat-short":"yy/MM/dd","field-era":"Era","timeFormat-short":"HH:mm","timeFormat-long":"HH:mm:ss z","dateFormat-full":"EEEE, yyyy MMMM dd","field-zone":"Zone"})
\ No newline at end of file

Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/i18n/cldr/nls/zh/gregorian.js
------------------------------------------------------------------------------
    svn:eol-style = native

Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/i18n/cldr/nls/zh/gregorianExtras.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/i18n/cldr/nls/zh/gregorianExtras.js?view=auto&rev=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/i18n/cldr/nls/zh/gregorianExtras.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/i18n/cldr/nls/zh/gregorianExtras.js Thu Dec 14 07:45:13 2006
@@ -0,0 +1,2 @@
+
+({"dateFormat-yearOnly":"yyyy'å¹´'"})
\ No newline at end of file

Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/i18n/cldr/nls/zh/gregorianExtras.js
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/BrowserIO.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/BrowserIO.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/BrowserIO.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/BrowserIO.js Thu Dec 14 07:45:13 2006
@@ -10,38 +10,46 @@
 dojo.io.encodeForm = function(formNode, encoding, formFilter){if((!formNode)||(!formNode.tagName)||(!formNode.tagName.toLowerCase() == "form")){dojo.raise("Attempted to encode a non-form element.");}
 if(!formFilter) { formFilter = dojo.io.formFilter; }
 var enc = /utf/i.test(encoding||"") ? encodeURIComponent : dojo.string.encodeAscii;var values = [];for(var i = 0; i < formNode.elements.length; i++){var elm = formNode.elements[i];if(!elm || elm.tagName.toLowerCase() == "fieldset" || !formFilter(elm)) { continue; }
-var name = enc(elm.name);var type = elm.type.toLowerCase();if(type == "select-multiple"){for(var j = 0; j < elm.options.length; j++){if(elm.options[j].selected) {values.push(name + "=" + enc(elm.options[j].value));}}}else if(dojo.lang.inArray(["radio", "checkbox"], type)){if(elm.checked){values.push(name + "=" + enc(elm.value));}}else{values.push(name + "=" + enc(elm.value));}}
+var name = enc(elm.name);var type = elm.type.toLowerCase();if(type == "select-multiple"){for(var j = 0; j < elm.options.length; j++){if(elm.options[j].selected) {values.push(name + "=" + enc(elm.options[j].value));}}
+}else if(dojo.lang.inArray(["radio", "checkbox"], type)){if(elm.checked){values.push(name + "=" + enc(elm.value));}}else{values.push(name + "=" + enc(elm.value));}}
 var inputs = formNode.getElementsByTagName("input");for(var i = 0; i < inputs.length; i++) {var input = inputs[i];if(input.type.toLowerCase() == "image" && input.form == formNode
 && formFilter(input)) {var name = enc(input.name);values.push(name + "=" + enc(input.value));values.push(name + ".x=0");values.push(name + ".y=0");}}
 return values.join("&") + "&";}
 dojo.io.FormBind = function(args) {this.bindArgs = {};if(args && args.formNode) {this.init(args);} else if(args) {this.init({formNode: args});}}
 dojo.lang.extend(dojo.io.FormBind, {form: null,bindArgs: null,clickedButton: null,init: function(args) {var form = dojo.byId(args.formNode);if(!form || !form.tagName || form.tagName.toLowerCase() != "form") {throw new Error("FormBind: Couldn't apply, invalid form");} else if(this.form == form) {return;} else if(this.form) {throw new Error("FormBind: Already applied to a form");}
 dojo.lang.mixin(this.bindArgs, args);this.form = form;this.connect(form, "onsubmit", "submit");for(var i = 0; i < form.elements.length; i++) {var node = form.elements[i];if(node && node.type && dojo.lang.inArray(["submit", "button"], node.type.toLowerCase())) {this.connect(node, "onclick", "click");}}
-var inputs = form.getElementsByTagName("input");for(var i = 0; i < inputs.length; i++) {var input = inputs[i];if(input.type.toLowerCase() == "image" && input.form == form) {this.connect(input, "onclick", "click");}}},onSubmit: function(form) {return true;},submit: function(e) {e.preventDefault();if(this.onSubmit(this.form)) {dojo.io.bind(dojo.lang.mixin(this.bindArgs, {formFilter: dojo.lang.hitch(this, "formFilter")}));}},click: function(e) {var node = e.currentTarget;if(node.disabled) { return; }
+var inputs = form.getElementsByTagName("input");for(var i = 0; i < inputs.length; i++) {var input = inputs[i];if(input.type.toLowerCase() == "image" && input.form == form) {this.connect(input, "onclick", "click");}}
+},onSubmit: function(form) {return true;},submit: function(e) {e.preventDefault();if(this.onSubmit(this.form)) {dojo.io.bind(dojo.lang.mixin(this.bindArgs, {formFilter: dojo.lang.hitch(this, "formFilter")
+}));}},click: function(e) {var node = e.currentTarget;if(node.disabled) { return; }
 this.clickedButton = node;},formFilter: function(node) {var type = (node.type||"").toLowerCase();var accept = false;if(node.disabled || !node.name) {accept = false;} else if(dojo.lang.inArray(["submit", "button", "image"], type)) {if(!this.clickedButton) { this.clickedButton = node; }
 accept = node == this.clickedButton;} else {accept = !dojo.lang.inArray(["file", "submit", "reset", "button"], type);}
 return accept;},connect: function(srcObj, srcFcn, targetFcn) {if(dojo.evalObjPath("dojo.event.connect")) {dojo.event.connect(srcObj, srcFcn, this, targetFcn);} else {var fcn = dojo.lang.hitch(this, targetFcn);srcObj[srcFcn] = function(e) {if(!e) { e = window.event; }
 if(!e.currentTarget) { e.currentTarget = e.srcElement; }
 if(!e.preventDefault) { e.preventDefault = function() { window.event.returnValue = false; }}
-fcn(e);}}}});dojo.io.XMLHTTPTransport = new function(){var _this = this;var _cache = {};this.useCache = false;this.preventCache = false;function getCacheKey(url, query, method) {return url + "|" + query + "|" + method.toLowerCase();}
+fcn(e);}}
+}});dojo.io.XMLHTTPTransport = new function(){var _this = this;var _cache = {};this.useCache = false;this.preventCache = false;function getCacheKey(url, query, method) {return url + "|" + query + "|" + method.toLowerCase();}
 function addToCache(url, query, method, http) {_cache[getCacheKey(url, query, method)] = http;}
 function getFromCache(url, query, method) {return _cache[getCacheKey(url, query, method)];}
 this.clearCache = function() {_cache = {};}
-function doLoad(kwArgs, http, url, query, useCache) {if(	((http.status>=200)&&(http.status<300))||
+function doLoad(kwArgs, http, url, query, useCache) {if(((http.status>=200)&&(http.status<300))||
 (http.status==304)||
 (location.protocol=="file:" && (http.status==0 || http.status==undefined))||
 (location.protocol=="chrome:" && (http.status==0 || http.status==undefined))
 ){var ret;if(kwArgs.method.toLowerCase() == "head"){var headers = http.getAllResponseHeaders();ret = {};ret.toString = function(){ return headers; }
-var values = headers.split(/[\r\n]+/g);for(var i = 0; i < values.length; i++) {var pair = values[i].match(/^([^:]+)\s*:\s*(.+)$/i);if(pair) {ret[pair[1]] = pair[2];}}}else if(kwArgs.mimetype == "text/javascript"){try{ret = dj_eval(http.responseText);}catch(e){dojo.debug(e);dojo.debug(http.responseText);ret = null;}}else if(kwArgs.mimetype == "text/json" || kwArgs.mimetype == "application/json"){try{ret = dj_eval("("+http.responseText+")");}catch(e){dojo.debug(e);dojo.debug(http.responseText);ret = false;}}else if((kwArgs.mimetype == "application/xml")||
+var values = headers.split(/[\r\n]+/g);for(var i = 0; i < values.length; i++) {var pair = values[i].match(/^([^:]+)\s*:\s*(.+)$/i);if(pair) {ret[pair[1]] = pair[2];}}
+}else if(kwArgs.mimetype == "text/javascript"){try{ret = dj_eval(http.responseText);}catch(e){dojo.debug(e);dojo.debug(http.responseText);ret = null;}}else if(kwArgs.mimetype == "text/json" || kwArgs.mimetype == "application/json"){try{ret = dj_eval("("+http.responseText+")");}catch(e){dojo.debug(e);dojo.debug(http.responseText);ret = false;}}else if((kwArgs.mimetype == "application/xml")||
 (kwArgs.mimetype == "text/xml")){ret = http.responseXML;if(!ret || typeof ret == "string" || !http.getResponseHeader("Content-Type")) {ret = dojo.dom.createDocumentFromText(http.responseText);}}else{ret = http.responseText;}
 if(useCache){addToCache(url, query, kwArgs.method, http);}
 kwArgs[(typeof kwArgs.load == "function") ? "load" : "handle"]("load", ret, http, kwArgs);}else{var errObj = new dojo.io.Error("XMLHttpTransport Error: "+http.status+" "+http.statusText);kwArgs[(typeof kwArgs.error == "function") ? "error" : "handle"]("error", errObj, http, kwArgs);}}
-function setHeaders(http, kwArgs){if(kwArgs["headers"]) {for(var header in kwArgs["headers"]) {if(header.toLowerCase() == "content-type" && !kwArgs["contentType"]) {kwArgs["contentType"] = kwArgs["headers"][header];} else {http.setRequestHeader(header, kwArgs["headers"][header]);}}}}
+function setHeaders(http, kwArgs){if(kwArgs["headers"]) {for(var header in kwArgs["headers"]) {if(header.toLowerCase() == "content-type" && !kwArgs["contentType"]) {kwArgs["contentType"] = kwArgs["headers"][header];} else {http.setRequestHeader(header, kwArgs["headers"][header]);}}
+}}
 this.inFlight = [];this.inFlightTimer = null;this.startWatchingInFlight = function(){if(!this.inFlightTimer){this.inFlightTimer = setTimeout("dojo.io.XMLHTTPTransport.watchInFlight();", 10);}}
 this.watchInFlight = function(){var now = null;if(!dojo.hostenv._blockAsync && !_this._blockAsync){for(var x=this.inFlight.length-1; x>=0; x--){try{var tif = this.inFlight[x];if(!tif || tif.http._aborted || !tif.http.readyState){this.inFlight.splice(x, 1); continue;}
 if(4==tif.http.readyState){this.inFlight.splice(x, 1);doLoad(tif.req, tif.http, tif.url, tif.query, tif.useCache);}else if (tif.startTime){if(!now){now = (new Date()).getTime();}
 if(tif.startTime + (tif.req.timeoutSeconds * 1000) < now){if(typeof tif.http.abort == "function"){tif.http.abort();}
-this.inFlight.splice(x, 1);tif.req[(typeof tif.req.timeout == "function") ? "timeout" : "handle"]("timeout", null, tif.http, tif.req);}}}catch(e){try{var errObj = new dojo.io.Error("XMLHttpTransport.watchInFlight Error: " + e);tif.req[(typeof tif.req.error == "function") ? "error" : "handle"]("error", errObj, tif.http, tif.req);}catch(e2){dojo.debug("XMLHttpTransport error callback failed: " + e2);}}}}
+this.inFlight.splice(x, 1);tif.req[(typeof tif.req.timeout == "function") ? "timeout" : "handle"]("timeout", null, tif.http, tif.req);}}
+}catch(e){try{var errObj = new dojo.io.Error("XMLHttpTransport.watchInFlight Error: " + e);tif.req[(typeof tif.req.error == "function") ? "error" : "handle"]("error", errObj, tif.http, tif.req);}catch(e2){dojo.debug("XMLHttpTransport error callback failed: " + e2);}}
+}}
 clearTimeout(this.inFlightTimer);if(this.inFlight.length == 0){this.inFlightTimer = null;return;}
 this.inFlightTimer = setTimeout("dojo.io.XMLHTTPTransport.watchInFlight();", 10);}
 var hasXmlHttp = dojo.hostenv.getXmlhttpObject() ? true : false;this.canHandle = function(kwArgs){return hasXmlHttp
@@ -59,13 +67,15 @@
 do {if(kwArgs.postContent){query = kwArgs.postContent;break;}
 if(content) {query += dojo.io.argsFromMap(content, kwArgs.encoding);}
 if(kwArgs.method.toLowerCase() == "get" || !kwArgs.multipart){break;}
-var	t = [];if(query.length){var q = query.split("&");for(var i = 0; i < q.length; ++i){if(q[i].length){var p = q[i].split("=");t.push(	"--" + this.multipartBoundary,"Content-Disposition: form-data; name=\"" + p[0] + "\"","",p[1]);}}}
-if(kwArgs.file){if(dojo.lang.isArray(kwArgs.file)){for(var i = 0; i < kwArgs.file.length; ++i){var o = kwArgs.file[i];t.push(	"--" + this.multipartBoundary,"Content-Disposition: form-data; name=\"" + o.name + "\"; filename=\"" + ("fileName" in o ? o.fileName : o.name) + "\"","Content-Type: " + ("contentType" in o ? o.contentType : "application/octet-stream"),"",o.content);}}else{var o = kwArgs.file;t.push(	"--" + this.multipartBoundary,"Content-Disposition: form-data; name=\"" + o.name + "\"; filename=\"" + ("fileName" in o ? o.fileName : o.name) + "\"","Content-Type: " + ("contentType" in o ? o.contentType : "application/octet-stream"),"",o.content);}}
+vart = [];if(query.length){var q = query.split("&");for(var i = 0; i < q.length; ++i){if(q[i].length){var p = q[i].split("=");t.push("--" + this.multipartBoundary,"Content-Disposition: form-data; name=\"" + p[0] + "\"","",p[1]);}}
+}
+if(kwArgs.file){if(dojo.lang.isArray(kwArgs.file)){for(var i = 0; i < kwArgs.file.length; ++i){var o = kwArgs.file[i];t.push("--" + this.multipartBoundary,"Content-Disposition: form-data; name=\"" + o.name + "\"; filename=\"" + ("fileName" in o ? o.fileName : o.name) + "\"","Content-Type: " + ("contentType" in o ? o.contentType : "application/octet-stream"),"",o.content);}}else{var o = kwArgs.file;t.push("--" + this.multipartBoundary,"Content-Disposition: form-data; name=\"" + o.name + "\"; filename=\"" + ("fileName" in o ? o.fileName : o.name) + "\"","Content-Type: " + ("contentType" in o ? o.contentType : "application/octet-stream"),"",o.content);}}
 if(t.length){t.push("--"+this.multipartBoundary+"--", "");query = t.join("\r\n");}}while(false);var async = kwArgs["sync"] ? false : true;var preventCache = kwArgs["preventCache"] ||
 (this.preventCache == true && kwArgs["preventCache"] != false);var useCache = kwArgs["useCache"] == true ||
 (this.useCache == true && kwArgs["useCache"] != false );if(!preventCache && useCache){var cachedHttp = getFromCache(url, query, kwArgs.method);if(cachedHttp){doLoad(kwArgs, cachedHttp, url, query, false);return;}}
 var http = dojo.hostenv.getXmlhttpObject(kwArgs);var received = false;if(async){var startTime =
-this.inFlight.push({"req":		kwArgs,"http":		http,"url":	 	url,"query":	query,"useCache":	useCache,"startTime": kwArgs.timeoutSeconds ? (new Date()).getTime() : 0});this.startWatchingInFlight();}else{_this._blockAsync = true;}
+this.inFlight.push({"req":kwArgs,"http":http,"url": url,"query":query,"useCache":useCache,"startTime": kwArgs.timeoutSeconds ? (new Date()).getTime() : 0
+});this.startWatchingInFlight();}else{_this._blockAsync = true;}
 if(kwArgs.method.toLowerCase() == "post"){if (!kwArgs.user) {http.open("POST", url, async);}else{http.open("POST", url, async, kwArgs.user, kwArgs.password);}
 setHeaders(http, kwArgs);http.setRequestHeader("Content-Type", kwArgs.multipart ? ("multipart/form-data; boundary=" + this.multipartBoundary) :
 (kwArgs.contentType || "application/x-www-form-urlencoded"));try{http.send(query);}catch(e){if(typeof http.abort == "function"){http.abort();}
@@ -73,7 +83,7 @@
 if(preventCache) {tmpUrl += (dojo.string.endsWithAny(tmpUrl, "?", "&")
 ? "" : (tmpUrl.indexOf("?") > -1 ? "&" : "?")) + "dojo.preventCache=" + new Date().valueOf();}
 if (!kwArgs.user) {http.open(kwArgs.method.toUpperCase(), tmpUrl, async);}else{http.open(kwArgs.method.toUpperCase(), tmpUrl, async, kwArgs.user, kwArgs.password);}
-setHeaders(http, kwArgs);try {http.send(null);}catch(e)	{if(typeof http.abort == "function"){http.abort();}
+setHeaders(http, kwArgs);try {http.send(null);}catch(e){if(typeof http.abort == "function"){http.abort();}
 doLoad(kwArgs, {status: 404}, url, query, useCache);}}
 if( !async ) {doLoad(kwArgs, http, url, query, useCache);_this._blockAsync = false;}
 kwArgs.abort = function(){try{http._aborted = true;}catch(e){}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/IframeIO.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/IframeIO.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/IframeIO.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/IframeIO.js Thu Dec 14 07:45:13 2006
@@ -9,13 +9,14 @@
 dojo.io.IframeTransport = new function(){var _this = this;this.currentRequest = null;this.requestQueue = [];this.iframeName = "dojoIoIframe";this.fireNextRequest = function(){try{if((this.currentRequest)||(this.requestQueue.length == 0)){ return; }
 var cr = this.currentRequest = this.requestQueue.shift();cr._contentToClean = [];var fn = cr["formNode"];var content = cr["content"] || {};if(cr.sendTransport) {content["dojo.transport"] = "iframe";}
 if(fn){if(content){for(var x in content){if(!fn[x]){var tn;if(dojo.render.html.ie){tn = document.createElement("<input type='hidden' name='"+x+"' value='"+content[x]+"'>");fn.appendChild(tn);}else{tn = document.createElement("input");fn.appendChild(tn);tn.type = "hidden";tn.name = x;tn.value = content[x];}
-cr._contentToClean.push(x);}else{fn[x].value = content[x];}}}
+cr._contentToClean.push(x);}else{fn[x].value = content[x];}}
+}
 if(cr["url"]){cr._originalAction = fn.getAttribute("action");fn.setAttribute("action", cr.url);}
 if(!fn.getAttribute("method")){fn.setAttribute("method", (cr["method"]) ? cr["method"] : "post");}
 cr._originalTarget = fn.getAttribute("target");fn.setAttribute("target", this.iframeName);fn.target = this.iframeName;fn.submit();}else{var query = dojo.io.argsFromMap(this.currentRequest.content);var tmpUrl = cr.url + (cr.url.indexOf("?") > -1 ? "&" : "?") + query;dojo.io.setIFrameSrc(this.iframe, tmpUrl, true);}}catch(e){this.iframeOnload(e);}}
 this.canHandle = function(kwArgs){return (
 (
-dojo.lang.inArray([	"text/plain", "text/html", "text/javascript", "text/json", "application/json"], kwArgs["mimetype"])
+dojo.lang.inArray(["text/plain", "text/html", "text/javascript", "text/json", "application/json"], kwArgs["mimetype"])
 )&&(
 dojo.lang.inArray(["post", "get"], kwArgs["method"].toLowerCase())
 )&&(
@@ -26,7 +27,8 @@
 this.requestQueue.push(kwArgs);this.fireNextRequest();return;}
 this.setUpIframe = function(){this.iframe = dojo.io.createIFrame(this.iframeName, "dojo.io.IframeTransport.iframeOnload();");}
 this.iframeOnload = function(errorObject ){if(!_this.currentRequest){_this.fireNextRequest();return;}
-var req = _this.currentRequest;if(req.formNode){var toClean = req._contentToClean;for(var i = 0; i < toClean.length; i++) {var key = toClean[i];if(dojo.render.html.safari){var fNode = req.formNode;for(var j = 0; j < fNode.childNodes.length; j++){var chNode = fNode.childNodes[j];if(chNode.name == key){var pNode = chNode.parentNode;pNode.removeChild(chNode);break;}}}else{var input = req.formNode[key];req.formNode.removeChild(input);req.formNode[key] = null;}}
+var req = _this.currentRequest;if(req.formNode){var toClean = req._contentToClean;for(var i = 0; i < toClean.length; i++) {var key = toClean[i];if(dojo.render.html.safari){var fNode = req.formNode;for(var j = 0; j < fNode.childNodes.length; j++){var chNode = fNode.childNodes[j];if(chNode.name == key){var pNode = chNode.parentNode;pNode.removeChild(chNode);break;}}
+}else{var input = req.formNode[key];req.formNode.removeChild(input);req.formNode[key] = null;}}
 if(req["_originalAction"]){req.formNode.setAttribute("action", req._originalAction);}
 if(req["_originalTarget"]){req.formNode.setAttribute("target", req._originalTarget);req.formNode.target = req._originalTarget;}}
 var contentDoc = function(iframe_el){var doc = iframe_el.contentDocument ||

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/RepubsubIO.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/RepubsubIO.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/RepubsubIO.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/RepubsubIO.js Thu Dec 14 07:45:13 2006
@@ -10,7 +10,7 @@
 this.userid = "guest";this.tunnelID = this.getRandStr();this.attachPathList = [];this.topics = [];this.parseGetStr = function(){var baseUrl = document.location.toString();var params = baseUrl.split("?", 2);if(params.length > 1){var paramStr = params[1];var pairs = paramStr.split("&");var opts = [];for(var x in pairs){var sp = pairs[x].split("=");try{opts[sp[0]]=eval(sp[1]);}catch(e){opts[sp[0]]=sp[1];}}
 return opts;}else{return [];}}
 var getOpts = this.parseGetStr();for(var x in getOpts){this[x] = getOpts[x];}
-if(!this["tunnelURI"]){this.tunnelURI = [	"/who/", escape(this.userid), "/s/",this.getRandStr(), "/kn_journal"].join("");}
+if(!this["tunnelURI"]){this.tunnelURI = ["/who/", escape(this.userid), "/s/",this.getRandStr(), "/kn_journal"].join("");}
 if(window["repubsubOpts"]||window["rpsOpts"]){var optObj = window["repubsubOpts"]||window["rpsOpts"];for(var x in optObj){this[x] = optObj[x];}}
 this.tunnelCloseCallback = function(){dojo.io.setIFrameSrc(this.rcvNode, this.initDoc+"?callback=repubsub.rcvNodeReady&domain="+document.domain);}
 this.receiveEventFromTunnel = function(evt, srcWindow){if(!evt["elements"]){this.log("bailing! event received without elements!", "error");return;}
@@ -38,26 +38,31 @@
 [this.tunnelFrameKey,this.rcvNodeName],["path","/"]
 ], false
 );this.rcvNode = dojo.io.createIFrame(this.rcvNodeName);dojo.io.setIFrameSrc(this.rcvNode, this.initDoc+"?callback=repubsub.rcvNodeReady&domain="+document.domain);this.sndNodeName = "sndIFrame_"+this.getRandStr();this.sndNode = dojo.io.createIFrame(this.sndNodeName);dojo.io.setIFrameSrc(this.sndNode, this.initDoc+"?callback=repubsub.sndNodeReady&domain="+document.domain);}
-this.rcvNodeReady = function(){var statusURI = [this.tunnelURI, '/kn_status/', this.getRandStr(), '_',String(this.tunnelInitCount++)].join("");this.log("rcvNodeReady");var initURIArr = [	this.serverBaseURL, "/kn?kn_from=", escape(this.tunnelURI),"&kn_id=", escape(this.tunnelID), "&kn_status_from=",escape(statusURI)];dojo.io.setIFrameSrc(this.rcvNode, initURIArr.join(""));this.subscribe(statusURI, this, "statusListener", true);this.log(initURIArr.join(""));}
+this.rcvNodeReady = function(){var statusURI = [this.tunnelURI, '/kn_status/', this.getRandStr(), '_',String(this.tunnelInitCount++)].join("");this.log("rcvNodeReady");var initURIArr = [this.serverBaseURL, "/kn?kn_from=", escape(this.tunnelURI),"&kn_id=", escape(this.tunnelID), "&kn_status_from=",escape(statusURI)];dojo.io.setIFrameSrc(this.rcvNode, initURIArr.join(""));this.subscribe(statusURI, this, "statusListener", true);this.log(initURIArr.join(""));}
 this.sndNodeReady = function(){this.canSnd = true;this.log("sndNodeReady");this.log(this.backlog.length);if(this.backlog.length > 0){this.dequeueEvent();}}
 this.statusListener = function(evt){this.log("status listener called");this.log(evt.status, "info");}
 this.dispatch = function(evt){if(evt["to"]||evt["kn_routed_from"]){var rf = evt["to"]||evt["kn_routed_from"];var topic = rf.split(this.serverBaseURL, 2)[1];if(!topic){topic = rf;}
 this.log("[topic] "+topic);if(topic.length>3){if(topic.slice(0, 3)=="/kn"){topic = topic.slice(3);}}
-if(this.attachPathList[topic]){this.attachPathList[topic](evt);}}}
-this.subscribe = function(	topic ,toObj, toFunc, dontTellServer){if(!this.isInitialized){this.subscriptionBacklog.push([topic, toObj, toFunc, dontTellServer]);return;}
+if(this.attachPathList[topic]){this.attachPathList[topic](evt);}}
+}
+this.subscribe = function(topic ,toObj, toFunc, dontTellServer){if(!this.isInitialized){this.subscriptionBacklog.push([topic, toObj, toFunc, dontTellServer]);return;}
 if(!this.attachPathList[topic]){this.attachPathList[topic] = function(){ return true; }
 this.log("subscribing to: "+topic);this.topics.push(topic);}
-var revt = new dojo.io.repubsubEvent(this.tunnelURI, topic, "route");var rstr = [this.serverBaseURL+"/kn", revt.toGetString()].join("");dojo.event.kwConnect({once: true,srcObj: this.attachPathList,srcFunc: topic,adviceObj: toObj,adviceFunc: toFunc});if(!this.rcvNode){  }
+var revt = new dojo.io.repubsubEvent(this.tunnelURI, topic, "route");var rstr = [this.serverBaseURL+"/kn", revt.toGetString()].join("");dojo.event.kwConnect({once: true,srcObj: this.attachPathList,srcFunc: topic,adviceObj: toObj,adviceFunc: toFunc
+});if(!this.rcvNode){  }
 if(dontTellServer){return;}
 this.log("sending subscription to: "+topic);this.sendTopicSubToServer(topic, rstr);}
 this.sendTopicSubToServer = function(topic, str){if(!this.attachPathList[topic]["subscriptions"]){this.enqueueEventStr(str);this.attachPathList[topic].subscriptions = 0;}
 this.attachPathList[topic].subscriptions++;}
-this.unSubscribe = function(topic, toObj, toFunc){dojo.event.kwDisconnect({srcObj: this.attachPathList,srcFunc: topic,adviceObj: toObj,adviceFunc: toFunc});}
+this.unSubscribe = function(topic, toObj, toFunc){dojo.event.kwDisconnect({srcObj: this.attachPathList,srcFunc: topic,adviceObj: toObj,adviceFunc: toFunc
+});}
 this.publish = function(topic, event){var evt = dojo.io.repubsubEvent.initFromProperties(event);evt.to = topic;var evtURLParts = [];evtURLParts.push(this.serverBaseURL+"/kn");evtURLParts.push(evt.toGetString());this.enqueueEventStr(evtURLParts.join(""));}
 this.enqueueEventStr = function(evtStr){this.log("enqueueEventStr");this.backlog.push(evtStr);this.dequeueEvent();}
 this.dequeueEvent = function(force){this.log("dequeueEvent");if(this.backlog.length <= 0){ return; }
-if((this.canSnd)||(force)){dojo.io.setIFrameSrc(this.sndNode, this.backlog.shift()+"&callback=repubsub.sndNodeReady");this.canSnd = false;}else{this.log("sndNode not available yet!", "debug");}}}
-dojo.io.repubsubEvent = function(to, from, method, id, routeURI, payload, dispname, uid){this.to = to;this.from = from;this.method = method||"route";this.id = id||repubsub.getRandStr();this.uri = routeURI;this.displayname = dispname||repubsub.displayname;this.userid = uid||repubsub.userid;this.payload = payload||"";this.flushChars = 4096;this.initFromProperties = function(evt){if(evt.constructor = dojo.io.repubsubEvent){for(var x in evt){this[x] = evt[x];}}else{for(var x in evt){if(typeof this.forwardPropertiesMap[x] == "string"){this[this.forwardPropertiesMap[x]] = evt[x];}else{this[x] = evt[x];}}}}
+if((this.canSnd)||(force)){dojo.io.setIFrameSrc(this.sndNode, this.backlog.shift()+"&callback=repubsub.sndNodeReady");this.canSnd = false;}else{this.log("sndNode not available yet!", "debug");}}
+}
+dojo.io.repubsubEvent = function(to, from, method, id, routeURI, payload, dispname, uid){this.to = to;this.from = from;this.method = method||"route";this.id = id||repubsub.getRandStr();this.uri = routeURI;this.displayname = dispname||repubsub.displayname;this.userid = uid||repubsub.userid;this.payload = payload||"";this.flushChars = 4096;this.initFromProperties = function(evt){if(evt.constructor = dojo.io.repubsubEvent){for(var x in evt){this[x] = evt[x];}}else{for(var x in evt){if(typeof this.forwardPropertiesMap[x] == "string"){this[this.forwardPropertiesMap[x]] = evt[x];}else{this[x] = evt[x];}}
+}}
 this.toGetString = function(noQmark){var qs = [ ((noQmark) ? "" : "?") ];for(var x=0; x<this.properties.length; x++){var tp = this.properties[x];if(this[tp[0]]){qs.push(tp[1]+"="+encodeURIComponent(String(this[tp[0]])));}}
 return qs.join("&");}}
 dojo.io.repubsubEvent.prototype.properties = [["from", "kn_from"], ["to", "kn_to"],["method", "do_method"], ["id", "kn_id"],["uri", "kn_uri"],["displayname", "kn_displayname"],["userid", "kn_userid"],["payload", "kn_payload"],["flushChars", "kn_response_flush"],["responseFormat", "kn_response_format"] ];dojo.io.repubsubEvent.prototype.forwardPropertiesMap = {};dojo.io.repubsubEvent.prototype.reversePropertiesMap = {};for(var x=0; x<dojo.io.repubsubEvent.prototype.properties.length; x++){var tp = dojo.io.repubsubEvent.prototype.properties[x];dojo.io.repubsubEvent.prototype.reversePropertiesMap[tp[0]] = tp[1];dojo.io.repubsubEvent.prototype.forwardPropertiesMap[tp[1]] = tp[0];}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/RhinoIO.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/RhinoIO.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/RhinoIO.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/RhinoIO.js Thu Dec 14 07:45:13 2006
@@ -8,7 +8,8 @@
 function connect(req){var content = req.content || {};var query;if (req.sendTransport){content["dojo.transport"] = "rhinohttp";}
 if(req.postContent){query = req.postContent;}else{query = dojo.io.argsFromMap(content, req.encoding);}
 var url_text = req.url;if(req.method.toLowerCase() == "get" && query != ""){url_text = url_text + "?" + query;}
-var url  = new java.net.URL(url_text);var conn = url.openConnection();conn.setRequestMethod(req.method.toUpperCase());if(req.headers){for(var header in req.headers){if(header.toLowerCase() == "content-type" && !req.contentType){req.contentType = req.headers[header];}else{conn.setRequestProperty(header, req.headers[header]);}}}
+var url  = new java.net.URL(url_text);var conn = url.openConnection();conn.setRequestMethod(req.method.toUpperCase());if(req.headers){for(var header in req.headers){if(header.toLowerCase() == "content-type" && !req.contentType){req.contentType = req.headers[header];}else{conn.setRequestProperty(header, req.headers[header]);}}
+}
 if(req.contentType){conn.setRequestProperty("Content-Type", req.contentType);}
 if(req.method.toLowerCase() == "post"){conn.setDoOutput(true);var output_stream = conn.getOutputStream();var byte_array = (new java.lang.String(query)).getBytes();output_stream.write(byte_array, 0, byte_array.length);}
 conn.connect();doLoad(req, conn);}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/ScriptSrcIO.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/ScriptSrcIO.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/ScriptSrcIO.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/ScriptSrcIO.js Thu Dec 14 07:45:13 2006
@@ -1,6 +1,8 @@
 
-dojo.provide("dojo.io.ScriptSrcIO");dojo.require("dojo.io.BrowserIO");dojo.require("dojo.undo.browser");dojo.io.ScriptSrcTransport = new function(){this.preventCache = false;this.maxUrlLength = 1000;this.inFlightTimer = null;this.DsrStatusCodes = {Continue: 100,Ok: 200,Error: 500};this.startWatchingInFlight = function(){if(!this.inFlightTimer){this.inFlightTimer = setInterval("dojo.io.ScriptSrcTransport.watchInFlight();", 100);}}
-this.watchInFlight = function(){var totalCount = 0;var doneCount = 0;for(var param in this._state){totalCount++;var currentState = this._state[param];if(currentState.isDone){doneCount++;delete this._state[param];}else if(!currentState.isFinishing){var listener = currentState.kwArgs;try{if(currentState.checkString && eval("typeof(" + currentState.checkString + ") != 'undefined'")){currentState.isFinishing = true;this._finish(currentState, "load");doneCount++;delete this._state[param];}else if(listener.timeoutSeconds && listener.timeout){if(currentState.startTime + (listener.timeoutSeconds * 1000) < (new Date()).getTime()){currentState.isFinishing = true;this._finish(currentState, "timeout");doneCount++;delete this._state[param];}}else if(!listener.timeoutSeconds){doneCount++;}}catch(e){currentState.isFinishing = true;this._finish(currentState, "error", {status: this.DsrStatusCodes.Error, response: e});}}}
+dojo.provide("dojo.io.ScriptSrcIO");dojo.require("dojo.io.BrowserIO");dojo.require("dojo.undo.browser");dojo.io.ScriptSrcTransport = new function(){this.preventCache = false;this.maxUrlLength = 1000;this.inFlightTimer = null;this.DsrStatusCodes = {Continue: 100,Ok: 200,Error: 500
+};this.startWatchingInFlight = function(){if(!this.inFlightTimer){this.inFlightTimer = setInterval("dojo.io.ScriptSrcTransport.watchInFlight();", 100);}}
+this.watchInFlight = function(){var totalCount = 0;var doneCount = 0;for(var param in this._state){totalCount++;var currentState = this._state[param];if(currentState.isDone){doneCount++;delete this._state[param];}else if(!currentState.isFinishing){var listener = currentState.kwArgs;try{if(currentState.checkString && eval("typeof(" + currentState.checkString + ") != 'undefined'")){currentState.isFinishing = true;this._finish(currentState, "load");doneCount++;delete this._state[param];}else if(listener.timeoutSeconds && listener.timeout){if(currentState.startTime + (listener.timeoutSeconds * 1000) < (new Date()).getTime()){currentState.isFinishing = true;this._finish(currentState, "timeout");doneCount++;delete this._state[param];}}else if(!listener.timeoutSeconds){doneCount++;}}catch(e){currentState.isFinishing = true;this._finish(currentState, "error", {status: this.DsrStatusCodes.Error, response: e});}}
+}
 if(doneCount >= totalCount){clearInterval(this.inFlightTimer);this.inFlightTimer = null;}}
 this.canHandle = function(kwArgs){return dojo.lang.inArray(["text/javascript", "text/json", "application/json"], (kwArgs["mimetype"].toLowerCase()))
 && (kwArgs["method"].toLowerCase() == "get")
@@ -8,7 +10,8 @@
 && (!kwArgs["sync"] || kwArgs["sync"] == false)
 && !kwArgs["file"]
 && !kwArgs["multipart"];}
-this.removeScripts = function(){var scripts = document.getElementsByTagName("script");for(var i = 0; scripts && i < scripts.length; i++){var scriptTag = scripts[i];if(scriptTag.className == "ScriptSrcTransport"){var parent = scriptTag.parentNode;parent.removeChild(scriptTag);i--;}}}
+this.removeScripts = function(){var scripts = document.getElementsByTagName("script");for(var i = 0; scripts && i < scripts.length; i++){var scriptTag = scripts[i];if(scriptTag.className == "ScriptSrcTransport"){var parent = scriptTag.parentNode;parent.removeChild(scriptTag);i--;}}
+}
 this.bind = function(kwArgs){var url = kwArgs.url;var query = "";if(kwArgs["formNode"]){var ta = kwArgs.formNode.getAttribute("action");if((ta)&&(!kwArgs["url"])){ url = ta; }
 var tp = kwArgs.formNode.getAttribute("method");if((tp)&&(!kwArgs["method"])){ kwArgs.method = tp; }
 query += dojo.io.encodeForm(kwArgs.formNode, kwArgs.encoding, kwArgs["formFilter"]);}
@@ -20,7 +23,8 @@
 if(jsonpName){content[jsonpName] = "dojo.io.ScriptSrcTransport._state." + id + ".jsonpCall";}}
 if(kwArgs.postContent){query = kwArgs.postContent;}else if(content){query += ((query) ? "&" : "") + dojo.io.argsFromMap(content, kwArgs.encoding, jsonpName);}
 if(kwArgs["apiId"]){kwArgs["useRequestId"] = true;}
-var state = {"id": id,"idParam": "_dsrid=" + id,"url": url,"query": query,"kwArgs": kwArgs,"startTime": (new Date()).getTime(),"isFinishing": false};if(!url){this._finish(state, "error", {status: this.DsrStatusCodes.Error, statusText: "url.none"});return;}
+var state = {"id": id,"idParam": "_dsrid=" + id,"url": url,"query": query,"kwArgs": kwArgs,"startTime": (new Date()).getTime(),"isFinishing": false
+};if(!url){this._finish(state, "error", {status: this.DsrStatusCodes.Error, statusText: "url.none"});return;}
 if(content && content[jsonpName]){state.jsonp = content[jsonpName];state.jsonpCall = function(data){if(data["Error"]||data["error"]){if(dojo["json"] && dojo["json"]["serialize"]){dojo.debug(dojo.json.serialize(data));}
 dojo.io.ScriptSrcTransport._finish(this, "error", data);}else{dojo.io.ScriptSrcTransport._finish(this, "load", data);}};}
 if(kwArgs["useRequestId"] || kwArgs["checkString"] || state["jsonp"]){this._state[id] = state;}
@@ -41,7 +45,8 @@
 if(!state.constantParams){state.constantParams = "";}
 var queryMax = this.maxUrlLength - state.idParam.length
 - state.constantParams.length - state.url.length
-- state.nocacheParam.length - this._extraPaddingLength;var isDone = state.query.length < queryMax;var currentQuery;if(isDone){currentQuery = state.query;state.query = null;}else{var ampEnd = state.query.lastIndexOf("&", queryMax - 1);var eqEnd = state.query.lastIndexOf("=", queryMax - 1);if(ampEnd > eqEnd || eqEnd == queryMax - 1){currentQuery = state.query.substring(0, ampEnd);state.query = state.query.substring(ampEnd + 1, state.query.length)}else{currentQuery = state.query.substring(0, queryMax);var queryName = currentQuery.substring((ampEnd == -1 ? 0 : ampEnd + 1), eqEnd);state.query = queryName + "=" + state.query.substring(queryMax, state.query.length);}}
+- state.nocacheParam.length - this._extraPaddingLength;var isDone = state.query.length < queryMax;var currentQuery;if(isDone){currentQuery = state.query;state.query = null;}else{var ampEnd = state.query.lastIndexOf("&", queryMax - 1);var eqEnd = state.query.lastIndexOf("=", queryMax - 1);if(ampEnd > eqEnd || eqEnd == queryMax - 1){currentQuery = state.query.substring(0, ampEnd);state.query = state.query.substring(ampEnd + 1, state.query.length)
+}else{currentQuery = state.query.substring(0, queryMax);var queryName = currentQuery.substring((ampEnd == -1 ? 0 : ampEnd + 1), eqEnd);state.query = queryName + "=" + state.query.substring(queryMax, state.query.length);}}
 var queryParams = [currentQuery, state.idParam, state.constantParams, state.nocacheParam];if(!isDone){queryParams.push("_part=" + part);}
 var url = this._buildUrl(state.url, queryParams);this._attach(state.id + "_" + part, url);}
 this._finish = function(state, callback, event){if(callback != "partOk" && !state.kwArgs[callback] && !state.kwArgs["handle"]){if(callback == "error"){state.isDone = true;throw event;}}else{switch(callback){case "load":
@@ -50,11 +55,13 @@
 var part = parseInt(event.response.part, 10) + 1;if(event.response.constantParams){state.constantParams = event.response.constantParams;}
 this._multiAttach(state, part);state.isDone = false;break;case "error":
 state.kwArgs[(typeof state.kwArgs.error == "function") ? "error" : "handle"]("error", event.response, event, state.kwArgs);state.isDone = true;break;default:
-state.kwArgs[(typeof state.kwArgs[callback] == "function") ? callback : "handle"](callback, event, event, state.kwArgs);state.isDone = true;}}}
+state.kwArgs[(typeof state.kwArgs[callback] == "function") ? callback : "handle"](callback, event, event, state.kwArgs);state.isDone = true;}}
+}
 dojo.io.transports.addTransport("ScriptSrcTransport");}
 if(typeof window != "undefined"){window.onscriptload = function(event){var state = null;var transport = dojo.io.ScriptSrcTransport;if(transport._state[event.id]){state = transport._state[event.id];}else{var tempState;for(var param in transport._state){tempState = transport._state[param];if(tempState.finalUrl && tempState.finalUrl == event.id){state = tempState;break;}}
 if(state == null){var scripts = document.getElementsByTagName("script");for(var i = 0; scripts && i < scripts.length; i++){var scriptTag = scripts[i];if(scriptTag.getAttribute("class") == "ScriptSrcTransport"
-&& scriptTag.src == event.id){state = transport._state[scriptTag.id];break;}}}
+&& scriptTag.src == event.id){state = transport._state[scriptTag.id];break;}}
+}
 if(state == null){throw "No matching state for onscriptload event.id: " + event.id;}}
 var callbackName = "error";switch(event.status){case dojo.io.ScriptSrcTransport.DsrStatusCodes.Continue:
 callbackName = "partOk";break;case dojo.io.ScriptSrcTransport.DsrStatusCodes.Ok:

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/XhrIframeProxy.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/XhrIframeProxy.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/XhrIframeProxy.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/XhrIframeProxy.js Thu Dec 14 07:45:13 2006
@@ -3,15 +3,20 @@
 + encodeURIComponent(facade._ifpServerUrl) + "&fr=false";if(this.needFrameRecursion()){var fullClientUrl = window.location.href.substring(0, window.location.href.lastIndexOf("/") + 1);fullClientUrl += this.xipClientUrl;var serverUrl = facade._ifpServerUrl
 + (facade._ifpServerUrl.indexOf("?") == -1 ? "?" : "&") + "dojo.fr=1";frameUrl = serverUrl + "#0:init:id=" + stateId + "&client="
 + encodeURIComponent(fullClientUrl) + "&fr=" + this.needFrameRecursion();}
-this._state[stateId] = {facade: facade,stateId: stateId,clientFrame: dojo.io.createIFrame(stateId, "", frameUrl)};return stateId;},receive: function(stateId, urlEncodedData){var response = {};var nvPairs = urlEncodedData.split("&");for(var i = 0; i < nvPairs.length; i++){if(nvPairs[i]){var nameValue = nvPairs[i].split("=");response[decodeURIComponent(nameValue[0])] = decodeURIComponent(nameValue[1]);}}
+this._state[stateId] = {facade: facade,stateId: stateId,clientFrame: dojo.io.createIFrame(stateId, "", frameUrl)
+};return stateId;},receive: function(stateId, urlEncodedData){var response = {};var nvPairs = urlEncodedData.split("&");for(var i = 0; i < nvPairs.length; i++){if(nvPairs[i]){var nameValue = nvPairs[i].split("=");response[decodeURIComponent(nameValue[0])] = decodeURIComponent(nameValue[1]);}}
 var state = this._state[stateId];var facade = state.facade;facade._setResponseHeaders(response.responseHeaders);if(response.status == 0 || response.status){facade.status = parseInt(response.status, 10);}
 if(response.statusText){facade.statusText = response.statusText;}
 if(response.responseText){facade.responseText = response.responseText;var contentType = facade.getResponseHeader("Content-Type");if(contentType && (contentType == "application/xml" || contentType == "text/xml")){facade.responseXML = dojo.dom.createDocumentFromText(response.responseText, contentType);}}
 facade.readyState = 4;this.destroyState(stateId);},clientFrameLoaded: function(stateId){var state = this._state[stateId];var facade = state.facade;if(this.needFrameRecursion()){var clientWindow = window.open("", state.stateId + "_clientEndPoint");}else{var clientWindow = state.clientFrame.contentWindow;}
 var reqHeaders = [];for(var param in facade._requestHeaders){reqHeaders.push(param + ": " + facade._requestHeaders[param]);}
-var requestData = {uri: facade._uri};if(reqHeaders.length > 0){requestData.requestHeaders = reqHeaders.join("\r\n");}
+var requestData = {uri: facade._uri
+};if(reqHeaders.length > 0){requestData.requestHeaders = reqHeaders.join("\r\n");}
 if(facade._method){requestData.method = facade._method;}
 if(facade._bodyData){requestData.data = facade._bodyData;}
-clientWindow.send(dojo.io.argsFromMap(requestData, "utf8"));},destroyState: function(stateId){var state = this._state[stateId];if(state){delete this._state[stateId];var parentNode = state.clientFrame.parentNode;parentNode.removeChild(state.clientFrame);state.clientFrame = null;state = null;}},createFacade: function(){if(arguments && arguments[0] && arguments[0]["iframeProxyUrl"]){return new dojo.io.XhrIframeFacade(arguments[0]["iframeProxyUrl"]);}else{return dojo.io.XhrIframeProxy.oldGetXmlhttpObject.apply(dojo.hostenv, arguments);}}}
+clientWindow.send(dojo.io.argsFromMap(requestData, "utf8"));},destroyState: function(stateId){var state = this._state[stateId];if(state){delete this._state[stateId];var parentNode = state.clientFrame.parentNode;parentNode.removeChild(state.clientFrame);state.clientFrame = null;state = null;}},createFacade: function(){if(arguments && arguments[0] && arguments[0]["iframeProxyUrl"]){return new dojo.io.XhrIframeFacade(arguments[0]["iframeProxyUrl"]);}else{return dojo.io.XhrIframeProxy.oldGetXmlhttpObject.apply(dojo.hostenv, arguments);}}
+}
 dojo.io.XhrIframeProxy.oldGetXmlhttpObject = dojo.hostenv.getXmlhttpObject;dojo.hostenv.getXmlhttpObject = dojo.io.XhrIframeProxy.createFacade;dojo.io.XhrIframeFacade = function(ifpServerUrl){this._requestHeaders = {};this._allResponseHeaders = null;this._responseHeaders = {};this._method = null;this._uri = null;this._bodyData = null;this.responseText = null;this.responseXML = null;this.status = null;this.statusText = null;this.readyState = 0;this._ifpServerUrl = ifpServerUrl;this._stateId = null;}
-dojo.lang.extend(dojo.io.XhrIframeFacade, {open: function(method, uri){this._method = method;this._uri = uri;this.readyState = 1;},setRequestHeader: function(header, value){this._requestHeaders[header] = value;},send: function(stringData){this._bodyData = stringData;this._stateId = dojo.io.XhrIframeProxy.send(this);this.readyState = 2;},abort: function(){dojo.io.XhrIframeProxy.destroyState(this._stateId);},getAllResponseHeaders: function(){return this._allResponseHeaders;},getResponseHeader: function(header){return this._responseHeaders[header];},_setResponseHeaders: function(allHeaders){if(allHeaders){this._allResponseHeaders = allHeaders;allHeaders = allHeaders.replace(/\r/g, "");var nvPairs = allHeaders.split("\n");for(var i = 0; i < nvPairs.length; i++){if(nvPairs[i]){var nameValue = nvPairs[i].split(": ");this._responseHeaders[nameValue[0]] = nameValue[1];}}}}});
\ No newline at end of file
+dojo.lang.extend(dojo.io.XhrIframeFacade, {open: function(method, uri){this._method = method;this._uri = uri;this.readyState = 1;},setRequestHeader: function(header, value){this._requestHeaders[header] = value;},send: function(stringData){this._bodyData = stringData;this._stateId = dojo.io.XhrIframeProxy.send(this);this.readyState = 2;},abort: function(){dojo.io.XhrIframeProxy.destroyState(this._stateId);},getAllResponseHeaders: function(){return this._allResponseHeaders;},getResponseHeader: function(header){return this._responseHeaders[header];},_setResponseHeaders: function(allHeaders){if(allHeaders){this._allResponseHeaders = allHeaders;allHeaders = allHeaders.replace(/\r/g, "");var nvPairs = allHeaders.split("\n");for(var i = 0; i < nvPairs.length; i++){if(nvPairs[i]){var nameValue = nvPairs[i].split(": ");this._responseHeaders[nameValue[0]] = nameValue[1];}}
+}}
+});
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/__package__.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/__package__.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/__package__.js Thu Dec 14 07:45:13 2006
@@ -1,2 +1,3 @@
 
-dojo.kwCompoundRequire({common: ["dojo.io.common"],rhino: ["dojo.io.RhinoIO"],browser: ["dojo.io.BrowserIO", "dojo.io.cookie"],dashboard: ["dojo.io.BrowserIO", "dojo.io.cookie"]});dojo.provide("dojo.io.*");
\ No newline at end of file
+dojo.kwCompoundRequire({common: ["dojo.io.common"],rhino: ["dojo.io.RhinoIO"],browser: ["dojo.io.BrowserIO", "dojo.io.cookie"],dashboard: ["dojo.io.BrowserIO", "dojo.io.cookie"]
+});dojo.provide("dojo.io.*");
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/cometd.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/cometd.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/cometd.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/cometd.js Thu Dec 14 07:45:13 2006
@@ -2,8 +2,9 @@
 dojo.require("dojo.io.common");dojo.provide("dojo.io.cometd");dojo.require("dojo.AdapterRegistry");dojo.require("dojo.json");dojo.require("dojo.io.BrowserIO");dojo.require("dojo.io.IframeIO");dojo.require("dojo.io.ScriptSrcIO");dojo.require("dojo.io.cookie");dojo.require("dojo.event.*");dojo.require("dojo.lang.common");dojo.require("dojo.lang.func");cometd = new function(){this.initialized = false;this.connected = false;this.connectionTypes = new dojo.AdapterRegistry(true);this.version = 0.1;this.minimumVersion = 0.1;this.clientId = null;this._isXD = false;this.handshakeReturn = null;this.currentTransport = null;this.url = null;this.lastMessage = null;this.globalTopicChannels = {};this.backlog = [];this.tunnelInit = function(childLocation, childDomain){}
 this.tunnelCollapse = function(){dojo.debug("tunnel collapsed!");}
 this.init = function(props, root, bargs){props = props||{};props.version = this.version;props.minimumVersion = this.minimumVersion;props.channel = "/meta/handshake";this.url = root||djConfig["cometdRoot"];if(!this.url){dojo.debug("no cometd root specified in djConfig and no root passed");return;}
-var bindArgs = {url: this.url,method: "POST",mimetype: "text/json",load: dojo.lang.hitch(this, "finishInit"),content: { "message": dojo.json.serialize([props]) }};var regexp = "^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$";var r = (""+window.location).match(new RegExp(regexp));if(r[4]){var tmp = r[4].split(":");var thisHost = tmp[0];var thisPort = tmp[1]||"80";r = this.url.match(new RegExp(regexp));if(r[4]){tmp = r[4].split(":");var urlHost = tmp[0];var urlPort = tmp[1]||"80";if(	(urlHost != thisHost)||
-(urlPort != thisPort) ){dojo.debug(thisHost, urlHost);dojo.debug(thisPort, urlPort);this._isXD = true;bindArgs.transport = "ScriptSrcTransport";bindArgs.jsonParamName = "jsonp";bindArgs.method = "GET";}}}
+var bindArgs = {url: this.url,method: "POST",mimetype: "text/json",load: dojo.lang.hitch(this, "finishInit"),content: { "message": dojo.json.serialize([props]) }};var regexp = "^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$";var r = (""+window.location).match(new RegExp(regexp));if(r[4]){var tmp = r[4].split(":");var thisHost = tmp[0];var thisPort = tmp[1]||"80";r = this.url.match(new RegExp(regexp));if(r[4]){tmp = r[4].split(":");var urlHost = tmp[0];var urlPort = tmp[1]||"80";if((urlHost != thisHost)||
+(urlPort != thisPort) ){dojo.debug(thisHost, urlHost);dojo.debug(thisPort, urlPort);this._isXD = true;bindArgs.transport = "ScriptSrcTransport";bindArgs.jsonParamName = "jsonp";bindArgs.method = "GET";}}
+}
 if(bargs){dojo.lang.mixin(bindArgs, bargs);}
 return dojo.io.bind(bindArgs);}
 this.finishInit = function(type, data, evt, request){data = data[0];this.handshakeReturn = data;if(data["authSuccessful"] == false){dojo.debug("cometd authentication failed");return;}
@@ -15,7 +16,7 @@
 this.deliver = function(messages){dojo.lang.forEach(messages, this._deliver, this);}
 this._deliver = function(message){if(!message["channel"]){dojo.debug("cometd error: no channel for message!");return;}
 if(!this.currentTransport){this.backlog.push(["deliver", message]);return;}
-this.lastMessage = message;if(	(message.channel.length > 5)&&
+this.lastMessage = message;if((message.channel.length > 5)&&
 (message.channel.substr(0, 5) == "/meta")){switch(message.channel){case "/meta/subscribe":
 if(!message.successful){dojo.debug("cometd subscription error for channel", message.channel, ":", message.error);return;}
 this.subscribed(message.subscription, message);break;case "/meta/unsubscribe":
@@ -25,36 +26,44 @@
 this.disconnect = function(){if(!this.currentTransport){dojo.debug("no current transport to disconnect from");return;}
 this.currentTransport.disconnect();}
 this.publish = function(channel, data, properties){if(!this.currentTransport){this.backlog.push(["publish", channel, data, properties]);return;}
-var message = {data: data,channel: channel};if(properties){dojo.lang.mixin(message, properties);}
+var message = {data: data,channel: channel
+};if(properties){dojo.lang.mixin(message, properties);}
 return this.currentTransport.sendMessage(message);}
-this.subscribe = function(					channel,useLocalTopics,objOrFunc,funcName){if(!this.currentTransport){this.backlog.push(["subscribe", channel, useLocalTopics, objOrFunc, funcName]);return;}
+this.subscribe = function(channel,useLocalTopics,objOrFunc,funcName){if(!this.currentTransport){this.backlog.push(["subscribe", channel, useLocalTopics, objOrFunc, funcName]);return;}
 if(objOrFunc){var tname = (useLocalTopics) ? channel : "/cometd"+channel;if(useLocalTopics){this.globalTopicChannels[channel] = true;}
 dojo.event.topic.subscribe(tname, objOrFunc, funcName);}
-return this.currentTransport.sendMessage({channel: "/meta/subscribe",subscription: channel});}
-this.subscribed = function(					channel,message){dojo.debug(channel);dojo.debugShallow(message);}
-this.unsubscribe = function(				channel,useLocalTopics,objOrFunc,funcName){if(!this.currentTransport){this.backlog.push(["unsubscribe", channel, useLocalTopics, objOrFunc, funcName]);return;}
+return this.currentTransport.sendMessage({channel: "/meta/subscribe",subscription: channel
+});}
+this.subscribed = function(channel,message){dojo.debug(channel);dojo.debugShallow(message);}
+this.unsubscribe = function(channel,useLocalTopics,objOrFunc,funcName){if(!this.currentTransport){this.backlog.push(["unsubscribe", channel, useLocalTopics, objOrFunc, funcName]);return;}
 if(objOrFunc){var tname = (useLocalTopics) ? channel : "/cometd"+channel;dojo.event.topic.unsubscribe(tname, objOrFunc, funcName);}
-return this.currentTransport.sendMessage({channel: "/meta/unsubscribe",subscription: channel});}
-this.unsubscribed = function(				channel,message){dojo.debug(channel);dojo.debugShallow(message);}}
+return this.currentTransport.sendMessage({channel: "/meta/unsubscribe",subscription: channel
+});}
+this.unsubscribed = function(channel,message){dojo.debug(channel);dojo.debugShallow(message);}}
 cometd.iframeTransport = new function(){this.connected = false;this.connectionId = null;this.rcvNode = null;this.rcvNodeName = "";this.phonyForm = null;this.authToken = null;this.lastTimestamp = null;this.lastId = null;this.backlog = [];this.check = function(types, version, xdomain){return ((!xdomain)&&
 (!dojo.render.html.safari)&&
 (dojo.lang.inArray(types, "iframe")));}
 this.tunnelInit = function(){this.postToIframe({message: dojo.json.serialize([
-{channel:	"/meta/connect",clientId:	cometd.clientId,connectionType: "iframe"}
-])});}
+{channel:"/meta/connect",clientId:cometd.clientId,connectionType: "iframe"
+}
+])
+});}
 this.tunnelCollapse = function(){if(this.connected){this.connected = false;this.postToIframe({message: dojo.json.serialize([
-{channel:	"/meta/reconnect",clientId:	cometd.clientId,connectionId:	this.connectionId,timestamp:	this.lastTimestamp,id:			this.lastId}
-])});}}
+{channel:"/meta/reconnect",clientId:cometd.clientId,connectionId:this.connectionId,timestamp:this.lastTimestamp,id:this.lastId
+}
+])
+});}}
 this.deliver = function(message){if(message["timestamp"]){this.lastTimestamp = message.timestamp;}
 if(message["id"]){this.lastId = message.id;}
-if(	(message.channel.length > 5)&&
+if((message.channel.length > 5)&&
 (message.channel.substr(0, 5) == "/meta")){switch(message.channel){case "/meta/connect":
 if(!message.successful){dojo.debug("cometd connection error:", message.error);return;}
 this.connectionId = message.connectionId;this.connected = true;this.processBacklog();break;case "/meta/reconnect":
 if(!message.successful){dojo.debug("cometd reconnection error:", message.error);return;}
 this.connected = true;break;case "/meta/subscribe":
 if(!message.successful){dojo.debug("cometd subscription error for channel", message.channel, ":", message.error);return;}
-dojo.debug(message.channel);break;}}}
+dojo.debug(message.channel);break;}}
+}
 this.widenDomain = function(domainStr){var cd = domainStr||document.domain;if(cd.indexOf(".")==-1){ return; }
 var dps = cd.split(".");if(dps.length<=2){ return; }
 dps = dps.slice(dps.length-2);document.domain = dps.join(".");return document.domain;}
@@ -65,17 +74,23 @@
 this.processBacklog = function(){while(this.backlog.length > 0){this.sendMessage(this.backlog.shift(), true);}}
 this.sendMessage = function(message, bypassBacklog){if((bypassBacklog)||(this.connected)){message.connectionId = this.connectionId;message.clientId = cometd.clientId;var bindArgs = {url: cometd.url||djConfig["cometdRoot"],method: "POST",mimetype: "text/json",content: { message: dojo.json.serialize([ message ]) }};return dojo.io.bind(bindArgs);}else{this.backlog.push(message);}}
 this.startup = function(handshakeData){dojo.debug("startup!");dojo.debug(dojo.json.serialize(handshakeData));if(this.connected){ return; }
-this.rcvNodeName = "cometdRcv_"+cometd._getRandStr();var initUrl = cometd.url+"/?tunnelInit=iframe";if(false && dojo.render.html.ie){this.rcvNode = new ActiveXObject("htmlfile");this.rcvNode.open();this.rcvNode.write("<html>");this.rcvNode.write("<script>document.domain = '"+document.domain+"'");this.rcvNode.write("</html>");this.rcvNode.close();var ifrDiv = this.rcvNode.createElement("div");this.rcvNode.appendChild(ifrDiv);this.rcvNode.parentWindow.dojo = dojo;ifrDiv.innerHTML = "<iframe src='"+initUrl+"'></iframe>"}else{this.rcvNode = dojo.io.createIFrame(this.rcvNodeName, "", initUrl);}}}
+this.rcvNodeName = "cometdRcv_"+cometd._getRandStr();var initUrl = cometd.url+"/?tunnelInit=iframe";if(false && dojo.render.html.ie){this.rcvNode = new ActiveXObject("htmlfile");this.rcvNode.open();this.rcvNode.write("<html>");this.rcvNode.write("<script>document.domain = '"+document.domain+"'");this.rcvNode.write("</html>");this.rcvNode.close();var ifrDiv = this.rcvNode.createElement("div");this.rcvNode.appendChild(ifrDiv);this.rcvNode.parentWindow.dojo = dojo;ifrDiv.innerHTML = "<iframe src='"+initUrl+"'></iframe>"
+}else{this.rcvNode = dojo.io.createIFrame(this.rcvNodeName, "", initUrl);}}
+}
 cometd.mimeReplaceTransport = new function(){this.connected = false;this.connectionId = null;this.xhr = null;this.authToken = null;this.lastTimestamp = null;this.lastId = null;this.backlog = [];this.check = function(types, version, xdomain){return ((!xdomain)&&
 (dojo.render.html.mozilla)&&
 (dojo.lang.inArray(types, "mime-message-block")));}
 this.tunnelInit = function(){if(this.connected){ return; }
 this.openTunnelWith({message: dojo.json.serialize([
-{channel:	"/meta/connect",clientId:	cometd.clientId,connectionType: "mime-message-block"}
-])});this.connected = true;}
+{channel:"/meta/connect",clientId:cometd.clientId,connectionType: "mime-message-block"
+}
+])
+});this.connected = true;}
 this.tunnelCollapse = function(){if(this.connected){this.connected = false;this.openTunnelWith({message: dojo.json.serialize([
-{channel:	"/meta/reconnect",clientId:	cometd.clientId,connectionId:	this.connectionId,timestamp:	this.lastTimestamp,id:			this.lastId}
-])});}}
+{channel:"/meta/reconnect",clientId:cometd.clientId,connectionId:this.connectionId,timestamp:this.lastTimestamp,id:this.lastId
+}
+])
+});}}
 this.deliver = cometd.iframeTransport.deliver;this.handleOnLoad = function(resp){cometd.deliver(dojo.json.evalJson(this.xhr.responseText));}
 this.openTunnelWith = function(content, url){this.xhr = dojo.hostenv.getXmlhttpObject();this.xhr.multipart = true;if(dojo.render.html.mozilla){this.xhr.addEventListener("load", dojo.lang.hitch(this, "handleOnLoad"), false);}else if(dojo.render.html.safari){dojo.debug("Webkit is broken with multipart responses over XHR = (");this.xhr.onreadystatechange = dojo.lang.hitch(this, "handleOnLoad");}else{this.xhr.onload = dojo.lang.hitch(this, "handleOnLoad");}
 this.xhr.open("POST", (url||cometd.url), true);this.xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");dojo.debug(dojo.json.serialize(content));this.xhr.send(dojo.io.argsFromMap(content, "utf8"));}
@@ -86,11 +101,15 @@
 cometd.longPollTransport = new function(){this.connected = false;this.connectionId = null;this.authToken = null;this.lastTimestamp = null;this.lastId = null;this.backlog = [];this.check = function(types, version, xdomain){return ((!xdomain)&&(dojo.lang.inArray(types, "long-polling")));}
 this.tunnelInit = function(){if(this.connected){ return; }
 this.openTunnelWith({message: dojo.json.serialize([
-{channel:	"/meta/connect",clientId:	cometd.clientId,connectionType: "long-polling"}
-])});this.connected = true;}
+{channel:"/meta/connect",clientId:cometd.clientId,connectionType: "long-polling"
+}
+])
+});this.connected = true;}
 this.tunnelCollapse = function(){if(!this.connected){this.connected = false;dojo.debug("clientId:", cometd.clientId);this.openTunnelWith({message: dojo.json.serialize([
-{channel:	"/meta/reconnect",connectionType: "long-polling",clientId:	cometd.clientId,connectionId:	this.connectionId,timestamp:	this.lastTimestamp,id:			this.lastId}
-])});}}
+{channel:"/meta/reconnect",connectionType: "long-polling",clientId:cometd.clientId,connectionId:this.connectionId,timestamp:this.lastTimestamp,id:this.lastId
+}
+])
+});}}
 this.deliver = cometd.iframeTransport.deliver;this.openTunnelWith = function(content, url){dojo.io.bind({url: (url||cometd.url),method: "post",content: content,mimetype: "text/json",load: dojo.lang.hitch(this, function(type, data, evt, args){cometd.deliver(data);this.connected = false;this.tunnelCollapse();}),error: function(){ dojo.debug("tunnel opening failed"); }});this.connected = true;}
 this.processBacklog = function(){while(this.backlog.length > 0){this.sendMessage(this.backlog.shift(), true);}}
 this.sendMessage = function(message, bypassBacklog){if((bypassBacklog)||(this.connected)){message.connectionId = this.connectionId;message.clientId = cometd.clientId;var bindArgs = {url: cometd.url||djConfig["cometdRoot"],method: "post",mimetype: "text/json",content: { message: dojo.json.serialize([ message ]) }};return dojo.io.bind(bindArgs);}else{this.backlog.push(message);}}
@@ -99,11 +118,15 @@
 cometd.callbackPollTransport = new function(){this.connected = false;this.connectionId = null;this.authToken = null;this.lastTimestamp = null;this.lastId = null;this.backlog = [];this.check = function(types, version, xdomain){return dojo.lang.inArray(types, "callback-polling");}
 this.tunnelInit = function(){if(this.connected){ return; }
 this.openTunnelWith({message: dojo.json.serialize([
-{channel:	"/meta/connect",clientId:	cometd.clientId,connectionType: "callback-polling"}
-])});this.connected = true;}
+{channel:"/meta/connect",clientId:cometd.clientId,connectionType: "callback-polling"
+}
+])
+});this.connected = true;}
 this.tunnelCollapse = function(){if(!this.connected){this.connected = false;this.openTunnelWith({message: dojo.json.serialize([
-{channel:	"/meta/reconnect",connectionType: "long-polling",clientId:	cometd.clientId,connectionId:	this.connectionId,timestamp:	this.lastTimestamp,id:			this.lastId}
-])});}}
+{channel:"/meta/reconnect",connectionType: "long-polling",clientId:cometd.clientId,connectionId:this.connectionId,timestamp:this.lastTimestamp,id:this.lastId
+}
+])
+});}}
 this.deliver = cometd.iframeTransport.deliver;this.openTunnelWith = function(content, url){var req = dojo.io.bind({url: (url||cometd.url),content: content,mimetype: "text/json",transport: "ScriptSrcTransport",jsonParamName: "jsonp",load: dojo.lang.hitch(this, function(type, data, evt, args){dojo.debug(dojo.json.serialize(data));cometd.deliver(data);this.connected = false;this.tunnelCollapse();}),error: function(){ dojo.debug("tunnel opening failed"); }});this.connected = true;}
 this.processBacklog = function(){while(this.backlog.length > 0){this.sendMessage(this.backlog.shift(), true);}}
 this.sendMessage = function(message, bypassBacklog){if((bypassBacklog)||(this.connected)){message.connectionId = this.connectionId;message.clientId = cometd.clientId;var bindArgs = {url: cometd.url||djConfig["cometdRoot"],mimetype: "text/json",transport: "ScriptSrcTransport",jsonParamName: "jsonp",content: { message: dojo.json.serialize([ message ]) }};return dojo.io.bind(bindArgs);}else{this.backlog.push(message);}}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/common.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/common.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/common.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/common.js Thu Dec 14 07:45:13 2006
@@ -1,7 +1,8 @@
 
 dojo.provide("dojo.io.common");dojo.require("dojo.string");dojo.require("dojo.lang.extras");dojo.io.transports = [];dojo.io.hdlrFuncNames = [ "load", "error", "timeout" ];dojo.io.Request = function( url,  mimetype,  transport,  changeUrl){if((arguments.length == 1)&&(arguments[0].constructor == Object)){this.fromKwArgs(arguments[0]);}else{this.url = url;if(mimetype){ this.mimetype = mimetype; }
 if(transport){ this.transport = transport; }
-if(arguments.length >= 4){ this.changeUrl = changeUrl; }}}
+if(arguments.length >= 4){ this.changeUrl = changeUrl; }}
+}
 dojo.lang.extend(dojo.io.Request, {url: "",mimetype: "text/plain",method: "GET",content: undefined,transport: undefined,changeUrl: undefined,formNode: undefined,sync: false,bindSuccess: false,useCache: false,preventCache: false,load: function(type, data, transportImplementation, kwArgs){},error: function(type, error, transportImplementation, kwArgs){},timeout: function(type, empty, transportImplementation, kwArgs){},handle: function(type, data, transportImplementation, kwArgs){},timeoutSeconds: 0,abort: function(){ },fromKwArgs: function( kwArgs){if(kwArgs["url"]){ kwArgs.url = kwArgs.url.toString(); }
 if(kwArgs["formNode"]) { kwArgs.formNode = dojo.byId(kwArgs.formNode); }
 if(!kwArgs["method"] && kwArgs["formNode"] && kwArgs["formNode"].method) {kwArgs.method = kwArgs["formNode"].method;}
@@ -26,9 +27,12 @@
 var oldLoad = request.load;request.load = function(){dojo.io._queueBindInFlight = false;var ret = oldLoad.apply(this, arguments);dojo.io._dispatchNextQueueBind();return ret;}
 var oldErr = request.error;request.error = function(){dojo.io._queueBindInFlight = false;var ret = oldErr.apply(this, arguments);dojo.io._dispatchNextQueueBind();return ret;}
 dojo.io._bindQueue.push(request);dojo.io._dispatchNextQueueBind();return request;}
-dojo.io._dispatchNextQueueBind = function(){if(!dojo.io._queueBindInFlight){dojo.io._queueBindInFlight = true;if(dojo.io._bindQueue.length > 0){dojo.io.bind(dojo.io._bindQueue.shift());}else{dojo.io._queueBindInFlight = false;}}}
+dojo.io._dispatchNextQueueBind = function(){if(!dojo.io._queueBindInFlight){dojo.io._queueBindInFlight = true;if(dojo.io._bindQueue.length > 0){dojo.io.bind(dojo.io._bindQueue.shift());}else{dojo.io._queueBindInFlight = false;}}
+}
 dojo.io._bindQueue = [];dojo.io._queueBindInFlight = false;dojo.io.argsFromMap = function(map, encoding, last){var enc = /utf/i.test(encoding||"") ? encodeURIComponent : dojo.string.encodeAscii;var mapped = [];var control = new Object();for(var name in map){var domap = function(elt){var val = enc(name)+"="+enc(elt);mapped[(last == name) ? "push" : "unshift"](val);}
-if(!control[name]){var value = map[name];if (dojo.lang.isArray(value)){dojo.lang.forEach(value, domap);}else{domap(value);}}}
+if(!control[name]){var value = map[name];if (dojo.lang.isArray(value)){dojo.lang.forEach(value, domap);}else{domap(value);}}
+}
 return mapped.join("&");}
 dojo.io.setIFrameSrc = function( iframe,  src,  replace){try{var r = dojo.render.html;if(!replace){if(r.safari){iframe.location = src;}else{frames[iframe.name].location = src;}}else{var idoc;if(r.ie){idoc = iframe.contentWindow.document;}else if(r.safari){idoc = iframe.document;}else{idoc = iframe.contentWindow;}
-if(!idoc){iframe.location = src;return;}else{idoc.location.replace(src);}}}catch(e){dojo.debug(e);dojo.debug("setIFrameSrc: "+e);}}
+if(!idoc){iframe.location = src;return;}else{idoc.location.replace(src);}}
+}catch(e){dojo.debug(e);dojo.debug("setIFrameSrc: "+e);}}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/cookie.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/cookie.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/cookie.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/cookie.js Thu Dec 14 07:45:13 2006
@@ -9,7 +9,7 @@
 var value = document.cookie.substring(idx+name.length+1);var end = value.indexOf(';');if(end == -1) { end = value.length; }
 value = value.substring(0, end);value = unescape(value);return value;}
 dojo.io.cookie.get = dojo.io.cookie.getCookie;dojo.io.cookie.deleteCookie = function(name){dojo.io.cookie.setCookie(name, "-", 0);}
-dojo.io.cookie.setObjectCookie = function(	name, obj,days, path,domain, secure,clearCurrent){if(arguments.length == 5){clearCurrent = domain;domain = null;secure = null;}
+dojo.io.cookie.setObjectCookie = function(name, obj,days, path,domain, secure,clearCurrent){if(arguments.length == 5){clearCurrent = domain;domain = null;secure = null;}
 var pairs = [], cookie, value = "";if(!clearCurrent){cookie = dojo.io.cookie.getObjectCookie(name);}
 if(days >= 0){if(!cookie){ cookie = {}; }
 for(var prop in obj){if(obj[prop] == null){delete cookie[prop];}else if((typeof obj[prop] == "string")||(typeof obj[prop] == "number")){cookie[prop] = obj[prop];}}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/json.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/json.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/json.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/json.js Thu Dec 14 07:45:13 2006
@@ -1,5 +1,5 @@
 
-dojo.provide("dojo.json");dojo.require("dojo.lang.func");dojo.require("dojo.string.extras");dojo.require("dojo.AdapterRegistry");dojo.json = {jsonRegistry: new dojo.AdapterRegistry(),register: function(			name,check,wrap,override){dojo.json.jsonRegistry.register(name, check, wrap, override);},evalJson: function( json){try {return eval("(" + json + ")");}catch(e){dojo.debug(e);return json;}},serialize: function( o){var objtype = typeof(o);if(objtype == "undefined"){return "undefined";}else if((objtype == "number")||(objtype == "boolean")){return o + "";}else if(o === null){return "null";}
+dojo.provide("dojo.json");dojo.require("dojo.lang.func");dojo.require("dojo.string.extras");dojo.require("dojo.AdapterRegistry");dojo.json = {jsonRegistry: new dojo.AdapterRegistry(),register: function(name,check,wrap,override){dojo.json.jsonRegistry.register(name, check, wrap, override);},evalJson: function( json){try {return eval("(" + json + ")");}catch(e){dojo.debug(e);return json;}},serialize: function( o){var objtype = typeof(o);if(objtype == "undefined"){return "undefined";}else if((objtype == "number")||(objtype == "boolean")){return o + "";}else if(o === null){return "null";}
 if (objtype == "string") { return dojo.string.escapeString(o); }
 var me = arguments.callee;var newObj;if(typeof(o.__json__) == "function"){newObj = o.__json__();if(o !== newObj){return me(newObj);}}
 if(typeof(o.json) == "function"){newObj = o.json();if (o !== newObj) {return me(newObj);}}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/__package__.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/__package__.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/__package__.js Thu Dec 14 07:45:13 2006
@@ -1,4 +1,5 @@
 
 dojo.kwCompoundRequire({common: [
 "dojo.lang.common","dojo.lang.assert","dojo.lang.array","dojo.lang.type","dojo.lang.func","dojo.lang.extras","dojo.lang.repr","dojo.lang.declare"
-]});dojo.provide("dojo.lang.*");
\ No newline at end of file
+]
+});dojo.provide("dojo.lang.*");
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/array.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/array.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/array.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/array.js Thu Dec 14 07:45:13 2006
@@ -7,13 +7,15 @@
 var ob = obj ? obj : dj_global;dojo.lang.map(arr,function(val){reducedValue = binary_func.call(ob, reducedValue, val);}
 );return reducedValue;},forEach: function(anArray, callback, thisObject){if(dojo.lang.isString(anArray)){anArray = anArray.split("");}
 if(Array.forEach){Array.forEach(anArray, callback, thisObject);}else{if(!thisObject){thisObject=dj_global;}
-for(var i=0,l=anArray.length; i<l; i++){callback.call(thisObject, anArray[i], i, anArray);}}},_everyOrSome: function(every, arr, callback, thisObject){if(dojo.lang.isString(arr)){arr = arr.split("");}
+for(var i=0,l=anArray.length; i<l; i++){callback.call(thisObject, anArray[i], i, anArray);}}
+},_everyOrSome: function(every, arr, callback, thisObject){if(dojo.lang.isString(arr)){arr = arr.split("");}
 if(Array.every){return Array[ every ? "every" : "some" ](arr, callback, thisObject);}else{if(!thisObject){thisObject = dj_global;}
 for(var i=0,l=arr.length; i<l; i++){var result = callback.call(thisObject, arr[i], i, arr);if(every && !result){return false;}else if((!every)&&(result)){return true;}}
 return Boolean(every);}},every: function(arr, callback, thisObject){return this._everyOrSome(true, arr, callback, thisObject);},some: function(arr, callback, thisObject){return this._everyOrSome(false, arr, callback, thisObject);},filter: function(arr, callback, thisObject){var isString = dojo.lang.isString(arr);if(isString){ arr = arr.split(""); }
 var outArr;if(Array.filter){outArr = Array.filter(arr, callback, thisObject);}else{if(!thisObject){if(arguments.length >= 3){ dojo.raise("thisObject doesn't exist!"); }
 thisObject = dj_global;}
-outArr = [];for(var i = 0; i < arr.length; i++){if(callback.call(thisObject, arr[i], i, arr)){outArr.push(arr[i]);}}}
+outArr = [];for(var i = 0; i < arr.length; i++){if(callback.call(thisObject, arr[i], i, arr)){outArr.push(arr[i]);}}
+}
 if(isString){return outArr.join("");} else {return outArr;}},unnest: function(){var out = [];for(var i = 0; i < arguments.length; i++){if(dojo.lang.isArrayLike(arguments[i])){var add = dojo.lang.unnest.apply(this, arguments[i]);out = out.concat(add);}else{out.push(arguments[i]);}}
 return out;},toArray: function(arrayLike, startOffset){var array = [];for(var i = startOffset||0; i < arrayLike.length; i++){array.push(arrayLike[i]);}
 return array;}});

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/assert.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/assert.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/assert.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/assert.js Thu Dec 14 07:45:13 2006
@@ -6,4 +6,6 @@
 dojo.lang.assert(false, dojo.lang.assertType._errorMessage);}}
 dojo.lang.assertValidKeywords = function( object,  expectedProperties,  message){var key;if(!message){if(!dojo.lang.assertValidKeywords._errorMessage){dojo.lang.assertValidKeywords._errorMessage = "In dojo.lang.assertValidKeywords(), found invalid keyword:";}
 message = dojo.lang.assertValidKeywords._errorMessage;}
-if(dojo.lang.isArray(expectedProperties)){for(key in object){if(!dojo.lang.inArray(expectedProperties, key)){dojo.lang.assert(false, message + " " + key);}}}else{for(key in object){if(!(key in expectedProperties)){dojo.lang.assert(false, message + " " + key);}}}}
+if(dojo.lang.isArray(expectedProperties)){for(key in object){if(!dojo.lang.inArray(expectedProperties, key)){dojo.lang.assert(false, message + " " + key);}}
+}else{for(key in object){if(!(key in expectedProperties)){dojo.lang.assert(false, message + " " + key);}}
+}}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/common.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/common.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/common.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/common.js Thu Dec 14 07:45:13 2006
@@ -14,7 +14,7 @@
 return constructor;}
 dojo.lang._delegate = function(obj, props){function TMP(){};TMP.prototype = obj;var tmp = new TMP();if(props){dojo.lang.mixin(tmp, props);}
 return tmp;}
-dojo.inherits = dojo.lang.inherits;dojo.mixin = dojo.lang.mixin;dojo.extend = dojo.lang.extend;dojo.lang.find = function(			array,value,identity,findLast){var isString = dojo.lang.isString(array);if(isString) { array = array.split(""); }
+dojo.inherits = dojo.lang.inherits;dojo.mixin = dojo.lang.mixin;dojo.extend = dojo.lang.extend;dojo.lang.find = function(array,value,identity,findLast){var isString = dojo.lang.isString(array);if(isString) { array = array.split(""); }
 if(findLast) {var step = -1;var i = array.length - 1;var end = -1;} else {var step = 1;var i = 0;var end = array.length;}
 if(identity){while(i != end) {if(array[i] === value){ return i; }
 i += step;}}else{while(i != end) {if(array[i] == value){ return i; }
@@ -33,7 +33,8 @@
 if(dojo.lang.isNumber(it.length) && isFinite(it.length)){ return true; }
 return false;}
 dojo.lang.isFunction = function( it){return (it instanceof Function || typeof it == "function");};(function(){if((dojo.render.html.capable)&&(dojo.render.html["safari"])){dojo.lang.isFunction = function( it){if((typeof(it) == "function") && (it == "[object NodeList]")) { return false; }
-return (it instanceof Function || typeof it == "function");}}})();dojo.lang.isString = function( it){return (typeof it == "string" || it instanceof String);}
+return (it instanceof Function || typeof it == "function");}}
+})();dojo.lang.isString = function( it){return (typeof it == "string" || it instanceof String);}
 dojo.lang.isAlien = function( it){if(!it){ return false; }
 return !dojo.lang.isFunction(it) && /\{\s*\[native code\]\s*\}/.test(String(it));}
 dojo.lang.isBoolean = function( it){return (it instanceof Boolean || typeof it == "boolean");}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/declare.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/declare.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/declare.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/declare.js Thu Dec 14 07:45:13 2006
@@ -1,5 +1,5 @@
 
-dojo.provide("dojo.lang.declare");dojo.require("dojo.lang.common");dojo.require("dojo.lang.extras");dojo.lang.declare = function(	 className,superclass,init,props){if((dojo.lang.isFunction(props))||((!props)&&(!dojo.lang.isFunction(init)))){if(dojo.lang.isFunction(props)){dojo.deprecated("dojo.lang.declare("+className+"...):", "use class, superclass, initializer, properties argument order", "0.6");}
+dojo.provide("dojo.lang.declare");dojo.require("dojo.lang.common");dojo.require("dojo.lang.extras");dojo.lang.declare = function( className,superclass,init,props){if((dojo.lang.isFunction(props))||((!props)&&(!dojo.lang.isFunction(init)))){if(dojo.lang.isFunction(props)){dojo.deprecated("dojo.lang.declare("+className+"...):", "use class, superclass, initializer, properties argument order", "0.6");}
 var temp = props;props = init;init = temp;}
 if(props && props.initializer){dojo.deprecated("dojo.lang.declare("+className+"...):", "specify initializer as third argument, not as an element in properties", "0.6");}
 var mixins = [ ];if(dojo.lang.isArray(superclass)){mixins = superclass;superclass = mixins.shift();}
@@ -10,7 +10,8 @@
 dojo.lang.extend(ctor, dojo.lang.declare._common);ctor.prototype.constructor = ctor;ctor.prototype.initializer = (ctor.prototype.initializer)||(init)||(function(){});var created = dojo.parseObjPath(className, null, true);created.obj[created.prop] = ctor;return ctor;}
 dojo.lang.declare._makeConstructor = function(){return function(){var self = this._getPropContext();var s = self.constructor.superclass;if((s)&&(s.constructor)){if(s.constructor==arguments.callee){this._inherited("constructor", arguments);}else{this._contextMethod(s, "constructor", arguments);}}
 var ms = (self.constructor.mixins)||([]);for(var i=0, m; (m=ms[i]); i++) {(((m.prototype)&&(m.prototype.initializer))||(m)).apply(this, arguments);}
-if((!this.prototyping)&&(self.initializer)){self.initializer.apply(this, arguments);}}}
+if((!this.prototyping)&&(self.initializer)){self.initializer.apply(this, arguments);}}
+}
 dojo.lang.declare._common = {_getPropContext: function(){ return (this.___proto||this); },_contextMethod: function(ptype, method, args){var result, stack = this.___proto;this.___proto = ptype;try { result = ptype[method].apply(this,(args||[])); }
 catch(e) { throw e; }
 finally { this.___proto = stack; }

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/extras.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/extras.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/extras.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/extras.js Thu Dec 14 07:45:13 2006
@@ -8,10 +8,12 @@
 for(var x in ns){if(ns[x] === item){return new String(x);}}
 return null;}
 dojo.lang.shallowCopy = function(obj, deep){var i, ret;if(obj === null){  return null; }
-if(dojo.lang.isObject(obj)){ret = new obj.constructor();for(i in obj){if(dojo.lang.isUndefined(ret[i])){ret[i] = deep ? dojo.lang.shallowCopy(obj[i], deep) : obj[i];}}}else if(dojo.lang.isArray(obj)){ret = [];for(i=0; i<obj.length; i++){ret[i] = deep ? dojo.lang.shallowCopy(obj[i], deep) : obj[i];}}else{ret = obj;}
+if(dojo.lang.isObject(obj)){ret = new obj.constructor();for(i in obj){if(dojo.lang.isUndefined(ret[i])){ret[i] = deep ? dojo.lang.shallowCopy(obj[i], deep) : obj[i];}}
+}else if(dojo.lang.isArray(obj)){ret = [];for(i=0; i<obj.length; i++){ret[i] = deep ? dojo.lang.shallowCopy(obj[i], deep) : obj[i];}}else{ret = obj;}
 return ret;}
 dojo.lang.firstValued = function(){for(var i = 0; i < arguments.length; i++){if(typeof arguments[i] != "undefined"){return arguments[i];}}
 return undefined;}
 dojo.lang.getObjPathValue = function(objpath, context, create){with(dojo.parseObjPath(objpath, context, create)){return dojo.evalProp(prop, obj, create);}}
 dojo.lang.setObjPathValue = function(objpath, value, context, create){dojo.deprecated("dojo.lang.setObjPathValue", "use dojo.parseObjPath and the '=' operator", "0.6");if(arguments.length < 4){create = true;}
-with(dojo.parseObjPath(objpath, context, create)){if(obj && (create || (prop in obj))){obj[prop] = value;}}}
+with(dojo.parseObjPath(objpath, context, create)){if(obj && (create || (prop in obj))){obj[prop] = value;}}
+}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/func.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/func.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/func.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/func.js Thu Dec 14 07:45:13 2006
@@ -3,7 +3,8 @@
 var fcn = (dojo.lang.isString(method) ? thisObject[method] : method) || function(){};return function(){var ta = args.concat([]);for(var x=0; x<arguments.length; x++){ta.push(arguments[x]);}
 return fcn.apply(thisObject, ta);};}
 dojo.lang.anonCtr = 0;dojo.lang.anon = {};dojo.lang.nameAnonFunc = function(anonFuncPtr, thisObj, searchForNames){var nso = (thisObj|| dojo.lang.anon);if( (searchForNames) ||
-((dj_global["djConfig"])&&(djConfig["slowAnonFuncLookups"] == true)) ){for(var x in nso){try{if(nso[x] === anonFuncPtr){return x;}}catch(e){}}}
+((dj_global["djConfig"])&&(djConfig["slowAnonFuncLookups"] == true)) ){for(var x in nso){try{if(nso[x] === anonFuncPtr){return x;}}catch(e){}}
+}
 var ret = "__"+dojo.lang.anonCtr++;while(typeof nso[ret] != "undefined"){ret = "__"+dojo.lang.anonCtr++;}
 nso[ret] = anonFuncPtr;return ret;}
 dojo.lang.forward = function(funcName){return function(){return this[funcName].apply(this, arguments);};}
@@ -14,7 +15,9 @@
 return gather([], outerArgs, ecount);}
 dojo.lang.curryArguments = function(thisObj, func, args, offset){var targs = [];var x = offset||0;for(x=offset; x<args.length; x++){targs.push(args[x]);}
 return dojo.lang.curry.apply(dojo.lang, [thisObj, func].concat(targs));}
-dojo.lang.tryThese = function(){for(var x=0; x<arguments.length; x++){try{if(typeof arguments[x] == "function"){var ret = (arguments[x]());if(ret){return ret;}}}catch(e){dojo.debug(e);}}}
+dojo.lang.tryThese = function(){for(var x=0; x<arguments.length; x++){try{if(typeof arguments[x] == "function"){var ret = (arguments[x]());if(ret){return ret;}}
+}catch(e){dojo.debug(e);}}
+}
 dojo.lang.delayThese = function(farr, cb, delay, onend){if(!farr.length){if(typeof onend == "function"){onend();}
 return;}
 if((typeof delay == "undefined")&&(typeof cb == "number")){delay = cb;cb = function(){};}else if(!cb){cb = function(){};if(!delay){ delay = 0; }}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/type.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/type.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/type.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/lang/type.js Thu Dec 14 07:45:13 2006
@@ -53,7 +53,8 @@
 return dojo.lang.isUndefined(value);case null:
 case "null":
 return (value === null);default:
-if(dojo.lang.isFunction(type)){return (value instanceof type);}else{dojo.raise("dojo.lang.isOfType() was passed an invalid type");}}}
+if(dojo.lang.isFunction(type)){return (value instanceof type);}else{dojo.raise("dojo.lang.isOfType() was passed an invalid type");}}
+}
 dojo.raise("If we get here, it means a bug was introduced above.");}
 dojo.lang.getObject=function( str){var parts=str.split("."), i=0, obj=dj_global;do{obj=obj[parts[i++]];}while(i<parts.length&&obj);return (obj!=dj_global)?obj:null;}
 dojo.lang.doesObjectExist=function( str){var parts=str.split("."), i=0, obj=dj_global;do{obj=obj[parts[i++]];}while(i<parts.length&&obj);return (obj&&obj!=dj_global);}