Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWF-853 - Original fix did not work in IE. Now using Dojo's pub/sub mechanism to propagate validation success/failure to interested listeners.

Browse Source
This commit is contained in:
Jeremy Grelle
2008-10-24 17:30:45 +00:00
parent 6a3ca618eb
commit 25427a1e09
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-js/src/main/resources/META-INF/spring/Spring-Dojo.js
View File

File diff suppressed because one or more lines are too long

31
spring-js/src/main/resources/META-INF/spring/Spring-Dojo.js.uncompressed.js
View File

@@ -107,14 +107,17 @@ dojo.declare("Spring.ValidateAllDecoration", [Spring.AbstractValidateAllDecorati
dojo.disconnect(this.connection);
},
handleEvent : function(event, context){
event.springValidateAll = Spring.validateAll();
if (!event.springValidateAll) {
handleEvent : function(event, context){
if (!Spring.validateAll()) {
dojo.publish(this.elementId+"/validation", [false]);
dojo.stopEvent(event);
} else if(dojo.isFunction(context.originalHandler)) {
var result = context.originalHandler(event);
if (result == false) {
dojo.stopEvent(event);
} else {
dojo.publish(this.elementId+"/validation", [true]);
if(dojo.isFunction(context.originalHandler)) {
var result = context.originalHandler(event);
if (result == false) {
dojo.stopEvent(event);
}
}
}
}
@@ -122,16 +125,20 @@ dojo.declare("Spring.ValidateAllDecoration", [Spring.AbstractValidateAllDecorati
dojo.declare("Spring.AjaxEventDecoration", [Spring.AbstractAjaxEventDecoration, Spring.DefaultEquals], {
constructor : function(config){
this.validationSubscription = null;
this.connection = null;
this.allowed = true;
dojo.mixin(this, config);
},
apply : function() {
this.validationSubscription = dojo.subscribe(this.elementId+"/validation", this, "_handleValidation");
this.connection = dojo.connect(dojo.byId(this.elementId), this.event, this, "submit");
return this;
},
cleanup : function(){
dojo.unsubscribe(this.validationSubscription);
dojo.disconnect(this.connection);
},
@@ -142,11 +149,19 @@ dojo.declare("Spring.AjaxEventDecoration", [Spring.AbstractAjaxEventDecoration,
if(this.formId == ""){
Spring.remoting.getLinkedResource(this.sourceId, this.params, this.popup);
} else {
if (event.springValidateAll){
if (this.allowed){
Spring.remoting.submitForm(this.sourceId, this.formId, this.params);
}
}
dojo.stopEvent(event);
},
_handleValidation : function(success){
if (!success) {
this.allowed=false;
} else {
this.allowed=true;
}
}
});