Skip to content

Commit

Permalink
Merge pull request #33 from eltiare/master
Browse files Browse the repository at this point in the history
Update to latest version of plupload.
  • Loading branch information
gucki committed Feb 18, 2016
2 parents 523de97 + 263bb97 commit 00690cd
Show file tree
Hide file tree
Showing 63 changed files with 424 additions and 289 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ Add to your application stylesheet:

//= require jquery.plupload.queue


For Rails 4, add to config/initializors/assets.rb:

```ruby
Rails.application.config.assets.precompile += %w( Moxie.swf Moxie.xap )
````
Simple example Haml for your views:

```haml
Expand Down
Empty file modified vendor/assets/images/jquery.plupload.queue/backgrounds.gif
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified vendor/assets/images/jquery.plupload.queue/buttons-disabled.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified vendor/assets/images/jquery.plupload.queue/buttons.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified vendor/assets/images/jquery.plupload.queue/delete.gif
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified vendor/assets/images/jquery.plupload.queue/done.gif
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified vendor/assets/images/jquery.plupload.queue/error.gif
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified vendor/assets/images/jquery.plupload.queue/throbber.gif
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified vendor/assets/images/jquery.plupload.queue/transp50.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified vendor/assets/images/jquery.ui.plupload/loading.gif
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified vendor/assets/images/jquery.ui.plupload/plupload.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion vendor/assets/javascripts/jquery.plupload.queue.js
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ used as it is.
@param {Boolean} [settings.rename=false] Enable ability to rename files in the queue.
@param {Boolean} [settings.multiple_queues=true] Re-activate the widget after each upload procedure.
*/
(function($, o) {
;(function($, o) {
var uploaders = {};

function _(str) {
Expand Down Expand Up @@ -367,6 +367,8 @@ used as it is.
uploader.bind('StateChanged', function() {
if (uploader.state === plupload.STARTED) {
$('li.plupload_delete a,div.plupload_buttons', target).hide();
uploader.disableBrowse(true);

$('span.plupload_upload_status,div.plupload_progress,a.plupload_stop', target).css('display', 'block');
$('span.plupload_upload_status', target).html('Uploaded ' + uploader.total.uploaded + '/' + uploader.files.length + ' files');

Expand All @@ -380,6 +382,8 @@ used as it is.

if (settings.multiple_queues && uploader.total.uploaded + uploader.total.failed == uploader.files.length) {
$(".plupload_buttons,.plupload_upload_status", target).css("display", "inline");
uploader.disableBrowse(false);

$(".plupload_start", target).addClass("plupload_disabled");
$('span.plupload_total_status,span.plupload_total_file_size', target).hide();
}
Expand Down
Loading

0 comments on commit 00690cd

Please sign in to comment.