You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/01/02 17:16:24 UTC

[4/4] git commit: WICKET-3367 Rewrite all JavaScript inline event handlers to be proper attached event handlers

WICKET-3367
Rewrite all JavaScript inline event handlers to be proper attached event handlers

Simplify Wicket.Ajax.Call.done() - always use Call's channel.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9f89761e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9f89761e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9f89761e

Branch: refs/heads/master
Commit: 9f89761ecd57ce296b318466221fd51356d184a3
Parents: 6d0df2b
Author: martin-g <mg...@apache.org>
Authored: Mon Jan 2 15:48:56 2012 +0200
Committer: martin-g <mg...@apache.org>
Committed: Mon Jan 2 15:48:56 2012 +0200

----------------------------------------------------------------------
 .../wicket/ajax/res/js/wicket-ajax-jquery.js       |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/9f89761e/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
index ef05be0..f91ff9a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
@@ -498,7 +498,7 @@
 						Wicket.DOM.hide(attrs.i);
 					}
 
-					this.done(attrs.ch);
+					this.done();
 				}
 			});
 
@@ -531,7 +531,7 @@
 
 					// In case the page isn't really redirected. For example say the redirect is to an octet-stream.
 					// A file download popup will appear but the page in the browser won't change.
-					this.done(attrs.ch);
+					this.done();
 
 					// support/check for non-relative redirectUrl like as provided and needed in a portlet context
 					if (redirectUrl.charAt(0) === ('/') || redirectUrl.match("^http://") === "http://" || redirectUrl.match("^https://") === "https://") {
@@ -767,7 +767,7 @@
 				// set the focus to the last component
 				window.setTimeout("Wicket.Focus.requestFocus();", 0);
 
-				Wicket.channelManager.done(this.channel);
+				this.done();
 
 				// continue to next step (which should make the processing stop, as success should be the final step)
 				notify();
@@ -784,8 +784,8 @@
 			Wicket.Ajax.invokeFailureHandlers();
 		},
 
-		done: function (channel) {
-			Wicket.channelManager.done(channel);
+		done: function () {
+			Wicket.channelManager.done(this.channel);
 		},
 
 		// Adds a closure that replaces a component