diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-14 11:38:55 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-14 11:38:55 +0000 |
| commit | 7073abe15906d5b4bbd7cd455136fbd2c52a8a49 (patch) | |
| tree | aafe5c555a359e96028a795a8fb9995cff786e4e /actionpack/lib/action_view | |
| parent | bf0b7588ee4e32353e0dc10c2d1c3d2b9ea952c4 (diff) | |
| download | rails-7073abe15906d5b4bbd7cd455136fbd2c52a8a49.tar.gz rails-7073abe15906d5b4bbd7cd455136fbd2c52a8a49.tar.bz2 rails-7073abe15906d5b4bbd7cd455136fbd2c52a8a49.zip | |
Fixed bug with :success/:failure callbacks for the JavaScriptHelper methods #1730 [court3nay/Thomas Fuchs]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1835 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/javascript_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/javascripts/prototype.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index 0c22996e02..43bedbd366 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -17,7 +17,7 @@ module ActionView module JavaScriptHelper unless const_defined? :CALLBACKS CALLBACKS = - [:uninitialized, :loading, :loaded, :interactive, :complete, :failure].push((100..599).to_a).flatten + [:uninitialized, :loading, :loaded, :interactive, :complete, :failure, :success].push((100..599).to_a).flatten AJAX_OPTIONS = [ :before, :after, :condition, :url, :asynchronous, :method, :insertion, :position, :form, :with, :update, :script ].concat(CALLBACKS) JAVASCRIPT_PATH = File.join(File.dirname(__FILE__), 'javascripts') diff --git a/actionpack/lib/action_view/helpers/javascripts/prototype.js b/actionpack/lib/action_view/helpers/javascripts/prototype.js index 37635ccfab..5feddb6dda 100644 --- a/actionpack/lib/action_view/helpers/javascripts/prototype.js +++ b/actionpack/lib/action_view/helpers/javascripts/prototype.js @@ -268,7 +268,7 @@ Ajax.Request.prototype = (new Ajax.Base()).extend({ if (event == 'Complete') (this.options['on' + this.transport.status] - || this.options['on' + this.responseIsSuccess() ? 'Success' : 'Failure'] + || this.options['on' + (this.responseIsSuccess() ? 'Success' : 'Failure')] || Prototype.emptyFunction)(this.transport); (this.options['on' + event] || Prototype.emptyFunction)(this.transport); |