Skip to content

Commit

Permalink
File upload progress seems to have problems on a variety of servers, …
Browse files Browse the repository at this point in the history
…marking as experimental for now and not including it in the docs

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1570 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information
dhh committed Jun 30, 2005
1 parent 7e1d002 commit bab674c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion actionpack/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 2 additions & 3 deletions actionpack/lib/action_controller/upload_progress.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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+.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ module Helpers
#
# 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
Expand Down

0 comments on commit bab674c

Please sign in to comment.