Author: andyhot
Date: Fri Sep 28 04:41:46 2007
New Revision: 580316
URL: http://svn.apache.org/viewvc?rev=580316&view=rev
Log:
TAPESTRY-1783: remove deprecated js
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_form.js
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_form_validation.js
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=580316&r1=580315&r2=580316&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/form.js Fri Sep
28 04:41:46 2007
@@ -1,8 +1,6 @@
dojo.provide("tapestry.form");
dojo.provide("tapestry.form.datetime");
dojo.provide("tapestry.form.validation");
-dojo.provide("tapestry.form_compat");
-dojo.provide("Tapestry");
dojo.require("dojo.event.browser");
dojo.require("dojo.dom");
@@ -744,7 +742,20 @@
if (Number.NaN == num) { return false; }
return num <= max;
- }
+ },
+
+ isText:dojo.validate.isText,
+
+ isEmailAddress:function(){
+ dojo.require("dojo.validate.web");
+ return dojo.validate.isEmailAddress.apply(dojo.validate, arguments);
+ },
+
+ isReal:function(){
+ dojo.require("dojo.i18n.number");
+ return dojo.i18n.number.isReal.apply(dojo.i18n.number, arguments);
+ }
+
}
tapestry.form.datetime={
@@ -810,128 +821,4 @@
return true;
}
-}
-
-// package: tapestry.form_compat
-// Backwards compatibility functions, to be removed in 4.1.1 js version.
Contains all of
-// the functions found in the old Form.js provided by previous Tapestry
releases.
-// Should only be included by tapestry.form, don't dojo.require() this module.
-
-// global used to deprecate old event connection methods
-tapestry.form.deprecateConnect=function(formName, fnc, event, advice){
- dojo.deprecated("Tapestry.on"+event,
- "use dojo.event.connect instead",
- "4.1.1");
-
- if (advice) {
- dojo.event.connect(advice, dojo.byId(formName), event, fnc);
- } else {
- dojo.event.connect(dojo.byId(formName), event, fnc);
- }
-}
-
-// BEGIN old function definitions
-
-Tapestry.default_invalid_field_handler=function(event, field, message){
- dojo.deprecated("Tapestry.default_invalid_field_handler",
- "use
tapestry.form.validation.validateForm instead",
- "4.1.1");
- if (field.disabled) return;
-
- if (typeof window != "undefined"){
- window.alert(message);
- } else {
- dojo.debug("Invalid field : " + message);
- }
- tapestry.form.focusField(field);
-}
-
-Tapestry.invalid_field=function(field, message){
- Tapestry.default_invalid_field_handler(null, field, message);
-}
-
-Tapestry.find=function(id){
- dojo.deprecated("Tapestry.find",
- "use dojo.byId instead",
- "4.1.1");
- return dojo.byId(id);
-}
-
-Tapestry.register_form=function(formId){
- dojo.deprecated("Tapestry.register_form",
- "use tapestry.form.registerForm instead
register_form(" + formId + ")",
- "4.1.1");
- tapestry.form.registerForm(formId);
-}
-
-Tapestry.onpresubmit=function(formName, fnc){
tapestry.form.deprecateConnect(formName, fnc, "onsubmit", "before"); };
-Tapestry.onsubmit=function(formName, fnc){
tapestry.form.deprecateConnect(formName, fnc, "onsubmit"); };
-Tapestry.onpostsubmit=function(formName, fnc){
tapestry.form.deprecateConnect(formName, fnc, "onsubmit", "after"); };
-Tapestry.onreset=function(formName, fnc){
tapestry.form.deprecateConnect(formName, fnc, "onreset"); };
-Tapestry.onrefresh=function(formName, fnc){
tapestry.form.deprecateConnect(formName, fnc, "onrefresh"); };
-Tapestry.oncancel=function(formName, fnc){
tapestry.form.deprecateConnect(formName, fnc, "oncancel"); };
-
-Tapestry.set_focus=function (field){
- dojo.deprecated("Tapestry.set_focus",
- "use tapestry.form.focusField instead",
- "4.1.1");
- tapestry.form.focusField(field);
-}
-
-Tapestry.trim_field_value = function(fieldId)
-{
- dojo.deprecated("Tapestry.trim_field_value",
- "use dojo.html instead",
- "4.1.1");
-
- if (arguments.length < 1) return;
-
- var elm=dojo.byId(id);
- if (!elm) {return;}
- if ( elm.type != "text" && elm.type != "textarea"
- && elm.type != "password" ) { return; }
-
- elm.value = elm.value.replace(/(^\s*|\s*$)/g, "");
-}
-
-Tapestry.require_field = function(event, field, message)
-{
- dojo.deprecated("Tapestry.require_field",
- "use
tapestry.form.validation.validateForm instead",
- "4.1.1");
- if (arguments.length < 1) return;
-
- var elem=dojo.byId(field);
- if (!elem) { return; }
-
- // Are textbox, textarea, or password fields blank.
- if ( (elem.type == "text" || elem.type == "textarea" || elem.type ==
"password")
- && /^\s*$/.test(elem.value) ) {
- Tapestry.default_invalid_field_handler(elem, message);
- return;
- }
- // Does drop-down box have option selected.
- else if ( (elem.type == "select-one" || elem.type == "select-multiple")
- && elem.selectedIndex == -1 ) {
- Tapestry.default_invalid_field_handler(elem, message);
- return;
- } else if ( elem instanceof Array ) {
- // Does radio button group (or check box group) have option
checked.
- var checked = false;
- for (var j = 0; j < elem.length; j++) {
- if (elem[j].checked) { checked = true; }
- }
- if ( !checked ) {
- Tapestry.default_invalid_field_handler(elem, message);
- return;
- }
- }
-}
-
-Tapestry.submit_form = function(form_id, field_name)
-{
- dojo.deprecated("Tapestry.submit_form",
- "use tapestry.form.submit instead (" +
form_id + ", " + field_name + ")",
- "4.1.1");
- tapestry.form.submit(form_id, field_name);
}
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?rev=580316&r1=580315&r2=580316&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_form.js
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_form.js Fri
Sep 28 04:41:46 2007
@@ -7,76 +7,8 @@
tapestry.form.invalidField=function(field, message){
}
-function test_form_find(){
- var node = document.createElement("div");
- node.setAttribute("id", "testid");
-
- jum.assertTrue(Tapestry.find(node));
- jum.assertTrue(Tapestry.find("testid"));
-}
-
function test_last_msg(){
jum.assertFalse(lastMsgContains());
-}
-
-function test_form_deprecated(){
- try {
- Tapestry.register_form();
- throw new JUMAssertFailure("Previous test should have failed.");
- } catch (e) { jum.assertTrue("testFormDepre", e instanceof Error);
return; }
-
- jum.assertTrue("deprecated", lastMsgContains("deprecated"));
- Tapestry.onpresubmit();
- jum.assertTrue("deprecated", lastMsgContains("deprecated"));
- Tapestry.onsubmit();
- jum.assertTrue("deprecated", lastMsgContains("deprecated"));
- Tapestry.onpostsubmit();
- jum.assertTrue("deprecated", lastMsgContains("deprecated"));
- Tapestry.onreset();
- jum.assertTrue("deprecated", lastMsgContains("deprecated"));
- Tapestry.onrefresh();
- jum.assertTrue("deprecated", lastMsgContains("deprecated"));
- Tapestry.oncancel();
- jum.assertTrue("deprecated", lastMsgContains("deprecated"));
-}
-
-function test_form_invalidHandler(){
- Tapestry.default_invalid_field_handler(null, "yo", "yo");
-}
-
-function test_form_requireTextField(){
- Tapestry.require_field(null, "bs", "invalid");
-
- var node = document.createElement("input");
- node.setAttribute("id", "testid");
- node.type="text";
- node.value="";
-
- var mockInvalid=new mock(node, "must have value");
- dojo.event.connect(Tapestry, "default_invalid_field_handler",
mockInvalid, "intercept");
-
- Tapestry.require_field(null, "testid", "must have value");
-
- jum.assertTrue("invalidCalled", mockInvalid.called);
- dojo.event.disconnect(Tapestry, "default_invalid_field_handler",
mockInvalid, "intercept");
-}
-
-function test_form_submit(){
-
- var submitCalled=false;
- var node = document.createElement("form");
- node.setAttribute("id", "form1");
- node.submit=function(){
- submitCalled=true;
- }
- node.submitname={value:""};
- node.elements=[];
-
- Tapestry.register_form("form1");
- Tapestry.submit_form("form1", "testSubmit");
-
- jum.assertTrue("submitCalled", submitCalled);
- jum.assertEquals("submitName", node.submitname.value, "testSubmit");
}
var bindCalled=false;
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_form_validation.js
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_form_validation.js?rev=580316&r1=580315&r2=580316&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_form_validation.js
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_form_validation.js
Fri Sep 28 04:41:46 2007
@@ -30,9 +30,24 @@
jum.assertEquals("formregProfileLength", 0,
tapestry.form.forms["regform"].profiles.length);
}
-function test_validate_realNumber(){
+function test_validate_realNumber_Dojo(){//fails from rhino
+ var value="a12";dojo.require("dojo.i18n.number");
+ jum.assertFalse(value, dojo.i18n.number.isReal(value,
{places:0,decimal:".",separator:","}));
+}
+
+function test_validate_realNumber(){//fails from rhino
var value="a12";
- jum.assertFalse(value, dojo.validate.isRealNumber(value,
{places:0,decimal:".",separator:","}));
+ jum.assertFalse(value, tapestry.form.validation.isReal(value,
{places:0,decimal:".",separator:","}));
+}
+
+function test_validate_email(){
+ var value="[EMAIL PROTECTED]";
+ jum.assertTrue(value, tapestry.form.validation.isEmailAddress(value));
+}
+
+function test_validate_text(){
+ var value="small";
+ jum.assertTrue(value, tapestry.form.validation.isText(value,
{minlength:4}));
}
function test_validate_decimals(){
