Author: jkuhnert
Date: Wed Aug 1 08:17:24 2007
New Revision: 561836
URL: http://svn.apache.org/viewvc?view=rev&rev=561836
Log:
Fixes ie bugs in dojo.json.serialize.
Fixed bug in localization of calendar resources.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo-0.4.3/dojo2.js
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo-0.4.3/src/date/format.js
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo-0.4.3/src/widget/TimePicker.js
tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js
tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java?view=diff&rev=561836&r1=561835&r2=561836
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
Wed Aug 1 08:17:24 2007
@@ -67,10 +67,10 @@
private boolean _debugAtAllCosts;
/** Default list of pre-bundled dojo supported locales */
- protected String[] SUPPORTED_LOCALES = { "en-us", "en", "de-de", "de",
"en-gb",
+ protected String[] SUPPORTED_LOCALES = { "en-us", "de-de", "de", "en-gb",
"es-es", "es", "fr-fr", "fr",
"zh-cn",
"zh-tw", "zh" , "it-it", "it",
"ja-jp",
- "ja", "ko-kr", "ko", "pt-br",
"pt", "xx"};
+ "ja", "ko-kr", "ko", "pt-br",
"pt", "en", "xx"};
/**
* [EMAIL PROTECTED]
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo-0.4.3/dojo2.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo-0.4.3/dojo2.js?view=diff&rev=561836&r1=561835&r2=561836
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo-0.4.3/dojo2.js
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo-0.4.3/dojo2.js Wed
Aug 1 08:17:24 2007
@@ -1142,8 +1142,8 @@
dojo.require("dojo.lang.func");
dojo.require("dojo.string.common");
dojo.require("dojo.i18n.common");
-dojo.requireLocalization("dojo.i18n.calendar","gregorian", null,
dojo.hostenv.localesGenerated.join(","));
-dojo.requireLocalization("dojo.i18n.calendar","gregorianExtras", null,
dojo.hostenv.localesGenerated.join(","));
+dojo.requireLocalization("dojo.i18n.calendar","gregorian",null,"zh-cn,zh-hk,de,ko,zh-tw,zh,ja,fi,pt-br,fr,es,ROOT,hu,en,it,sv,nl,pt");
+dojo.requireLocalization("dojo.i18n.calendar","gregorianExtras",null,"zh,ja,ROOT");
(function(){
dojo.date.format=function(_f4,_f5){
if(typeof _f5=="string"){
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo-0.4.3/src/date/format.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo-0.4.3/src/date/format.js?view=diff&rev=561836&r1=561835&r2=561836
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo-0.4.3/src/date/format.js
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo-0.4.3/src/date/format.js
Wed Aug 1 08:17:24 2007
@@ -6,8 +6,8 @@
dojo.require("dojo.lang.func");
dojo.require("dojo.string.common");
dojo.require("dojo.i18n.common");
-dojo.requireLocalization("dojo.i18n.calendar","gregorian",null,
dojo.hostenv.localesGenerated.join(","));
-dojo.requireLocalization("dojo.i18n.calendar","gregorianExtras",null,
dojo.hostenv.localesGenerated.join(","));
+dojo.requireLocalization("dojo.i18n.calendar","gregorian",null,"zh-cn,zh-hk,de,ko,zh-tw,zh,ja,fi,pt-br,fr,es,ROOT,hu,en,it,sv,nl,pt");
+dojo.requireLocalization("dojo.i18n.calendar","gregorianExtras",null,"zh,ja,ROOT");
(function(){
dojo.date.format=function(_1,_2){
if(typeof _2=="string"){
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo-0.4.3/src/widget/TimePicker.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo-0.4.3/src/widget/TimePicker.js?view=diff&rev=561836&r1=561835&r2=561836
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo-0.4.3/src/widget/TimePicker.js
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo-0.4.3/src/widget/TimePicker.js
Wed Aug 1 08:17:24 2007
@@ -6,7 +6,7 @@
dojo.require("dojo.date.format");
dojo.require("dojo.dom");
dojo.require("dojo.html.style");
-dojo.requireLocalization("dojo.i18n.calendar","gregorian",null,
dojo.hostenv.localesGenerated.join(","));
+dojo.requireLocalization("dojo.i18n.calendar","gregorian",null,"zh-cn,zh-hk,de,ko,zh-tw,zh,ja,fi,pt-br,fr,es,ROOT,hu,en,it,sv,nl,pt");
dojo.requireLocalization("dojo.widget","TimePicker",null,"ROOT");
dojo.widget.defineWidget("dojo.widget.TimePicker",dojo.widget.HtmlWidget,function(){
this.time="";
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js?view=diff&rev=561836&r1=561835&r2=561836
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js Wed Aug
1 08:17:24 2007
@@ -3,11 +3,15 @@
dojo.provide("tapestry.event");
dojo.provide("tapestry.lang");
+dojo.provide("dojo.AdapterRegistry");
+dojo.provide("dojo.json");
+
dojo.require("dojo.lang.common");
dojo.require("dojo.io.BrowserIO");
dojo.require("dojo.event.browser");
dojo.require("dojo.html.style");
-
+dojo.require("dojo.lang.func");
+dojo.require("dojo.string.extras");
// redirect logging calls to standard debug if logging not enabled
@@ -619,10 +623,9 @@
if(event["layerY"]) props.beventlayerY=event.layerY;
if (event["target"]) this.buildTargetProperties(props,
event.target);
-
- } else if ( typeof args != "undefined" ) {
- props.methodArguments = dojo.json.serialize( args );
}
+
+ props.methodArguments = dojo.json.serialize( args );
return props;
},
@@ -714,23 +717,6 @@
}
}
-/*
- ** dojo json support just dumped in here until we build dojo anew for T4 **
-
- Copyright (c) 2004-2006, The Dojo Foundation
- All Rights Reserved.
-
- Licensed under the Academic Free License version 2.1 or above OR the
- modified BSD license. For more information on Dojo licensing, see:
-
- http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.require("dojo.lang.func");
-dojo.require("dojo.string.extras");
-
dojo.AdapterRegistry = function (returnWrappers) {
this.pairs = [];
this.returnWrappers = returnWrappers || false;
@@ -762,9 +748,13 @@
}});
-dojo.json = {jsonRegistry:new dojo.AdapterRegistry(), register:function (name,
check, wrap, override) {
- dojo.json.jsonRegistry.register(name, check, wrap, override);
-}, evalJson:function (json) {
+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 + ")");
}
@@ -772,7 +762,9 @@
dojo.debug(e);
return json;
}
-}, serialize:function (o) {
+ },
+
+ serialize:function (o) {
var objtype = typeof (o);
if (objtype == "undefined") {
return "undefined";
@@ -796,15 +788,18 @@
return me(newObj);
}
}
+
if (typeof (o.json) == "function") {
newObj = o.json();
if (o !== newObj) {
return me(newObj);
}
}
+
if (objtype != "function" && typeof (o.length) == "number") {
var res = [];
for (var i = 0; i < o.length; i++) {
+ if (dojo.event.browser.isEvent(o[i]) ||
o[i]["stopPropagation"]){continue;}
var val = me(o[i]);
if (typeof (val) != "string") {
val = "undefined";
@@ -823,6 +818,7 @@
if (objtype == "function") {
return null;
}
+
res = [];
for (var k in o) {
var useKey;
@@ -842,4 +838,4 @@
res.push(useKey + ":" + val);
}
return "{" + res.join(",") + "}";
-}};
\ No newline at end of file
+}};
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js?view=diff&rev=561836&r1=561835&r2=561836
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js Wed Aug
1 08:17:24 2007
@@ -1,8 +1,15 @@
dojo.provide("tapestry.form");
+dojo.provide("tapestry.form.datetime");
+dojo.provide("tapestry.form.validation");
+
dojo.require("dojo.event.browser");
dojo.require("dojo.dom");
dojo.require("dojo.html.selection");
dojo.require("tapestry.core");
+dojo.require("dojo.date.format");
+dojo.require("dojo.validate.datetime");
+dojo.require("dojo.validate.check");
+dojo.require("dojo.html.style");
/**
* package: tapestry.form
@@ -440,10 +447,6 @@
}
}
-dojo.provide("tapestry.form.validation");
-dojo.require("dojo.validate.check");
-dojo.require("dojo.html.style");
-
tapestry.form.validation={
missingClass:"fieldMissing", // default css class that will be applied
to fields missing a value
@@ -740,10 +743,6 @@
return num <= max;
}
}
-
-dojo.provide("tapestry.form.datetime");
-dojo.require("dojo.date.format");
-dojo.require("dojo.validate.datetime");
tapestry.form.datetime={
