aboutsummaryrefslogtreecommitdiffstats
path: root/railties
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 /railties
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 'railties')
-rw-r--r--railties/html/javascripts/prototype.js8
1 files changed, 1 insertions, 7 deletions
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);
}