diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/upload_progress.rb | 5 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/upload_progress_helper.rb | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 55cf3a0ff6..fb52a84cfe 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -6,7 +6,7 @@ * Routes fail with leading slash #1540 [Nicholas Seckar] -* Added support for upload progress indicators in Apache and lighttpd 1.4.x (won't work in WEBrick or lighttpd 1.3.x) #1475 [Sean Treadway] +* EXPERIMENTAL (problems on various different server setups): Added support for upload progress indicators in Apache and lighttpd 1.4.x (won't work in WEBrick or lighttpd 1.3.x) #1475 [Sean Treadway] See http://sean.treadway.info/files/howto-upload-progress-2.mov for example. * Added support for graceful error handling of Ajax calls #1217 [Jamis Buck/Thomas Fuchs]. Example: diff --git a/actionpack/lib/action_controller/upload_progress.rb b/actionpack/lib/action_controller/upload_progress.rb index ce8d51c67d..1e45f9daf2 100644 --- a/actionpack/lib/action_controller/upload_progress.rb +++ b/actionpack/lib/action_controller/upload_progress.rb @@ -126,15 +126,14 @@ module ActionController #:nodoc: # end # # - module UploadProgress - + module UploadProgress #:nodoc: def self.append_features(base) #:nodoc: super base.extend(ClassMethods) base.helper_method :upload_progress, :next_upload_id, :last_upload_id, :current_upload_id end - module ClassMethods + module ClassMethods #:nodoc: # Creates an +after_filter+ which will call +finish_upload_status+ # creating the document that will be loaded into the hidden IFRAME, terminating # the status polling forms created with +form_with_upload_progress+. diff --git a/actionpack/lib/action_view/helpers/upload_progress_helper.rb b/actionpack/lib/action_view/helpers/upload_progress_helper.rb index 1af8bce754..d9e3400a6e 100644 --- a/actionpack/lib/action_view/helpers/upload_progress_helper.rb +++ b/actionpack/lib/action_view/helpers/upload_progress_helper.rb @@ -51,7 +51,7 @@ module ActionView # # Default styling is included with the scaffolding CSS. # - module UploadProgressHelper + module UploadProgressHelper #:nodoc: unless const_defined? :FREQUENCY # Default number of seconds between client updates FREQUENCY = 2.0 |