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/09/22 05:09:01 UTC
svn commit: r578359 - in /tapestry/tapestry4/trunk/tapestry-framework/src:
java/org/apache/tapestry/ java/org/apache/tapestry/dojo/html/
java/org/apache/tapestry/form/ java/org/apache/tapestry/html/
java/org/apache/tapestry/link/ java/org/apache/tapest...
Author: andyhot
Date: Fri Sep 21 20:09:00 2007
New Revision: 578359
URL: http://svn.apache.org/viewvc?rev=578359&view=rev
Log:
TAPESTRY-1767 + TAPESTRY-1768: Use tapestry js.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/ComponentEvent.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/InlineEditBox.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/WidgetEvent.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/DatePicker.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/MaskEdit.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/SubmitBindings.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/ElementEvent.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLink.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/DateValidator.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/EmailValidator.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/IntegerValidator.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/NumberValidator.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/PatternValidator.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/StringValidator.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/UrlValidator.script
tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/ComponentEvent.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/ComponentEvent.script?rev=578359&r1=578358&r2=578359&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/ComponentEvent.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/ComponentEvent.script Fri Sep 21 20:09:00 2007
@@ -16,7 +16,7 @@
<initialization>
<if expression="events">
<foreach expression="events" key="event">
- tapestry.cleanConnect(dojo.byId("${clientId}"), "${event[0]}", "event${event[1]}");
+ tapestry.cleanConnect("${clientId}", "${event[0]}", "event${event[1]}");
tapestry.event${event[1]}=function( event ){
var content={beventname:"${event[0]}", bcomponentid:"${component.id}"};
@@ -28,13 +28,12 @@
tapestry.bind("${url}", content);
};
- dojo.event.connect(dojo.byId("${clientId}"), "${event[0]}", tapestry, "event${event[1]}");
+ tapestry.connect("${clientId}", "${event[0]}", "event${event[1]}");
</foreach>
</if>
<if expression="formEvents">
<foreach expression="formEvents" key="formEvent">
- tapestry.cleanConnect(dojo.byId("${clientId}"),
- "${formEvent[0]}", "formEvent${formEvent[4]}");
+ tapestry.cleanConnect("${clientId}", "${formEvent[0]}", "formEvent${formEvent[4]}");
tapestry.formEvent${formEvent[4]}=function(e){
var content={beventname:"${formEvent[0]}", bcomponentid:"${component.id}"};
tapestry.event.buildEventProperties(e, content, arguments);
@@ -56,8 +55,7 @@
tapestry.form.setFormValidating("${formName}", validateState);
</foreach>
};
- dojo.event.connect(dojo.byId("${clientId}"), "${formEvent[0]}",
- tapestry, "formEvent${formEvent[4]}");
+ tapestry.connect("${clientId}", "${formEvent[0]}", "formEvent${formEvent[4]}");
</foreach>
</if>
</initialization>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/InlineEditBox.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/InlineEditBox.script?rev=578359&r1=578358&r2=578359&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/InlineEditBox.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/InlineEditBox.script Fri Sep 21 20:09:00 2007
@@ -38,7 +38,7 @@
</if-not><if expression="component.disabled">
${box}.disable();
</if>
- dojo.event.connectOnce(${box}.form, "onsubmit", function(e){dojo.event.browser.stopEvent(e);});
+ dojo.event.connectOnce(${box}.form, "onsubmit", function(e){tapestry.event.stopEvent(e);});
dojo.event.connectOnce(${box}, "onSave", function(newValue, oldValue){
tapestry.bind("${component.updateUrl}", {"${component.clientId}":newValue}, true);
});
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/WidgetEvent.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/WidgetEvent.script?rev=578359&r1=578358&r2=578359&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/WidgetEvent.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/WidgetEvent.script Fri Sep 21 20:09:00 2007
@@ -16,20 +16,19 @@
<initialization>
<if expression="events">
<foreach expression="events" key="event">
- tapestry.cleanConnect(dojo.widget.byId("${clientId}"), "${event[0]}", "event${event[1]}");
+ tapestry.cleanConnectWidget("${clientId}", "${event[0]}", "event${event[1]}");
tapestry.event${event[1]}=function(e){
var content={beventname:"${event[0]}", bcomponentid:"${component.id}"};
tapestry.event.buildEventProperties(e, content, arguments);
if (!content["beventtarget.id"]) content["beventtarget.id"]="${clientId}";
tapestry.bind("${url}", content);
};
- dojo.event.connect(dojo.widget.byId("${clientId}"), "${event[0]}", tapestry, "event${event[1]}");
+ tapestry.connectWidget("${clientId}", "${event[0]}", "event${event[1]}");
</foreach>
</if>
<if expression="formEvents">
<foreach expression="formEvents" key="formEvent">
- tapestry.cleanConnect(dojo.widget.byId("${clientId}"),
- "${formEvent[0]}", "formEvent${formEvent[4]}");
+ tapestry.cleanConnectWidget("${clientId}", "${formEvent[0]}", "formEvent${formEvent[4]}");
tapestry.formEvent${formEvent[4]}=function(e){
var content={beventname:"${formEvent[0]}", bcomponentid:"${component.id}"};
tapestry.event.buildEventProperties(e, content, arguments);
@@ -38,8 +37,7 @@
<foreach expression="formEvent[1]" key="formName">
var validateState=tapestry.form.forms["${formName}"].validateForm;
var validateForm=${formEvent[3]};
- tapestry.form.setFormValidating("${formName}", validateForm);
-
+ tapestry.form.setFormValidating("${formName}", validateForm);
<if expression="formEvent[2]">
tapestry.form.submitAsync("${formName}", content);
</if>
@@ -50,8 +48,7 @@
tapestry.form.setFormValidating("${formName}", validateState);
</foreach>
};
- dojo.event.connect(dojo.widget.byId("${clientId}"), "${formEvent[0]}",
- tapestry, "formEvent${formEvent[4]}");
+ tapestry.connectWidget("${clientId}", "${formEvent[0]}", "formEvent${formEvent[4]}");
</foreach>
</if>
</initialization>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/DatePicker.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/DatePicker.script?rev=578359&r1=578358&r2=578359&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/DatePicker.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/DatePicker.script Fri Sep 21 20:09:00 2007
@@ -41,7 +41,7 @@
</let>
<let key="buttonOnclickHandler">
- javascript:${calendarObject}.toggle(dojo.byId("${name}"));
+ javascript:${calendarObject}.toggle(tapestry.byId("${name}"));
</let>
<body>
@@ -61,7 +61,7 @@
[${shortWeekDayNames}],
"${format}", ${firstDayInWeek}, ${includeWeek}, ${minimalDaysInFirstWeek}, "${clearButtonLabel}");
${calendarObject}.onchange = function() {
- var field = dojo.byId("${formName}").${name};
+ var field = tapestry.byId("${formName}").${name};
var value = ${calendarObject}.formatDate();
if (field.value != value) {
field.value = value;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/MaskEdit.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/MaskEdit.script?rev=578359&r1=578358&r2=578359&view=diff
==============================================================================
Binary files - no diff available.
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=578359&r1=578358&r2=578359&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 Fri Sep 21 20:09:00 2007
@@ -14,9 +14,9 @@
</unique>
</body>
<initialization>
- tapestry.cleanConnect(dojo.byId("${submit.clientId}"), "onclick", "event${key}");
+ tapestry.cleanConnect("${submit.clientId}", "onclick", "event${key}");
tapestry.event${key}=function(e){
- dojo.event.browser.stopEvent(e);
+ tapestry.event.stopEvent(e);
<if expression="parms != null">
<if expression="type != null">
tapestry.form.${type}("${submit.form.clientId}", "${submit.name}", ${parms});
@@ -34,6 +34,6 @@
</if-not>
</if-not>
};
- dojo.event.connect(dojo.byId("${submit.clientId}"), "onclick", tapestry, "event${key}");
+ tapestry.connect("${submit.clientId}", "onclick", "event${key}");
</initialization>
</script>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/ElementEvent.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/ElementEvent.script?rev=578359&r1=578358&r2=578359&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/ElementEvent.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/ElementEvent.script Fri Sep 21 20:09:00 2007
@@ -15,20 +15,19 @@
<initialization>
<if expression="events">
<foreach expression="events" key="event">
- tapestry.cleanConnect(dojo.byId("${target}"), "${event[0]}", "event${event[1]}");
+ tapestry.cleanConnect("${target}", "${event[0]}", "event${event[1]}");
tapestry.event${event[1]}=function(e){
var content={beventname:"${event[0]}"};
tapestry.event.buildEventProperties(e, content, arguments);
if (!content["beventtarget.id"]) content["beventtarget.id"]="${target}";
tapestry.bind("${url}", content);
};
- dojo.event.connect(dojo.byId("${target}"), "${event[0]}", tapestry, "event${event[1]}");
+ tapestry.connect("${target}", "${event[0]}", "event${event[1]}");
</foreach>
</if>
<if expression="formEvents">
<foreach expression="formEvents" key="formEvent">
- tapestry.cleanConnect(dojo.byId("${target}"),
- "${formEvent[0]}", "formEvent${formEvent[4]}");
+ tapestry.cleanConnect("${target}", "${formEvent[0]}", "formEvent${formEvent[4]}");
tapestry.formEvent${formEvent[4]}=function(e){
var content={beventname:"${formEvent[0]}"};
tapestry.event.buildEventProperties(e, content, arguments);
@@ -49,8 +48,7 @@
tapestry.form.setFormValidating("${formName}", validateState);
</foreach>
};
- dojo.event.connect(dojo.byId("${target}"), "${formEvent[0]}",
- tapestry, "formEvent${formEvent[4]}");
+ tapestry.connect("${target}", "${formEvent[0]}", "formEvent${formEvent[4]}");
</foreach>
</if>
</initialization>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.script?rev=578359&r1=578358&r2=578359&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.script Fri Sep 21 20:09:00 2007
@@ -48,7 +48,7 @@
</let>
<let key="attribute">
- dojo.byId('${imageId}').src
+ tapestry.byId('${imageId}').src
</let>
<body>
tapestry.${onMouseOverName}=function(){
@@ -64,7 +64,7 @@
}
</body>
<initialization>
-dojo.event.connect(dojo.byId("${link.clientId}"), "onmouseover", tapestry, "${onMouseOverName}");
-dojo.event.connect(dojo.byId("${link.clientId}"), "onmouseout", tapestry, "${onMouseOutName}");
+tapestry.connect("${link.clientId}", "onmouseover", "${onMouseOverName}");
+tapestry.connect("${link.clientId}", "onmouseout", "${onMouseOutName}");
</initialization>
</script>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLink.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLink.script?rev=578359&r1=578358&r2=578359&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLink.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLink.script Fri Sep 21 20:09:00 2007
@@ -12,10 +12,9 @@
</unique>
</body>
<initialization>
- tapestry.cleanConnect(dojo.byId("${component.clientId}"),
- "onclick", "event${key}");
+ tapestry.cleanConnect("${component.clientId}", "onclick", "event${key}");
tapestry.event${key}=function(e){
- dojo.event.browser.stopEvent(e);
+ tapestry.event.stopEvent(e);
var content={beventname:"onClick", bcomponentid:"${component.id}"};
tapestry.event.buildEventProperties(e, content);
@@ -29,12 +28,12 @@
} else if (e["relatedTarget"] && e.relatedTarget.getAttribute("href")) {
url=e.relatedTarget.getAttribute("href");
} else {
- dojo.raise("Error, link target not found or invalid. Couldn't determine href url. " + e);
+ tapestry.raise("Error, link target not found or invalid. Couldn't determine href url. " + e);
return;
}
tapestry.bind(url, content, ${json});
};
- dojo.event.connect(dojo.byId("${component.clientId}"), "onclick", tapestry, "event${key}");
+ tapestry.connect("${component.clientId}", "onclick", "event${key}");
</initialization>
</script>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/DateValidator.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/DateValidator.script?rev=578359&r1=578358&r2=578359&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/DateValidator.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/DateValidator.script Fri Sep 21 20:09:00 2007
@@ -44,11 +44,11 @@
<body>
function ${function}(event)
{
- var field = dojo.byId("${field.name}");
+ var field = tapestry.byId("${field.name}");
if (field.value.length == 0) {
Tapestry.invalid_field(field, "${requiredMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
}
}
</body>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/EmailValidator.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/EmailValidator.script?rev=578359&r1=578358&r2=578359&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/EmailValidator.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/EmailValidator.script Fri Sep 21 20:09:00 2007
@@ -47,7 +47,7 @@
<body>
function ${function}(event)
{
- var field = dojo.byId("${field.name}");
+ var field = tapestry.byId("${field.name}");
strValue = field.value.replace(/ /g,"");
@@ -57,7 +57,7 @@
if (strValue.length == 0)
{
Tapestry.invalid_field(field, "${requiredMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
return;
}
</if>
@@ -71,7 +71,7 @@
if (strValue.length < ${validator.minimumLength})
{
Tapestry.invalid_field(field, "${minimumLengthMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
return;
}
</if>
@@ -79,7 +79,7 @@
atIndex = strValue.indexOf("@");
if ((atIndex == -1) || (atIndex == 0) || (atIndex == strValue.length -1)) {
Tapestry.invalid_field(field, "${emailFormatMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
}
}
</body>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/IntegerValidator.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/IntegerValidator.script?rev=578359&r1=578358&r2=578359&view=diff
==============================================================================
Binary files - no diff available.
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/NumberValidator.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/NumberValidator.script?rev=578359&r1=578358&r2=578359&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/NumberValidator.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/NumberValidator.script Fri Sep 21 20:09:00 2007
@@ -47,13 +47,13 @@
<body>
function ${function}(event)
{
- var field = dojo.byId("${field.name}");
+ var field = tapestry.byId("${field.name}");
var stringValue = field.value;
<if expression="validator.required">
if (stringValue.length == 0)
{
Tapestry.invalid_field(field, "${requiredMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
return;
}
</if>
@@ -65,7 +65,7 @@
if (isNaN(value))
{
Tapestry.invalid_field(field, "${formatMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
return;
}
<if expression="validator.integerNumber">
@@ -73,7 +73,7 @@
if (stringValue.search(regex) != -1)
{
Tapestry.invalid_field(field, "${formatMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
return;
}
</if>
@@ -81,7 +81,7 @@
if (value < ${validator.minimum})
{
Tapestry.invalid_field(field, "${rangeMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
return;
}
</if>
@@ -89,7 +89,7 @@
if (value > ${validator.maximum})
{
Tapestry.invalid_field(field, "${rangeMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
return;
}
</if>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/PatternValidator.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/PatternValidator.script?rev=578359&r1=578358&r2=578359&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/PatternValidator.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/PatternValidator.script Fri Sep 21 20:09:00 2007
@@ -49,18 +49,18 @@
function ${function}(event)
{
- var field = dojo.byId("${field.name}");
+ var field = tapestry.byId("${field.name}");
<if expression="validator.required">
if (field.value.length == 0)
{
Tapestry.invalid_field(field, "${requiredMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
return;
}
</if>
if (field.value.length > 0 && !${pattern}.test(field.value)) {
Tapestry.invalid_field(field, "${patternNotMatchedMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
}
}
</body>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/StringValidator.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/StringValidator.script?rev=578359&r1=578358&r2=578359&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/StringValidator.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/StringValidator.script Fri Sep 21 20:09:00 2007
@@ -45,12 +45,12 @@
<body>
function ${function}(event)
{
- var field = dojo.byId("${field.name}");
+ var field = tapestry.byId("${field.name}");
<if expression="validator.required">
if (field.value.length == 0)
{
Tapestry.invalid_field(field, "${requiredMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
return;
}
</if>
@@ -62,7 +62,7 @@
if (field.value.length < ${validator.minimumLength})
{
Tapestry.invalid_field(field, "${minimumLengthMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
return;
}
</if>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/UrlValidator.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/UrlValidator.script?rev=578359&r1=578358&r2=578359&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/UrlValidator.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/UrlValidator.script Fri Sep 21 20:09:00 2007
@@ -56,14 +56,14 @@
]]></unique>
function ${function}(event) {
- var field = dojo.byId("${field.name}");
+ var field = tapestry.byId("${field.name}");
strValue = field.value.replace(/ /g,"");
field.value = strValue;
<if expression="validator.required">
if (strValue.length == 0) {
Tapestry.invalid_field(field, "${requiredMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
return;
}
</if>
@@ -76,21 +76,21 @@
<if expression="validator.minimumLength">
if (strValue.length < ${validator.minimumLength}) {
Tapestry.invalid_field(field, "${minimumLengthMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
return;
}
</if>
if(!regexpTestUrl(strValue)) {
Tapestry.invalid_field(field, "${urlFormatMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
return;
}
<if expression="null != urlRegexpProtocols">
var protoRegExp = ${urlRegexpProtocols};
if(!protoRegExp.test(strValue)) {
Tapestry.invalid_field(field, "${urlDisallowedProtocolMessage}");
- dojo.event.browser.stopEvent(event);
+ tapestry.event.stopEvent(event);
return;
}
</if>
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?rev=578359&r1=578358&r2=578359&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js Fri Sep 21 20:09:00 2007
@@ -46,7 +46,7 @@
// property: version
// The current client side library version, usually matching the current java library version. (ie 4.1, etc..)
- version:"4.1.2",
+ version:"4.1.4",
scriptInFlight:false, // whether or not javascript is currently being eval'd, default false
ScriptFragment:new RegExp('(?:<script.*?>)((\n|.|\r)*?)(?:<\/script>)', 'im'), // regexp for script elements
GlobalScriptFragment:new RegExp('(?:<script.*?>)((\n|.|\r)*?)(?:<\/script>)', 'img'), // regexp for global script fragments