From 92088a920b471e70c4bd26058660761c53094db4 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sat, 26 Mar 2005 23:43:29 +0000
Subject: Effects can just be used through the callbacks

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1014 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/lib/action_view/helpers/javascript_helper.rb     | 1 -
 actionpack/lib/action_view/helpers/javascripts/prototype.js | 4 ----
 railties/html/javascripts/prototype.js                      | 8 +-------
 3 files changed, 1 insertion(+), 12 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);
     }
diff --git a/railties/html/javascripts/prototype.js b/railties/html/javascripts/prototype.js
index 18027b3e91..5042e3304d 100644
--- a/railties/html/javascripts/prototype.js
+++ b/railties/html/javascripts/prototype.js
@@ -197,19 +197,13 @@ Ajax.Updater.prototype = (new Ajax.Base()).extend({
   },
   
   updateContent: function() {
-    this.container.innerHTML = this.request.transport.responseText;
-
-    if (this.options.insertion) {
+    if (!this.options.insertion) {
       this.container.innerHTML = this.request.transport.responseText;
     } else {
       new this.options.insertion(this.container,
         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);
     }
-- 
cgit v1.2.3