Author: michiel
Date: 2010-03-02 13:40:16 +0100 (Tue, 02 Mar 2010)
New Revision: 41226
Modified:
mmbase/branches/MMBase-1_9/base-webapp/src/main/webapp/mmbase/validation/validation.js.jsp
Log:
accidently removed isBoolean stuff
Modified:
mmbase/branches/MMBase-1_9/base-webapp/src/main/webapp/mmbase/validation/validation.js.jsp
===================================================================
---
mmbase/branches/MMBase-1_9/base-webapp/src/main/webapp/mmbase/validation/validation.js.jsp
2010-03-02 11:12:25 UTC (rev 41225)
+++
mmbase/branches/MMBase-1_9/base-webapp/src/main/webapp/mmbase/validation/validation.js.jsp
2010-03-02 12:40:16 UTC (rev 41226)
@@ -454,6 +454,12 @@
el.mm_isnumeric = this.hasJavaClass(el,
"org\.mmbase\.datatypes\.NumberDataType");
return el.isnumeric;
}
+
+MMBaseValidator.prototype.isBoolean = function(el) {
+ if (el.mm_isboolean != null) return el.mm_isboolean;
+ el.mm_isboolean = this.hasJavaClass(el,
"org\.mmbase\.datatypes\.BooleanDataType");
+ return el.isboolean;
+}
MMBaseValidator.prototype.isInteger = function(el) {
if (el.mm_isinteger != null) return el.mm_isinteger;
el.mm_isinteger = this.hasJavaClass(el,
"(org\.mmbase\.datatypes\.IntegerDataType|org\.mmbase\.datatypes\.LongDataType)");
@@ -795,11 +801,16 @@
return $(el).text();
}
var value = $(el).val();
+
if( this.isNumeric(el)) {
if (value === "") {
} else {
value = parseFloat(value);
}
+ } else if (this.isBoolean(el)) {
+ if ("checkbox" === el.type) {
+ value = $(el).is(":checked");
+ }
}
return value;
}
@@ -1125,7 +1136,7 @@
server = false;
element.serverValidated = true;
// already validated, so nothing to do.
- return;
+ return false;
}
element.prevValue = "" + curValue;
}
@@ -1233,6 +1244,7 @@
case "checkbox":
$(entry).bind("click", function(ev) { self.setLastChange(ev);
self.validate(ev); });
$(entry).bind("blur", function(ev) { self.serverValidate(ev); });
+ $(entry).bind("change", function(ev) { self.serverValidate(ev);
});
break;
case "file":
$(entry).bind("change", function(ev) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
