You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2012/10/06 02:49:27 UTC
[5/9] git commit: Begin introduction of Twitter Bootstrap 2.1.1
Begin introduction of Twitter Bootstrap 2.1.1
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/9ce71d41
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/9ce71d41
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/9ce71d41
Branch: refs/heads/5.4-js-rewrite
Commit: 9ce71d41d83cc50f570957c3420ac514c7b79ff9
Parents: 23cd583
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Fri Oct 5 16:58:56 2012 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Fri Oct 5 16:58:56 2012 -0700
----------------------------------------------------------------------
.../META-INF/modules/core/events.coffee | 8 ++++----
.../resources/org/apache/tapestry5/tapestry.js | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9ce71d41/tapestry-core/src/main/coffeescript/META-INF/modules/core/events.coffee
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/coffeescript/META-INF/modules/core/events.coffee b/tapestry-core/src/main/coffeescript/META-INF/modules/core/events.coffee
index 2b649ea..eaffaef 100644
--- a/tapestry-core/src/main/coffeescript/META-INF/modules/core/events.coffee
+++ b/tapestry-core/src/main/coffeescript/META-INF/modules/core/events.coffee
@@ -22,11 +22,11 @@ define
# All events are triggered on a specific HTML `<form>` element, and top-level handlers take it from there.
form:
- # Triggered after `events.field.validate`, when there are no field validation exceptions, to allow for cross-form
- # validation.
- validateForm: "t5:form:validate"
+ # Triggered after fields have been validated, when there are no field validation exceptions, to allow for
+ # cross-form validation.
+ validate: "t5:form:validate"
- # Triggered after `validateForm` (when there are no prior validation exceptions), to allow certain elements
+ # Triggered after `validate` (when there are no prior validation exceptions), to allow certain elements
# to configure themselves immediately before the form is submitted. This exists primarily for components such
# as FormFragment, which will update a enable or disable a hidden field to match the visibility of the fragment.
# The `core/spi.EventWrapper` for the form element is passed as the memo.
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9ce71d41/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js b/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js
index 8af4064..340602b 100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js
@@ -56,14 +56,14 @@ define("core/compat/tapestry", [
* identify that the field is in error (and decorate the field and show a
* popup error message).
*/
- FIELD_VALIDATE_EVENT: "tapestry:fieldvalidate",
+ FIELD_VALIDATE_EVENT: events.field.validate,
/**
* Event notification, on a form object, that is used to trigger validation
* on all fields within the form (observed by each field's
* Tapestry.FieldEventManager).
*/
- FORM_VALIDATE_FIELDS_EVENT: events.field.validate,
+ FORM_VALIDATE_FIELDS_EVENT: events.form.validateFields,
/**
* Event, fired on the document object, which identifies the current focus
@@ -1211,7 +1211,7 @@ define("core/compat/tapestry", [
_this.validateInput();
if (_this.inError()) {
- event.memo.error = true;
+ event.memo.error = true; <
}
}