diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-08-27 06:30:33 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-08-27 06:30:33 +0000 |
| commit | b80f0e2ff3a51e6166e4e29b87a7380f42529e7a (patch) | |
| tree | 626a57f6eb49be8e31b3cf12071fc28508260bad /actionpack/lib/action_view/helpers/upload_progress_helper.rb | |
| parent | 68c90ab0194a56493ceaafa16f0b5e6b7e36201f (diff) | |
| download | rails-b80f0e2ff3a51e6166e4e29b87a7380f42529e7a.tar.gz rails-b80f0e2ff3a51e6166e4e29b87a7380f42529e7a.tar.bz2 rails-b80f0e2ff3a51e6166e4e29b87a7380f42529e7a.zip | |
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
Diffstat (limited to 'actionpack/lib/action_view/helpers/upload_progress_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/upload_progress_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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}" |