diff options
author | Sam Stephenson <sam@37signals.com> | 2007-11-06 15:17:10 +0000 |
---|---|---|
committer | Sam Stephenson <sam@37signals.com> | 2007-11-06 15:17:10 +0000 |
commit | fdc767d4477ff94c6a8dea94905b100c8d8fcd12 (patch) | |
tree | 09e501cf4c6b1db0fc16f3972a14ab00adee3e30 /railties/html/javascripts/controls.js | |
parent | 2a51c8682d44ee71a3c0411e2e30ef8ff29d6f67 (diff) | |
download | rails-fdc767d4477ff94c6a8dea94905b100c8d8fcd12.tar.gz rails-fdc767d4477ff94c6a8dea94905b100c8d8fcd12.tar.bz2 rails-fdc767d4477ff94c6a8dea94905b100c8d8fcd12.zip |
Update Prototype to 1.6.0 and script.aculo.us to 1.8.0.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8087 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/html/javascripts/controls.js')
-rw-r--r-- | railties/html/javascripts/controls.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/html/javascripts/controls.js b/railties/html/javascripts/controls.js index 06ccd5946c..da7bfa2a77 100644 --- a/railties/html/javascripts/controls.js +++ b/railties/html/javascripts/controls.js @@ -33,8 +33,6 @@ // enables autocompletion on multiple tokens. This is most // useful when one of the tokens is \n (a newline), as it // allows smart autocompletion after linebreaks. -// -// vim:expandtab ts=8 sw=2 if(typeof Effect == 'undefined') throw("controls.js requires including script.aculo.us' effects.js library"); @@ -623,8 +621,10 @@ Ajax.InPlaceEditor = Class.create({ var form = this._form; var value = $F(this._controls.editor); this.prepareSubmission(); - var params = this.options.callback(form, value); - params = (params ? params + '&' : '?') + 'editorId=' + this.element.id; + var params = this.options.callback(form, value) || ''; + if (Object.isString(params)) + params = params.toQueryParams(); + params.editorId = this.element.id; if (this.options.htmlResponse) { var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions); Object.extend(options, { |