From b80f0e2ff3a51e6166e4e29b87a7380f42529e7a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 27 Aug 2005 06:30:33 +0000 Subject: Made Upload Progress work with Prototype 1.4.0 and add some documentation for it #1847, #1876 [Thomas Fuchs/Sean Treadway] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2059 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/helpers/upload_progress_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_view/helpers/upload_progress_helper.rb') diff --git a/actionpack/lib/action_view/helpers/upload_progress_helper.rb b/actionpack/lib/action_view/helpers/upload_progress_helper.rb index 04b14c0c17..8563ca3beb 100644 --- a/actionpack/lib/action_view/helpers/upload_progress_helper.rb +++ b/actionpack/lib/action_view/helpers/upload_progress_helper.rb @@ -196,7 +196,7 @@ module ActionView updater = "if (#{upload_update_object}) { #{upload_update_object}.stop(); }" updater << "#{upload_update_object} = new Ajax.PeriodicalUpdater('#{status_tag_id}'," - updater << "'#{status_url}', #{options_for_ajax(options)}.extend(#{updater_options}))" + updater << "'#{status_url}', Object.extend(#{options_for_ajax(options)},#{updater_options}))" updater = "#{options[:begin]}; #{updater}" if options[:begin] updater = "#{upload_progress_update_bar_js(0)}; #{updater}" -- cgit v1.2.3