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

1 files changed, 4 insertions, 4 deletions

diff --git a/actionpack/lib/action_view/helpers/javascripts/controls.js b/actionpack/lib/action_view/helpers/javascripts/controls.js
index 06ccd5946c..da7bfa2a77 100644
--- a/actionpack/lib/action_view/helpers/javascripts/controls.js
+++ b/actionpack/lib/action_view/helpers/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, {