You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by an...@apache.org on 2007/12/17 19:25:40 UTC
svn commit: r604959 - in /tapestry/tapestry4/trunk/tapestry-framework/src:
java/org/apache/tapestry/dojo/form/ java/org/apache/tapestry/form/
java/org/apache/tapestry/form/translator/
java/org/apache/tapestry/form/validator/ js/tapestry/ js/tapestry/sk...
Author: andyhot
Date: Mon Dec 17 10:25:39 2007
New Revision: 604959
URL: http://svn.apache.org/viewvc?rev=604959&view=rev
Log:
TAPESTRY-1902: Clean up redundant requires
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/GTimePicker.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/SubmitBindings.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java
tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js
tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/skeleton/core.js
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMax.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.script?rev=604959&r1=604958&r2=604959&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.script Mon Dec 17 10:25:39 2007
@@ -8,8 +8,8 @@
<input-symbol key="widget" required="yes" />
<body>
<unique>
- dojo.require("dojo.widget.*");
dojo.require("tapestry.widget.Widget");
+ dojo.require("dojo.widget.DropdownDatePicker");
</unique>
</body>
<initialization>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.script?rev=604959&r1=604958&r2=604959&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.script Mon Dec 17 10:25:39 2007
@@ -8,7 +8,6 @@
<input-symbol key="widget" required="yes" />
<body>
<unique>
- dojo.require("dojo.widget.Manager");
dojo.require("tapestry.widget.Widget");
dojo.require("dojo.widget.DropdownTimePicker");
</unique>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/GTimePicker.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/GTimePicker.script?rev=604959&r1=604958&r2=604959&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/GTimePicker.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/GTimePicker.script Mon Dec 17 10:25:39 2007
@@ -8,7 +8,6 @@
<input-symbol key="widget" required="yes" />
<body>
<unique>
- dojo.require("dojo.widget.Manager");
dojo.require("tapestry.widget.Widget");
</unique>
</body>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/SubmitBindings.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/SubmitBindings.script?rev=604959&r1=604958&r2=604959&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/SubmitBindings.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/SubmitBindings.script Mon Dec 17 10:25:39 2007
@@ -9,7 +9,6 @@
<input-symbol key="parms" />
<body>
<unique>
- dojo.require("dojo.event.common");
dojo.require("tapestry.form");
</unique>
</body>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java?rev=604959&r1=604958&r2=604959&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java Mon Dec 17 10:25:39 2007
@@ -126,8 +126,6 @@
}
JSONObject cons = profile.getJSONObject(ValidationConstants.CONSTRAINTS);
- context.addInitializationScript(field, "dojo.require(\"dojo.i18n.number\");");
-
DecimalFormat format = getDecimalFormat(context.getLocale());
String grouping = "";
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java?rev=604959&r1=604958&r2=604959&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java Mon Dec 17 10:25:39 2007
@@ -96,8 +96,6 @@
}
JSONObject cons = profile.getJSONObject(ValidationConstants.CONSTRAINTS);
- context.addInitializationScript(field, "dojo.require(\"dojo.i18n.number\");");
-
String maxString = getStringValue(context.getLocale(), field);
String grouping = "";
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java?rev=604959&r1=604958&r2=604959&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java Mon Dec 17 10:25:39 2007
@@ -96,8 +96,6 @@
}
JSONObject cons = profile.getJSONObject(ValidationConstants.CONSTRAINTS);
- context.addInitializationScript(field, "dojo.require(\"dojo.i18n.number\");");
-
String minString = getStringValue(context.getLocale(), field);
String grouping = "";
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?rev=604959&r1=604958&r2=604959&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js Mon Dec 17 10:25:39 2007
@@ -732,6 +732,7 @@
* the locale settings configured for the current page.
*/
greaterThanOrEqual:function(value, minString, flags){
+ dojo.require("dojo.i18n.number");
flags.validate=false;
var min = dojo.i18n.number.parse(minString, null, flags);
var num = dojo.i18n.number.parse(value, null, flags);
@@ -746,6 +747,7 @@
* the locale settings configured for the current page.
*/
lessThanOrEqual:function(value, maxString, flags){
+ dojo.require("dojo.i18n.number");
flags.validate=false;
var max = dojo.i18n.number.parse(maxString, null, flags);
var num = dojo.i18n.number.parse(value, null, flags);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/skeleton/core.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/skeleton/core.js?rev=604959&r1=604958&r2=604959&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/skeleton/core.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/skeleton/core.js Mon Dec 17 10:25:39 2007
@@ -159,3 +159,7 @@
tapestry.event = {
stopEvent: function() {tapestry.log('t.e.stopEvent', arguments);}
};
+
+tapestry.widget = {
+ synchronizeWidgetState: function() {tapestry.log('t.w.synchronizeWidgetState', arguments);}
+};
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java?rev=604959&r1=604958&r2=604959&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java Mon Dec 17 10:25:39 2007
@@ -240,7 +240,6 @@
FormComponentContributorContext context = newMock(FormComponentContributorContext.class);
expect(context.getProfile()).andReturn(json);
- context.addInitializationScript(field, "dojo.require(\"dojo.i18n.number\");");
trainGetLocale(context, Locale.ENGLISH);
@@ -273,7 +272,6 @@
FormComponentContributorContext context = newMock(FormComponentContributorContext.class);
expect(context.getProfile()).andReturn(json);
- context.addInitializationScript(field, "dojo.require(\"dojo.i18n.number\");");
trainGetLocale(context, Locale.US);
@@ -308,7 +306,6 @@
FormComponentContributorContext context = newMock(FormComponentContributorContext.class);
expect(context.getProfile()).andReturn(json);
- context.addInitializationScript(field, "dojo.require(\"dojo.i18n.number\");");
trainGetLocale(context, Locale.ENGLISH);
@@ -346,7 +343,6 @@
FormComponentContributorContext context = newMock(FormComponentContributorContext.class);
expect(context.getProfile()).andReturn(json);
- context.addInitializationScript(field, "dojo.require(\"dojo.i18n.number\");");
trainGetLocale(context, Locale.ENGLISH);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMax.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMax.java?rev=604959&r1=604958&r2=604959&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMax.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMax.java Mon Dec 17 10:25:39 2007
@@ -109,8 +109,6 @@
FormComponentContributorContext context = newMock(FormComponentContributorContext.class);
IFormComponent field = newField("My Field", "myfield");
- context.addInitializationScript(field, "dojo.require(\"dojo.i18n.number\");");
-
Locale locale = Locale.GERMAN;
DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
@@ -142,8 +140,6 @@
JSONObject json = new JSONObject();
FormComponentContributorContext context = newMock(FormComponentContributorContext.class);
IFormComponent field = newField("My Field", "myfield");
-
- context.addInitializationScript(field, "dojo.require(\"dojo.i18n.number\");");
Locale locale = Locale.JAPAN;
DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java?rev=604959&r1=604958&r2=604959&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/validator/TestMin.java Mon Dec 17 10:25:39 2007
@@ -110,8 +110,6 @@
FormComponentContributorContext context = newMock(FormComponentContributorContext.class);
IFormComponent field = newField("My Field", "myfield");
- context.addInitializationScript(field, "dojo.require(\"dojo.i18n.number\");");
-
Locale locale = Locale.FRANCE;
DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
@@ -140,8 +138,6 @@
JSONObject json = new JSONObject();
FormComponentContributorContext context = newMock(FormComponentContributorContext.class);
IFormComponent field = newField("My Field", "myfield");
-
- context.addInitializationScript(field, "dojo.require(\"dojo.i18n.number\");");
Locale locale = Locale.FRANCE;
DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);