dropzonejs-rails 0.4.2 → 0.4.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OThkY2Q2NjliYWY1Njk0Zjk5OTFmOTNlNGQ5NjAyY2I1OWRhOTU2ZQ==
+    ZmM3ZjJkYjI3ZGExYjlmZGU3ZWFiYjc1M2ZjOTgyODg4OGRlZDk0ZA==
   data.tar.gz: !binary |-
-    NGFkNjZhZjdjYzU0NjQ4MzZlNWQxOWY0N2RjNjUwYTczYzA1ZWFjYQ==
+    Njc1ZjNkNjM5MjUzNTUzMDQxYmY1YTJhZTliMzQ3NGNlN2RlMTIwMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjgxN2MzOWMxYTc4NzZkNjkzZmUwOGI1N2U1YWIwYThjMzVmNmQzZjMxOTNj
-    MzA1NzQzYjkyZWY3MjhjNzBlOGU5NzZmNmU2OGY3MjVlYzY5ZWFmNGMxNjIy
-    NDM1NmIyZmZlMjc5M2MwZTU5YzM1MDZjY2ZjZWVkNDg4ZGVjOWY=
+    MDI5YzRkMjZlNTk2MzY3NTk0MzFkMjNjNmU0ODUwNGEwZjM3Nzg4ZDY5Njk3
+    YWNkNGNkOGVkMTVkMWU2MGExZDJmMGFhN2FlMTk1MDI5NDNhNzBmMTUxY2Jl
+    YTFlNWRiNWVmZjkxNGNjOTc4MzhkOTg0ZWQxYzUxNWUxMjJjMDY=
   data.tar.gz: !binary |-
-    ODFkODVlOGIzMWU1MTI5YjdmMDMyYzU5ZjA1Yzk3NmZmMDBkMGY0ODUwMzU3
-    MDJlNjFlM2RiNzdlY2Y1ZTc4ZmI2YWIzZTk5Mzg1MGIzOGRkMDYzNzkyMzI5
-    MmM4Mzk5NzY3MjhkOWEyNjExMjcxMGJmZGRjYjBjYmQ5NjRlMDg=
+    NmM5MmVjNjA5NzM1OWQ3YTBhZjEzNjllYWU3MmU1MTk4OWIxOGUzYThiMzJj
+    YzljMjhkMTU0YzVkZGNkYzAwODU3ODJiNTAwZjJhN2JhZDRiNWVkZmY1NTc3
+    YzdmODJhNDc1ZmEyYTMxMWJiNTIyMmYxN2NkNGIyMjM5NDkzNzY=

data/README.md

@@ -4,7 +4,7 @@ Integrate [Matias Meno's Dropzone](http://www.dropzonejs.com/) awesome file uplo
 
 ## Version
 
-The latest version of this gem bundles **Dropzone v3.4.1**.
+The latest version of this gem bundles **Dropzone v3.5.1**.
 
 ## Installation and usage
 

data/lib/dropzonejs-rails/version.rb

@@ -1,4 +1,4 @@
 module DropzonejsRails
-  VERSION = '0.4.2'
-  DROPZONE_VERSION = '3.4.1'
+  VERSION = '0.4.3'
+  DROPZONE_VERSION = '3.5.1'
 end

data/vendor/assets/javascripts/dropzone.js

@@ -388,8 +388,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
   var Dropzone, Em, camelize, contentLoaded, noop, without,
     __hasProp = {}.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    __slice = [].slice,
-    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+    __slice = [].slice;
 
   Em = typeof Emitter !== "undefined" && Emitter !== null ? Emitter : require("emitter");
 
@@ -427,6 +426,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       acceptedMimeTypes: null,
       acceptParameter: null,
       enqueueForUpload: true,
+      addRemoveLinks: false,
       previewsContainer: null,
       dictDefaultMessage: "Drop files here to upload",
       dictFallbackMessage: "Your browser does not support drag'n'drop file uploads.",
@@ -434,6 +434,9 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       dictFileTooBig: "File is too big ({{filesize}}MB). Max filesize: {{maxFilesize}}MB.",
       dictInvalidFileType: "You can't upload files of this type.",
       dictResponseError: "Server responded with {{statusCode}} code.",
+      dictCancelUpload: "Cancel upload",
+      dictCancelUploadConfirmation: "Are you sure you want to cancel this upload?",
+      dictRemoveFile: "Remove file",
       accept: function(file, done) {
         return done();
       },
@@ -447,7 +450,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
         _ref = this.element.getElementsByTagName("div");
         for (_i = 0, _len = _ref.length; _i < _len; _i++) {
           child = _ref[_i];
-          if (/(^| )message($| )/.test(child.className)) {
+          if (/(^| )dz-message($| )/.test(child.className)) {
             messageElement = child;
             child.className = "dz-message";
             continue;
@@ -523,11 +526,27 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
         return this.element.classList.remove("dz-started");
       },
       addedfile: function(file) {
+        var _this = this;
         file.previewElement = Dropzone.createElement(this.options.previewTemplate);
         file.previewTemplate = file.previewElement;
         this.previewsContainer.appendChild(file.previewElement);
         file.previewElement.querySelector("[data-dz-name]").textContent = file.name;
-        return file.previewElement.querySelector("[data-dz-size]").innerHTML = this.filesize(file.size);
+        file.previewElement.querySelector("[data-dz-size]").innerHTML = this.filesize(file.size);
+        if (this.options.addRemoveLinks) {
+          file._removeLink = Dropzone.createElement("<a class=\"dz-remove\" href=\"javascript:undefined;\">" + this.options.dictRemoveFile + "</a>");
+          file._removeLink.addEventListener("click", function(e) {
+            e.preventDefault();
+            e.stopPropagation();
+            if (file.status === Dropzone.UPLOADING) {
+              if (window.confirm(_this.options.dictCancelUploadConfirmation)) {
+                return _this.removeFile(file);
+              }
+            } else {
+              return _this.removeFile(file);
+            }
+          });
+          return file.previewElement.appendChild(file._removeLink);
+        }
       },
       removedfile: function(file) {
         var _ref;
@@ -546,7 +565,10 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
         return file.previewElement.querySelector("[data-dz-errormessage]").textContent = message;
       },
       processingfile: function(file) {
-        return file.previewElement.classList.add("dz-processing");
+        file.previewElement.classList.add("dz-processing");
+        if (file._removeLink) {
+          return file._removeLink.textContent = this.options.dictCancelUpload;
+        }
       },
       uploadprogress: function(file, progress, bytesSent) {
         return file.previewElement.querySelector("[data-dz-uploadprogress]").style.width = "" + progress + "%";
@@ -556,7 +578,11 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       success: function(file) {
         return file.previewElement.classList.add("dz-success");
       },
-      complete: noop,
+      complete: function(file) {
+        if (file._removeLink) {
+          return file._removeLink.textContent = this.options.dictRemoveFile;
+        }
+      },
       previewTemplate: "<div class=\"dz-preview dz-file-preview\">\n  <div class=\"dz-details\">\n    <div class=\"dz-filename\"><span data-dz-name></span></div>\n    <div class=\"dz-size\" data-dz-size></div>\n    <img data-dz-thumbnail />\n  </div>\n  <div class=\"dz-progress\"><span class=\"dz-upload\" data-dz-uploadprogress></span></div>\n  <div class=\"dz-success-mark\"><span>✔</span></div>\n  <div class=\"dz-error-mark\"><span>✘</span></div>\n  <div class=\"dz-error-message\"><span data-dz-errormessage></span></div>\n</div>"
     };
 
@@ -581,9 +607,6 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       this.clickableElements = [];
       this.listeners = [];
       this.files = [];
-      this.acceptedFiles = [];
-      this.filesQueue = [];
-      this.filesProcessing = [];
       if (typeof this.element === "string") {
         this.element = document.querySelector(this.element);
       }
@@ -628,14 +651,75 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       this.init();
     }
 
+    Dropzone.prototype.getAcceptedFiles = function() {
+      var file, _i, _len, _ref, _results;
+      _ref = this.files;
+      _results = [];
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        file = _ref[_i];
+        if (file.accepted) {
+          _results.push(file);
+        }
+      }
+      return _results;
+    };
+
+    Dropzone.prototype.getRejectedFiles = function() {
+      var file, _i, _len, _ref, _results;
+      if (!file.accepted) {
+        _ref = this.files;
+        _results = [];
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          file = _ref[_i];
+          _results.push(file);
+        }
+        return _results;
+      }
+    };
+
+    Dropzone.prototype.getQueuedFiles = function() {
+      var file, _i, _len, _ref, _results;
+      _ref = this.files;
+      _results = [];
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        file = _ref[_i];
+        if (file.status === Dropzone.QUEUED) {
+          _results.push(file);
+        }
+      }
+      return _results;
+    };
+
+    Dropzone.prototype.getUploadingFiles = function() {
+      var file, _i, _len, _ref, _results;
+      _ref = this.files;
+      _results = [];
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        file = _ref[_i];
+        if (file.status === Dropzone.UPLOADING) {
+          _results.push(file);
+        }
+      }
+      return _results;
+    };
+
+    Dropzone.prototype.enqueueFile = function(file) {
+      if (file.status === Dropzone.ACCEPTED) {
+        file.status = Dropzone.QUEUED;
+        return this.processQueue();
+      } else {
+        throw new Error("This file can't be queued because it has already been processed or was rejected.");
+      }
+    };
+
     Dropzone.prototype.init = function() {
       var eventName, noPropagation, setupHiddenFileInput, _i, _len, _ref, _ref1,
         _this = this;
       if (this.element.tagName === "form") {
         this.element.setAttribute("enctype", "multipart/form-data");
       }
-      if (this.element.classList.contains("dropzone") && !this.element.querySelector("[data-dz-message]")) {
-        this.element.appendChild(Dropzone.createElement("<div class=\"dz-default dz-message\" data-dz-message><span>" + this.options.dictDefaultMessage + "</span></div>"));
+      if (this.element.classList.contains("dropzone") && !this.element.querySelector(".dz-message")) {
+        this.element.appendChild(Dropzone.createElement("<div class=\"dz-default dz-message\"><span>" + this.options.dictDefaultMessage + "</span></div>"));
       }
       if (this.clickableElements.length) {
         setupHiddenFileInput = function() {
@@ -676,18 +760,11 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
         eventName = _ref1[_i];
         this.on(eventName, this.options[eventName]);
       }
-      this.on("uploadprogress", function(file) {
-        var totalBytes, totalBytesSent, totalUploadProgress, _j, _len1, _ref2;
-        totalBytesSent = 0;
-        totalBytes = 0;
-        _ref2 = _this.acceptedFiles;
-        for (_j = 0, _len1 = _ref2.length; _j < _len1; _j++) {
-          file = _ref2[_j];
-          totalBytesSent += file.upload.bytesSent;
-          totalBytes += file.upload.total;
-        }
-        totalUploadProgress = 100 * totalBytesSent / totalBytes;
-        return _this.emit("totaluploadprogress", totalUploadProgress, totalBytes, totalBytesSent);
+      this.on("uploadprogress", function() {
+        return _this.updateTotalUploadProgress();
+      });
+      this.on("removedfile", function() {
+        return _this.updateTotalUploadProgress();
       });
       noPropagation = function(e) {
         e.stopPropagation();
@@ -745,13 +822,32 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
     Dropzone.prototype.destroy = function() {
       var _ref;
       this.disable();
-      this.removeAllFiles();
+      this.removeAllFiles(true);
       if ((_ref = this.hiddenFileInput) != null ? _ref.parentNode : void 0) {
         this.hiddenFileInput.parentNode.removeChild(this.hiddenFileInput);
         return this.hiddenFileInput = null;
       }
     };
 
+    Dropzone.prototype.updateTotalUploadProgress = function() {
+      var acceptedFiles, file, totalBytes, totalBytesSent, totalUploadProgress, _i, _len, _ref;
+      totalBytesSent = 0;
+      totalBytes = 0;
+      acceptedFiles = this.getAcceptedFiles();
+      if (acceptedFiles.length) {
+        _ref = this.getAcceptedFiles();
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          file = _ref[_i];
+          totalBytesSent += file.upload.bytesSent;
+          totalBytes += file.upload.total;
+        }
+        totalUploadProgress = 100 * totalBytesSent / totalBytes;
+      } else {
+        totalUploadProgress = 100;
+      }
+      return this.emit("totaluploadprogress", totalUploadProgress, totalBytes, totalBytesSent);
+    };
+
     Dropzone.prototype.getFallbackForm = function() {
       var existingFallback, fields, fieldsString, form;
       if (existingFallback = this.getExistingFallback()) {
@@ -834,20 +930,15 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
     };
 
     Dropzone.prototype.disable = function() {
-      var file, _i, _j, _len, _len1, _ref, _ref1, _results;
+      var file, _i, _len, _ref, _results;
       this.clickableElements.forEach(function(element) {
         return element.classList.remove("dz-clickable");
       });
       this.removeEventListeners();
-      _ref = this.filesProcessing;
+      _ref = this.files;
+      _results = [];
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         file = _ref[_i];
-        this.cancelUpload(file);
-      }
-      _ref1 = this.filesQueue;
-      _results = [];
-      for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-        file = _ref1[_j];
         _results.push(this.cancelUpload(file));
       }
       return _results;
@@ -933,9 +1024,8 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
         } else {
           file.status = Dropzone.ACCEPTED;
           file.accepted = true;
-          _this.acceptedFiles.push(file);
           if (_this.options.enqueueForUpload) {
-            _this.filesQueue.push(file);
+            file.status = Dropzone.QUEUED;
             return _this.processQueue();
           }
         }
@@ -947,19 +1037,21 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
         this.cancelUpload(file);
       }
       this.files = without(this.files, file);
-      this.filesQueue = without(this.filesQueue, file);
       this.emit("removedfile", file);
       if (this.files.length === 0) {
         return this.emit("reset");
       }
     };
 
-    Dropzone.prototype.removeAllFiles = function() {
+    Dropzone.prototype.removeAllFiles = function(cancelIfNecessary) {
       var file, _i, _len, _ref;
+      if (cancelIfNecessary == null) {
+        cancelIfNecessary = false;
+      }
       _ref = this.files.slice();
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         file = _ref[_i];
-        if (__indexOf.call(this.filesProcessing, file) < 0) {
+        if (file.status !== Dropzone.UPLOADING || cancelIfNecessary) {
           this.removeFile(file);
         }
       }
@@ -998,21 +1090,21 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
     };
 
     Dropzone.prototype.processQueue = function() {
-      var i, parallelUploads, processingLength;
+      var i, parallelUploads, processingLength, queuedFiles;
       parallelUploads = this.options.parallelUploads;
-      processingLength = this.filesProcessing.length;
+      processingLength = this.getUploadingFiles().length;
       i = processingLength;
+      queuedFiles = this.getQueuedFiles();
       while (i < parallelUploads) {
-        if (!this.filesQueue.length) {
+        if (!queuedFiles.length) {
           return;
         }
-        this.processFile(this.filesQueue.shift());
+        this.processFile(queuedFiles.shift());
         i++;
       }
     };
 
     Dropzone.prototype.processFile = function(file) {
-      this.filesProcessing.push(file);
       file.processing = true;
       file.status = Dropzone.UPLOADING;
       this.emit("processingfile", file);
@@ -1024,11 +1116,11 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       if (file.status === Dropzone.UPLOADING) {
         file.status = Dropzone.CANCELED;
         file.xhr.abort();
-        return this.filesProcessing = without(this.filesProcessing, file);
-      } else if ((_ref = file.status) === Dropzone.ADDED || _ref === Dropzone.ACCEPTED) {
+      } else if ((_ref = file.status) === Dropzone.ADDED || _ref === Dropzone.ACCEPTED || _ref === Dropzone.QUEUED) {
         file.status = Dropzone.CANCELED;
-        return this.filesQueue = without(this.filesQueue, file);
       }
+      this.emit("complete", file);
+      return this.processQueue();
     };
 
     Dropzone.prototype.uploadFile = function(file) {
@@ -1131,8 +1223,6 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
     };
 
     Dropzone.prototype.finished = function(file, responseText, e) {
-      this.filesProcessing = without(this.filesProcessing, file);
-      file.processing = false;
       file.status = Dropzone.SUCCESS;
       this.processQueue();
       this.emit("success", file, responseText, e);
@@ -1141,8 +1231,6 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
     };
 
     Dropzone.prototype.errorProcessing = function(file, message, xhr) {
-      this.filesProcessing = without(this.filesProcessing, file);
-      file.processing = false;
       file.status = Dropzone.ERROR;
       this.processQueue();
       this.emit("error", file, message, xhr);
@@ -1153,7 +1241,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
 
   })(Em);
 
-  Dropzone.version = "3.4.1";
+  Dropzone.version = "3.5.1";
 
   Dropzone.options = {};
 
@@ -1360,8 +1448,12 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
 
   Dropzone.ACCEPTED = "accepted";
 
+  Dropzone.QUEUED = "queued";
+
   Dropzone.UPLOADING = "uploading";
 
+  Dropzone.PROCESSING = Dropzone.UPLOADING;
+
   Dropzone.CANCELED = "canceled";
 
   Dropzone.ERROR = "error";

data/vendor/assets/stylesheets/dropzone/dropzone.css.scss

@@ -341,6 +341,28 @@
   -ms-filter: none;
   filter: none;
 }
+.dropzone a.dz-remove,
+.dropzone-previews a.dz-remove {
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fafafa), color-stop(1, #eee));
+  background-image: -webkit-linear-gradient(top, #fafafa 0%, #eee 100%);
+  background-image: -moz-linear-gradient(top, #fafafa 0%, #eee 100%);
+  background-image: -o-linear-gradient(top, #fafafa 0%, #eee 100%);
+  background-image: -ms-linear-gradient(top, #fafafa 0%, #eee 100%);
+  background-image: linear-gradient(top, #fafafa 0%, #eee 100%);
+  -webkit-border-radius: 2px;
+  border-radius: 2px;
+  border: 1px solid #eee;
+  text-decoration: none;
+  display: block;
+  padding: 4px 5px;
+  text-align: center;
+  color: #aaa;
+  margin-top: 26px;
+}
+.dropzone a.dz-remove:hover,
+.dropzone-previews a.dz-remove:hover {
+  color: #666;
+}
 @-moz-keyframes loading {
   0% {
     background-position: 0 -400px;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dropzonejs-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - José Nahuel Cuesta Luengo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit