Permalink
Browse files

Effects can just be used through the callbacks

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1014 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent f7b8966 commit 92088a920b471e70c4bd26058660761c53094db4 @dhh dhh committed Mar 26, 2005
@@ -160,7 +160,6 @@ def options_for_ajax(options)
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)'
@@ -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);
}
@@ -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);
}

0 comments on commit 92088a9

Please sign in to comment.