Author: jkuhnert
Date: Sat Nov 4 12:02:17 2006
New Revision: 471253
URL: http://svn.apache.org/viewvc?view=rev&rev=471253
Log:
Fixed side effect bug from changes in locale management with dojo. (Need to
explicitly require a localization bundle
for locales now)
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/dojo.js
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/dojo.js.uncompressed.js
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/hostenv_rhino.js
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/io/RhinoIO.js
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/logging/Logger.js
tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/test.js
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/form/test_datetime.js
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_debug.js
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_form.js
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java?view=diff&rev=471253&r1=471252&r2=471253
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java
Sat Nov 4 12:02:17 2006
@@ -85,6 +85,8 @@
JSONObject profile = context.getProfile();
context.addInitializationScript(field,
"dojo.require(\"tapestry.form.datetime\");");
+ context.addInitializationScript(field,
+
"dojo.requireLocalization(\"dojo.i18n.calendar\",\"gregorian\",\"" +
context.getLocale() + "\");");
if (!profile.has(ValidationConstants.CONSTRAINTS)) {
profile.put(ValidationConstants.CONSTRAINTS, new JSONObject());
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java?view=diff&rev=471253&r1=471252&r2=471253
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java
Sat Nov 4 12:02:17 2006
@@ -91,6 +91,8 @@
JSONObject profile = context.getProfile();
context.addInitializationScript(field,
"dojo.require(\"tapestry.form.datetime\");");
+ context.addInitializationScript(field,
+
"dojo.requireLocalization(\"dojo.i18n.calendar\",\"gregorian\",\"" +
context.getLocale() + "\");");
if (!profile.has(ValidationConstants.CONSTRAINTS)) {
profile.put(ValidationConstants.CONSTRAINTS, new JSONObject());
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/dojo.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/dojo.js?view=diff&rev=471253&r1=471252&r2=471253
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/dojo.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/dojo.js Sat Nov 4
12:02:17 2006
@@ -487,7 +487,7 @@
_2dc.push(str.substr(_2de));return
_2dc;};dojo.provide("dojo.undo.browser");try{if((!djConfig["preventBackButtonFix"])&&(!dojo.hostenv.post_load_)){document.write("<iframe
style='border: 0px; width: 1px; height: 1px; position: absolute; bottom: 0px;
right: 0px; visibility: visible;' name='djhistory' id='djhistory'
src='"+(dojo.hostenv.getBaseScriptUri()+"iframe_history.html")+"'></iframe>");}}
catch(e){}
if(dojo.render.html.opera){dojo.debug("Opera is not supported with
dojo.undo.browser, so back/forward detection will not work.");}
-dojo.undo.browser={initialHref:window.location.href,initialHash:window.location.hash,moveForward:false,historyStack:[],forwardStack:[],historyIframe:null,bookmarkAnchor:null,locationTimer:null,setInitialState:function(args){this.initialState=this._createState(this.initialHref,args,this.initialHash);},addToHistory:function(args){this.forwardStack=[];var
hash=null;var
url=null;if(!this.historyIframe){this.historyIframe=window.frames["djhistory"];}
+dojo.undo.browser={initialHref:(!dj_undef("window"))?window.location.href:"",initialHash:(!dj_undef("window"))?window.location.hash:"",moveForward:false,historyStack:[],forwardStack:[],historyIframe:null,bookmarkAnchor:null,locationTimer:null,setInitialState:function(args){this.initialState=this._createState(this.initialHref,args,this.initialHash);},addToHistory:function(args){this.forwardStack=[];var
hash=null;var
url=null;if(!this.historyIframe){this.historyIframe=window.frames["djhistory"];}
if(!this.bookmarkAnchor){this.bookmarkAnchor=document.createElement("a");dojo.body().appendChild(this.bookmarkAnchor);this.bookmarkAnchor.style.display="none";}
if(args["changeUrl"]){hash="#"+((args["changeUrl"]!==true)?args["changeUrl"]:(new
Date()).getTime());if(this.historyStack.length==0&&this.initialState.urlHash==hash){this.initialState=this._createState(url,args,hash);return;}else{if(this.historyStack.length>0&&this.historyStack[this.historyStack.length-1].urlHash==hash){this.historyStack[this.historyStack.length-1]=this._createState(url,args,hash);return;}}
this.changingUrl=true;setTimeout("window.location.href = '"+hash+"';
dojo.undo.browser.changingUrl =
false;",1);this.bookmarkAnchor.href=hash;if(dojo.render.html.ie){url=this._loadIframeHistory();var
_2e3=args["back"]||args["backButton"]||args["handle"];var
tcb=function(_2e5){if(window.location.hash!=""){setTimeout("window.location.href
= '"+hash+"';",1);}
@@ -504,7 +504,7 @@
if(last){if(last.kwArgs["back"]){last.kwArgs["back"]();}else{if(last.kwArgs["backButton"]){last.kwArgs["backButton"]();}else{if(last.kwArgs["handle"]){last.kwArgs.handle("back");}}}}
this.forwardStack.push(_2ed);},handleForwardButton:function(){var
last=this.forwardStack.pop();if(!last){return;}
if(last.kwArgs["forward"]){last.kwArgs.forward();}else{if(last.kwArgs["forwardButton"]){last.kwArgs.forwardButton();}else{if(last.kwArgs["handle"]){last.kwArgs.handle("forward");}}}
-this.historyStack.push(last);},_createState:function(url,args,hash){return
{"url":url,"kwArgs":args,"urlHash":hash};},_getUrlQuery:function(url){var
_2f4=url.split("?");if(_2f4.length<2){return null;}else{return
_2f4[1];}},_loadIframeHistory:function(){var
url=dojo.hostenv.getBaseScriptUri()+"iframe_history.html?"+(new
Date()).getTime();this.moveForward=true;dojo.io.setIFrameSrc(this.historyIframe,url,false);return
url;}};dojo.provide("dojo.io.BrowserIO");dojo.io.checkChildrenForFile=function(node){var
_2f7=false;var
_2f8=node.getElementsByTagName("input");dojo.lang.forEach(_2f8,function(_2f9){if(_2f7){return;}
+this.historyStack.push(last);},_createState:function(url,args,hash){return
{"url":url,"kwArgs":args,"urlHash":hash};},_getUrlQuery:function(url){var
_2f4=url.split("?");if(_2f4.length<2){return null;}else{return
_2f4[1];}},_loadIframeHistory:function(){var
url=dojo.hostenv.getBaseScriptUri()+"iframe_history.html?"+(new
Date()).getTime();this.moveForward=true;dojo.io.setIFrameSrc(this.historyIframe,url,false);return
url;}};dojo.provide("dojo.io.BrowserIO");if(!dj_undef("window")){dojo.io.checkChildrenForFile=function(node){var
_2f7=false;var
_2f8=node.getElementsByTagName("input");dojo.lang.forEach(_2f8,function(_2f9){if(_2f7){return;}
if(_2f9.getAttribute("type")=="file"){_2f7=true;}});return
_2f7;};dojo.io.formHasFile=function(_2fa){return
dojo.io.checkChildrenForFile(_2fa);};dojo.io.updateNode=function(node,_2fc){node=dojo.byId(node);var
args=_2fc;if(dojo.lang.isString(_2fc)){args={url:_2fc};}
args.mimetype="text/html";args.load=function(t,d,e){while(node.firstChild){if(dojo["event"]){try{dojo.event.browser.clean(node.firstChild);}
catch(e){}}
@@ -567,7 +567,8 @@
if(!_34d){doLoad(_342,http,url,_344,_34f);_322._blockAsync=false;}
_342.abort=function(){try{http._aborted=true;}
catch(e){}
-return
http.abort();};return;};dojo.io.transports.addTransport("XMLHTTPTransport");};dojo.provide("dojo.io.cookie");dojo.io.cookie.setCookie=function(name,_356,days,path,_359,_35a){var
_35b=-1;if(typeof days=="number"&&days>=0){var d=new
Date();d.setTime(d.getTime()+(days*24*60*60*1000));_35b=d.toGMTString();}
+return
http.abort();};return;};dojo.io.transports.addTransport("XMLHTTPTransport");};}
+dojo.provide("dojo.io.cookie");dojo.io.cookie.setCookie=function(name,_356,days,path,_359,_35a){var
_35b=-1;if(typeof days=="number"&&days>=0){var d=new
Date();d.setTime(d.getTime()+(days*24*60*60*1000));_35b=d.toGMTString();}
_356=escape(_356);document.cookie=name+"="+_356+";"+(_35b!=-1?"
expires="+_35b+";":"")+(path?"path="+path:"")+(_359?";
domain="+_359:"")+(_35a?";
secure":"");};dojo.io.cookie.set=dojo.io.cookie.setCookie;dojo.io.cookie.getCookie=function(name){var
idx=document.cookie.lastIndexOf(name+"=");if(idx==-1){return null;}
var _35f=document.cookie.substring(idx+name.length+1);var
end=_35f.indexOf(";");if(end==-1){end=_35f.length;}
_35f=_35f.substring(0,end);_35f=unescape(_35f);return
_35f;};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,_366,_367,_368){if(arguments.length==5){_368=_366;_366=null;_367=null;}
@@ -942,7 +943,7 @@
var
_541=false;if(_53f!=null&&(_53f=="none"||_53f=="url(invalid-url:)")){this.accessible=true;}
dojo.body().removeChild(div);}
return
this.accessible;},setCheckAccessible:function(_542){this.doAccessibleCheck=_542;},setAccessibleMode:function(){if(this.accessible===null){if(this.checkAccessible()){dojo.render.html.prefixes.unshift("a11y");}}
-return
this.accessible;}};dojo.provide("dojo.widget.Widget");dojo.declare("dojo.widget.Widget",null,function(){this.children=[];this.extraArgs={};},{parent:null,children:[],extraArgs:{},isTopLevel:false,disabled:false,isContainer:false,widgetId:"",widgetType:"Widget",ns:"dojo",getNamespacedType:function(){return
(this.ns?this.ns+":"+this.widgetType:this.widgetType).toLowerCase();},toString:function(){return
"[Widget "+this.getNamespacedType()+", "+(this.widgetId||"NO
ID")+"]";},repr:function(){return
this.toString();},enable:function(){this.disabled=false;},disable:function(){this.disabled=true;},hide:function(){},show:function(){},onResized:function(){this.notifyChildrenOfResize();},notifyChildrenOfResize:function(){for(var
i=0;i<this.children.length;i++){var
_544=this.children[i];if(_544.onResized){_544.onResized();}}},create:function(args,_546,_547,ns){if(ns){this.ns=ns;}
+return
this.accessible;}};dojo.provide("dojo.widget.Widget");dojo.declare("dojo.widget.Widget",null,function(){this.children=[];this.extraArgs={};},{parent:null,isTopLevel:false,disabled:false,isContainer:false,widgetId:"",widgetType:"Widget",ns:"dojo",getNamespacedType:function(){return
(this.ns?this.ns+":"+this.widgetType:this.widgetType).toLowerCase();},toString:function(){return
"[Widget "+this.getNamespacedType()+", "+(this.widgetId||"NO
ID")+"]";},repr:function(){return
this.toString();},enable:function(){this.disabled=false;},disable:function(){this.disabled=true;},onResized:function(){this.notifyChildrenOfResize();},notifyChildrenOfResize:function(){for(var
i=0;i<this.children.length;i++){var
_544=this.children[i];if(_544.onResized){_544.onResized();}}},create:function(args,_546,_547,ns){if(ns){this.ns=ns;}
this.satisfyPropertySets(args,_546,_547);this.mixInProperties(args,_546,_547);this.postMixInProperties(args,_546,_547);dojo.widget.manager.add(this);this.buildRendering(args,_546,_547);this.initialize(args,_546,_547);this.postInitialize(args,_546,_547);this.postCreate(args,_546,_547);return
this;},destroy:function(_549){this.destroyChildren();this.uninitialize();this.destroyRendering(_549);dojo.widget.manager.removeById(this.widgetId);},destroyChildren:function(){var
_54a;var i=0;while(this.children.length>i){_54a=this.children[i];if(_54a
instanceof dojo.widget.Widget){this.removeChild(_54a);_54a.destroy();continue;}
i++;}},getChildrenOfType:function(type,_54d){var ret=[];var
_54f=dojo.lang.isFunction(type);if(!_54f){type=type.toLowerCase();}
for(var x=0;x<this.children.length;x++){if(_54f){if(this.children[x]
instanceof
type){ret.push(this.children[x]);}}else{if(this.children[x].widgetType.toLowerCase()==type){ret.push(this.children[x]);}}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/dojo.js.uncompressed.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/dojo.js.uncompressed.js?view=diff&rev=471253&r1=471252&r2=471253
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/dojo.js.uncompressed.js
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/dojo.js.uncompressed.js
Sat Nov 4 12:02:17 2006
@@ -652,7 +652,7 @@
components.push(str.substr(prevcomma));return components;}
dojo.provide("dojo.undo.browser");try{if((!djConfig["preventBackButtonFix"])&&(!dojo.hostenv.post_load_)){document.write("<iframe
style='border: 0px; width: 1px; height: 1px; position: absolute; bottom: 0px;
right: 0px; visibility: visible;' name='djhistory' id='djhistory'
src='"+(dojo.hostenv.getBaseScriptUri()+'iframe_history.html')+"'></iframe>");}}catch(e){}
if(dojo.render.html.opera){dojo.debug("Opera is not supported with
dojo.undo.browser, so back/forward detection will not work.");}
-dojo.undo.browser = {initialHref: window.location.href,initialHash:
window.location.hash,moveForward: false,historyStack: [],forwardStack:
[],historyIframe: null,bookmarkAnchor: null,locationTimer:
null,setInitialState: function(args){this.initialState =
this._createState(this.initialHref, args, this.initialHash);},addToHistory:
function(args){this.forwardStack = [];var hash = null;var url =
null;if(!this.historyIframe){this.historyIframe = window.frames["djhistory"];}
+dojo.undo.browser = {initialHref: (!dj_undef("window")) ? window.location.href
: "",initialHash: (!dj_undef("window")) ? window.location.hash :
"",moveForward: false,historyStack: [],forwardStack: [],historyIframe:
null,bookmarkAnchor: null,locationTimer: null,setInitialState:
function(args){this.initialState = this._createState(this.initialHref, args,
this.initialHash);},addToHistory: function(args){this.forwardStack = [];var
hash = null;var url = null;if(!this.historyIframe){this.historyIframe =
window.frames["djhistory"];}
if(!this.bookmarkAnchor){this.bookmarkAnchor =
document.createElement("a");dojo.body().appendChild(this.bookmarkAnchor);this.bookmarkAnchor.style.display
= "none";}
if(args["changeUrl"]){hash = "#"+ ((args["changeUrl"]!==true) ?
args["changeUrl"] : (new Date()).getTime());if(this.historyStack.length == 0 &&
this.initialState.urlHash == hash){this.initialState = this._createState(url,
args, hash);return;}else if(this.historyStack.length > 0 &&
this.historyStack[this.historyStack.length - 1].urlHash ==
hash){this.historyStack[this.historyStack.length - 1] = this._createState(url,
args, hash);return;}
this.changingUrl = true;setTimeout("window.location.href = '"+hash+"';
dojo.undo.browser.changingUrl = false;", 1);this.bookmarkAnchor.href =
hash;if(dojo.render.html.ie){url = this._loadIframeHistory();var oldCB =
args["back"]||args["backButton"]||args["handle"];var tcb =
function(handleName){if(window.location.hash !=
""){setTimeout("window.location.href = '"+hash+"';", 1);}
@@ -674,7 +674,7 @@
if(last.kwArgs["forward"]){last.kwArgs.forward();}else
if(last.kwArgs["forwardButton"]){last.kwArgs.forwardButton();}else
if(last.kwArgs["handle"]){last.kwArgs.handle("forward");}
this.historyStack.push(last);},_createState: function(url, args, hash){return
{"url": url, "kwArgs": args, "urlHash": hash};},_getUrlQuery: function(url){var
segments = url.split("?");if (segments.length < 2){return null;}
else{return segments[1];}},_loadIframeHistory: function(){var url =
dojo.hostenv.getBaseScriptUri()+"iframe_history.html?"+(new
Date()).getTime();this.moveForward =
true;dojo.io.setIFrameSrc(this.historyIframe, url, false);return url;}}
-dojo.provide("dojo.io.BrowserIO");dojo.io.checkChildrenForFile =
function(node){var hasFile = false;var inputs =
node.getElementsByTagName("input");dojo.lang.forEach(inputs,
function(input){if(hasFile){ return; }
+dojo.provide("dojo.io.BrowserIO");if(!dj_undef("window"))
{dojo.io.checkChildrenForFile = function(node){var hasFile = false;var inputs =
node.getElementsByTagName("input");dojo.lang.forEach(inputs,
function(input){if(hasFile){ return; }
if(input.getAttribute("type")=="file"){hasFile = true;}});return hasFile;}
dojo.io.formHasFile = function(formNode){return
dojo.io.checkChildrenForFile(formNode);}
dojo.io.updateNode = function(node, urlOrArgs){node = dojo.byId(node);var args
= urlOrArgs;if(dojo.lang.isString(urlOrArgs)){args = { url: urlOrArgs };}
@@ -758,7 +758,7 @@
kwArgs.abort = function(){try{http._aborted = true;}catch(e){}
return http.abort();}
return;}
-dojo.io.transports.addTransport("XMLHTTPTransport");}
+dojo.io.transports.addTransport("XMLHTTPTransport");}}
dojo.provide("dojo.io.cookie");dojo.io.cookie.setCookie = function(name,
value, days, path, domain, secure) {var expires = -1;if(typeof days == "number"
&& days >= 0) {var d = new
Date();d.setTime(d.getTime()+(days*24*60*60*1000));expires = d.toGMTString();}
value = escape(value);document.cookie = name + "=" + value + ";"
+ (expires != -1 ? " expires=" + expires + ";" : "")
@@ -1234,7 +1234,7 @@
var bUseImgElem = false;if (bkImg != null && (bkImg == "none" || bkImg ==
"url(invalid-url:)" )) {this.accessible = true;}
dojo.body().removeChild(div);}
return this.accessible;},setCheckAccessible: function(
bTest){this.doAccessibleCheck = bTest;},setAccessibleMode: function(){if
(this.accessible === null){if
(this.checkAccessible()){dojo.render.html.prefixes.unshift("a11y");}}
-return
this.accessible;}};dojo.provide("dojo.widget.Widget");dojo.declare("dojo.widget.Widget",
null,function(){this.children = [];this.extraArgs = {};},{parent:
null,children: [],extraArgs: {},isTopLevel: false,disabled: false,isContainer:
false,widgetId: "",widgetType: "Widget",ns: "dojo",getNamespacedType:
function(){return (this.ns ? this.ns + ":" + this.widgetType :
this.widgetType).toLowerCase();},toString: function(){return '[Widget ' +
this.getNamespacedType() + ', ' + (this.widgetId || 'NO ID') + ']';},repr:
function(){return this.toString();},enable: function(){this.disabled =
false;},disable: function(){this.disabled = true;},hide: function(){},show:
function(){},onResized:
function(){this.notifyChildrenOfResize();},notifyChildrenOfResize:
function(){for(var i=0; i<this.children.length; i++){var child =
this.children[i];if( child.onResized ){child.onResized();}}},create:
function(args, fragment, parent, ns){if(ns){this.ns = ns;}
+return
this.accessible;}};dojo.provide("dojo.widget.Widget");dojo.declare("dojo.widget.Widget",
null,function(){this.children = [];this.extraArgs = {};},{parent:
null,isTopLevel: false,disabled: false,isContainer: false,widgetId:
"",widgetType: "Widget",ns: "dojo",getNamespacedType: function(){return
(this.ns ? this.ns + ":" + this.widgetType :
this.widgetType).toLowerCase();},toString: function(){return '[Widget ' +
this.getNamespacedType() + ', ' + (this.widgetId || 'NO ID') + ']';},repr:
function(){return this.toString();},enable: function(){this.disabled =
false;},disable: function(){this.disabled = true;},onResized:
function(){this.notifyChildrenOfResize();},notifyChildrenOfResize:
function(){for(var i=0; i<this.children.length; i++){var child =
this.children[i];if( child.onResized ){child.onResized();}}},create:
function(args, fragment, parent, ns){if(ns){this.ns = ns;}
this.satisfyPropertySets(args, fragment, parent);this.mixInProperties(args,
fragment, parent);this.postMixInProperties(args, fragment,
parent);dojo.widget.manager.add(this);this.buildRendering(args, fragment,
parent);this.initialize(args, fragment, parent);this.postInitialize(args,
fragment, parent);this.postCreate(args, fragment, parent);return
this;},destroy:
function(finalize){this.destroyChildren();this.uninitialize();this.destroyRendering(finalize);dojo.widget.manager.removeById(this.widgetId);},destroyChildren:
function(){var widget;var i=0;while(this.children.length > i){widget =
this.children[i];if (widget instanceof dojo.widget.Widget)
{this.removeChild(widget);widget.destroy();continue;}
i++;}},getChildrenOfType: function(type, recurse){var ret = [];var isFunc =
dojo.lang.isFunction(type);if(!isFunc){type = type.toLowerCase();}
for(var x=0; x<this.children.length; x++){if(isFunc){if(this.children[x]
instanceof
type){ret.push(this.children[x]);}}else{if(this.children[x].widgetType.toLowerCase()
== type){ret.push(this.children[x]);}}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/hostenv_rhino.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/hostenv_rhino.js?view=diff&rev=471253&r1=471252&r2=471253
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/hostenv_rhino.js
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/hostenv_rhino.js
Sat Nov 4 12:02:17 2006
@@ -1,5 +1,6 @@
-dojo.hostenv.println=function(line){print(line);}
+dojo.hostenv.println=function(line){if(arguments.length >
0){print(arguments[0]);for(var i=1; i<arguments.length; i++){var
valid=false;for (var p in arguments[i]){valid=true;break;}
+if(valid){dojo.debugShallow(arguments[i]);}}} else {print(line);}}
dojo.locale = dojo.locale ||
java.util.Locale.getDefault().toString().replace('_','-').toLowerCase();dojo.render.name
= dojo.hostenv.name_ = 'rhino';dojo.hostenv.getVersion = function() {return
version();};if (dj_undef("byId")) {dojo.byId = function(id, doc){if(id &&
(typeof id == "string" || id instanceof String)){if(!doc){ doc = document; }
return doc.getElementById(id);}
return id;}}
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=471253&r1=471252&r2=471253
==============================================================================
--- 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
Sat Nov 4 12:02:17 2006
@@ -1,5 +1,5 @@
-dojo.provide("dojo.io.RhinoIO");dojo.require("dojo.io.common");dojo.require("dojo.lang.func");dojo.require("dojo.lang.array");dojo.require("dojo.string.extras");dojo.io.RhinoHTTPTransport
= new function(){this.canHandle =
function(req){if(!dojo.lang.inArray((req.mimetype.toLowerCase() ||
""),["text/plain", "text/html", "text/javascript", "text/json",
"application/json"])){return false;}
+dojo.provide("dojo.io.RhinoIO");dojo.require("dojo.io.common");dojo.require("dojo.lang.func");dojo.require("dojo.lang.array");dojo.require("dojo.string.extras");dojo.io.RhinoHTTPTransport
= new function(){this.canHandle =
function(req){if(!dojo.lang.find(["text/plain", "text/html", "text/xml",
"text/javascript", "text/json", "application/json"],(req.mimetype.toLowerCase()
|| ""))){return false;}
if(req.url.substr(0, 7) != "http://";){return false;}
return true;}
function doLoad(req, conn){var ret;if (req.method.toLowerCase() ==
"head"){}else{var stream = conn.getContent();var reader = new
java.io.BufferedReader(new java.io.InputStreamReader(stream));var text = "";var
line = null;while((line = reader.readLine()) != null){text += line;}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/logging/Logger.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/logging/Logger.js?view=diff&rev=471253&r1=471252&r2=471253
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/logging/Logger.js
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/logging/Logger.js
Sat Nov 4 12:02:17 2006
@@ -1,6 +1,6 @@
dojo.provide("dojo.logging.Logger");dojo.provide("dojo.logging.LogFilter");dojo.provide("dojo.logging.Record");dojo.require("dojo.lang.common");dojo.logging.Record
= function(logLevel, message){this.level = logLevel;this.message =
"";this.msgArgs = [];this.time = new
Date();if(dojo.lang.isArray(message)){if(message.length > 0 &&
dojo.lang.isString(message[0])){this.message=message.shift();}
-this.message = message;}else{this.message = message;}}
+this.msgArgs = message;}else{this.message = message;}}
dojo.logging.LogFilter = function(loggerChain){this.passChain = loggerChain ||
"";this.filter = function(record){return true;}}
dojo.logging.Logger = function(){this.cutOffLevel = 0;this.propagate =
true;this.parent = null;this.data = [];this.filters = [];this.handlers = [];}
dojo.extend(dojo.logging.Logger,{argsToArr: function(args){var ret =
[];for(var x=0; x<args.length; x++){ret.push(args[x]);}
@@ -30,5 +30,5 @@
dojo.logging.MemoryLogHandler = function(level, recordsToKeep, postType,
postInterval){dojo.logging.LogHandler.call(this, level);this.numRecords =
(typeof djConfig['loggingNumRecords'] != 'undefined') ?
djConfig['loggingNumRecords'] : ((recordsToKeep) ? recordsToKeep :
-1);this.postType = (typeof djConfig['loggingPostType'] != 'undefined') ?
djConfig['loggingPostType'] : ( postType || -1);this.postInterval = (typeof
djConfig['loggingPostInterval'] != 'undefined') ?
djConfig['loggingPostInterval'] : ( postType || -1);}
dojo.lang.inherits(dojo.logging.MemoryLogHandler,
dojo.logging.LogHandler);dojo.lang.extend(dojo.logging.MemoryLogHandler,{emit:function(record){if
(!djConfig.isDebug) { return; }
var logStr = String(dojo.log.getLevelName(record.level)+": "
-+record.time.toLocaleTimeString())+": "+record.message;if(!dj_undef("println",
dojo.hostenv)){dojo.hostenv.println(logStr);}
++record.time.toLocaleTimeString())+": "+record.message;if(!dj_undef("println",
dojo.hostenv)){dojo.hostenv.println(logStr, record.msgArgs);}
this.data.push(record);if(this.numRecords !=
-1){while(this.data.length>this.numRecords){this.data.shift();}}}});dojo.logging.logQueueHandler
= new
dojo.logging.MemoryLogHandler(0,50,0,10000);dojo.logging.log.addHandler(dojo.logging.logQueueHandler);dojo.log
= dojo.logging.log;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/test.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/test.js?view=diff&rev=471253&r1=471252&r2=471253
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/test.js
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/test.js Sat Nov
4 12:02:17 2006
@@ -3,6 +3,8 @@
dojo.require("dojo.logging.Logger");
dojo.require("dojo.event.browser");
+djConfig.locale="en_US";
+
// override to make sure our fake events pass
dojo.event.browser.isEvent=function() { return true; }
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/form/test_datetime.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/form/test_datetime.js?view=diff&rev=471253&r1=471252&r2=471253
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/form/test_datetime.js
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/form/test_datetime.js
Sat Nov 4 12:02:17 2006
@@ -6,8 +6,6 @@
dojo.require("tapestry.form");
dojo.require("tapestry.form.datetime");
-dojo.require("dojo.widget.TimePicker");
-
function test_datetime_validDate(){
var value = "08/15/1999";
// jum.assertFalse(value, tapestry.form.datetime.isValidDate(value,
{}));
@@ -62,6 +60,11 @@
jum.assertFalse(value, tapestry.form.datetime.isValidDate(value,
{strict:true,max:"06 Aug 2006",datePattern:"dd MMM
yyyy",selector:"dateOnly"}));
+
jum.assertTrue(value, tapestry.form.datetime.isValidDate(value,
{strict:true,max:"19 Aug 2006",datePattern:"dd MMM
yyyy",selector:"dateOnly"}));
+
+ value = "4 Nov 2006";
+ jum.assertTrue(value, tapestry.form.datetime.isValidDate(value,
+ {max:"04 Nov 2006",datePattern:"dd MMM yyyy"}));
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_debug.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_debug.js?view=diff&rev=471253&r1=471252&r2=471253
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_debug.js
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_debug.js Sat
Nov 4 12:02:17 2006
@@ -1,4 +1,5 @@
dojo.require("dojo.logging.Logger");
+dojo.require("dojo.io.RhinoIO");
function test_debug_log(){
dojo.log.debug("Debug message.");
@@ -14,11 +15,11 @@
dojo.log.setLevel(dojo.log.getLevel("WARNING"));
dojo.log.info("SHOULD NOT SEE THIS");
var last = dojo.logging.logQueueHandler.data.pop();
- jum.assertEquals("filterwarn", "info msg", last.message);
+ jum.assertEquals("info msg", last.message);
var currLength = dojo.logging.logQueueHandler.data.length;
dojo.log.debug("DEFINITELY SHOULDNT see this");
jum.assertEquals("logmsglength", currLength,
dojo.logging.logQueueHandler.data.length);
dojo.log.setLevel(dojo.log.getLevel("DEBUG"));
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_form.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_form.js?view=diff&rev=471253&r1=471252&r2=471253
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_form.js
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_form.js Sat
Nov 4 12:02:17 2006
@@ -11,12 +11,12 @@
var node = document.createElement("div");
node.setAttribute("id", "testid");
- jum.assertTrue("findwithNode", Tapestry.find(node));
- jum.assertTrue("findwithId", Tapestry.find("testid"));
+ jum.assertTrue(Tapestry.find(node));
+ jum.assertTrue(Tapestry.find("testid"));
}
function test_last_msg(){
- jum.assertFalse("lastMessage", lastMsgContains());
+ jum.assertFalse(lastMsgContains());
}
function test_form_deprecated(){
@@ -94,7 +94,7 @@
dojo.event.connect(dojo.io, "queueBind", this, checkSubmitParms);
tapestry.form.registerForm("formparmtest");
- tapestry.form.submit("formparmtest", null, {async:true,url:"/new/url"});
+ tapestry.form.submit("formparmtest", null, {async:true,url:"/a/url"});
jum.assertTrue("bindCalled", bindCalled);
@@ -103,7 +103,7 @@
function checkSubmitParms(kwArgs){
bindCalled=true;
- jum.assertEquals("submitParmUrl", kwArgs["url"], "/new/url");
+ jum.assertEquals("submitParmUrl", kwArgs["url"], "/a/url");
}
function test_submit_defaultParms(){
@@ -111,7 +111,7 @@
var node = document.createElement("form");
node.setAttribute("id", "formasynctest");
node.setAttribute("method", "post");
- node.setAttribute("action", "/default/url");
+ node.setAttribute("action", "/a/url");
node.submit=function(){}
node.submitname={value:""};
node.elements=[];
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java?view=diff&rev=471253&r1=471252&r2=471253
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java
Sat Nov 4 12:02:17 2006
@@ -158,6 +158,9 @@
expect(context.getProfile()).andReturn(json);
context.addInitializationScript(field,
"dojo.require(\"tapestry.form.datetime\");");
+ context.addInitializationScript(field,
+
"dojo.requireLocalization(\"dojo.i18n.calendar\",\"gregorian\",\""
+ + locale + "\");");
String strMax = translator.format(field, locale, maxDate);
@@ -204,6 +207,9 @@
expect(context.getProfile()).andReturn(json);
context.addInitializationScript(field,
"dojo.require(\"tapestry.form.datetime\");");
+ context.addInitializationScript(field,
+
"dojo.requireLocalization(\"dojo.i18n.calendar\",\"gregorian\",\""
+ + locale + "\");");
String strMax = translator.format(field, locale, maxDate);
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java?view=diff&rev=471253&r1=471252&r2=471253
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java
Sat Nov 4 12:02:17 2006
@@ -158,6 +158,9 @@
expect(context.getProfile()).andReturn(json);
context.addInitializationScript(field,
"dojo.require(\"tapestry.form.datetime\");");
+ context.addInitializationScript(field,
+
"dojo.requireLocalization(\"dojo.i18n.calendar\",\"gregorian\",\""
+ + locale + "\");");
String strMin = translator.format(field, locale, minDate);
@@ -204,6 +207,9 @@
expect(context.getProfile()).andReturn(json);
context.addInitializationScript(field,
"dojo.require(\"tapestry.form.datetime\");");
+ context.addInitializationScript(field,
+
"dojo.requireLocalization(\"dojo.i18n.calendar\",\"gregorian\",\""
+ + locale + "\");");
String strMin = translator.format(field, locale, minDate);
