aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-03-26 23:43:29 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-03-26 23:43:29 +0000
commit92088a920b471e70c4bd26058660761c53094db4 (patch)
tree3c12743cca257b67c5eed4d20b5c49ef266e2544 /actionpack/lib
parentf7b89667ac4157d64697aa2f51bcea8a26c0fd8f (diff)
downloadrails-92088a920b471e70c4bd26058660761c53094db4.tar.gz
rails-92088a920b471e70c4bd26058660761c53094db4.tar.bz2
rails-92088a920b471e70c4bd26058660761c53094db4.zip
Effects can just be used through the callbacks
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1014 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/javascript_helper.rb1
-rw-r--r--actionpack/lib/action_view/helpers/javascripts/prototype.js4
2 files changed, 0 insertions, 5 deletions
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb
index 5b9c35376e..59765f9737 100644
--- a/actionpack/lib/action_view/helpers/javascript_helper.rb
+++ b/actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -160,7 +160,6 @@ module ActionView
js_options['asynchronous'] = options[:type] != :synchronous
js_options['method'] = options[:method] if options[:method]
js_options['insertion'] = "Insertion.#{options[:position].to_s.camelize}" if options[:position]
- js_options['effect'] = "Effect.#{options[:effect].to_s.camelize}" if options[:effect]
if options[:form]
js_options['parameters'] = 'Form.serialize(this)'
diff --git a/actionpack/lib/action_view/helpers/javascripts/prototype.js b/actionpack/lib/action_view/helpers/javascripts/prototype.js
index 48d6afb386..5042e3304d 100644
--- a/actionpack/lib/action_view/helpers/javascripts/prototype.js
+++ b/actionpack/lib/action_view/helpers/javascripts/prototype.js
@@ -204,10 +204,6 @@ Ajax.Updater.prototype = (new Ajax.Base()).extend({
this.request.transport.responseText);
}
- if (this.options.effect) {
- new this.options.effect(this.container);
- }
-
if (this.onComplete) {
setTimeout((function() {this.onComplete(this.request)}).bind(this), 10);
}