dropzonejs-rails 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe9ee50a0edeab493470c4d53733167350ac2509
-  data.tar.gz: 8b71aa171ac3937fa58ce8bc6502cb0d5af843dc
+  metadata.gz: 3e72ebde5086f7653ba4b2ff9faf9ba1247a832d
+  data.tar.gz: ca8b70f7a0ddbee0002bc570383bc76095d09e1b
 SHA512:
-  metadata.gz: 554d70f56bc01d1e1be06fbfc5753ad04a363ebd24cb29b4ceed271524f534e8f258796d2925c1259fa3c400881928f8d696eb97b6a9293ca1f83c8ce6df449e
-  data.tar.gz: c7b820d918653d23d0c7e2acd9978b55fb68f53641597862e4deae799fa888fc46406e74f3b3830b99900bde86399c12c1614b10106a754721da6ca77cd5a5b5
+  metadata.gz: 2721ae0a488c2a4fc21c7cc39517f6bb57de7d8047df5d598ba361b1b36e4082eb7be235ea932068512dde18486b721477d0d5127f74de78754b22ed931b8277
+  data.tar.gz: 8ed7a066b5a47585b2e77098bd230503785e121dd7ed8cc74d5b5605e72bbaa785df68e2d50e280ddfaace1d9e1f6c3e36bc1328d6bc22d4657757a7444cdc94

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.7.3**.
+The latest version of this gem bundles **Dropzone v3.7.4**.
 
 ## Installation and usage
 

data/lib/dropzonejs-rails/version.rb

@@ -1,4 +1,4 @@
 module DropzonejsRails
-  VERSION = '0.4.10'
-  DROPZONE_VERSION = '3.7.3'
+  VERSION = '0.4.11'
+  DROPZONE_VERSION = '3.7.4'
 end

data/vendor/assets/javascripts/dropzone.js

@@ -412,7 +412,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
     */
 
 
-    Dropzone.prototype.events = ["drop", "dragstart", "dragend", "dragenter", "dragover", "dragleave", "selectedfiles", "addedfile", "removedfile", "thumbnail", "error", "errormultiple", "processing", "processingmultiple", "uploadprogress", "totaluploadprogress", "sending", "sendingmultiple", "success", "successmultiple", "canceled", "canceledmultiple", "complete", "completemultiple", "reset", "maxfilesexceeded"];
+    Dropzone.prototype.events = ["drop", "dragstart", "dragend", "dragenter", "dragover", "dragleave", "selectedfiles", "addedfile", "removedfile", "thumbnail", "error", "errormultiple", "processing", "processingmultiple", "uploadprogress", "totaluploadprogress", "sending", "sendingmultiple", "success", "successmultiple", "canceled", "canceledmultiple", "complete", "completemultiple", "reset", "maxfilesexceeded", "maxfilesreached"];
 
     Dropzone.prototype.defaultOptions = {
       url: null,
@@ -445,7 +445,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       dictCancelUploadConfirmation: "Are you sure you want to cancel this upload?",
       dictRemoveFile: "Remove file",
       dictRemoveFileConfirmation: null,
-      dictMaxFilesExceeded: "You can only upload {{maxFiles}} files.",
+      dictMaxFilesExceeded: "You can not upload any more files.",
       accept: function(file, done) {
         return done();
       },
@@ -569,9 +569,8 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
               }
             }
           });
-          file.previewElement.appendChild(file._removeLink);
+          return file.previewElement.appendChild(file._removeLink);
         }
-        return this._updateMaxFilesReachedClass();
       },
       removedfile: function(file) {
         var _ref;
@@ -596,6 +595,9 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       error: function(file, message) {
         var node, _i, _len, _ref, _results;
         file.previewElement.classList.add("dz-error");
+        if (typeof message !== "String" && message.error) {
+          message = message.error;
+        }
         _ref = file.previewElement.querySelectorAll("[data-dz-errormessage]");
         _results = [];
         for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -640,6 +642,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       },
       completemultiple: noop,
       maxfilesexceeded: noop,
+      maxfilesreached: noop,
       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>"
     };
 
@@ -840,6 +843,9 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
               return _this.emit("dragenter", e);
             },
             "dragover": function(e) {
+              var efct;
+              efct = e.dataTransfer.effectAllowed;
+              e.dataTransfer.dropEffect = 'move' === efct || 'linkMove' === efct ? 'move' : 'copy';
               noPropagation(e);
               return _this.emit("dragover", e);
             },
@@ -880,7 +886,8 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
         this.hiddenFileInput.parentNode.removeChild(this.hiddenFileInput);
         this.hiddenFileInput = null;
       }
-      return delete this.element.dropzone;
+      delete this.element.dropzone;
+      return Dropzone.instances.splice(Dropzone.instances.indexOf(this), 1);
     };
 
     Dropzone.prototype.updateTotalUploadProgress = function() {
@@ -1007,18 +1014,18 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
 
     Dropzone.prototype.filesize = function(size) {
       var string;
-      if (size >= 100000000000) {
-        size = size / 100000000000;
-        string = "TB";
-      } else if (size >= 100000000) {
-        size = size / 100000000;
-        string = "GB";
-      } else if (size >= 100000) {
-        size = size / 100000;
-        string = "MB";
-      } else if (size >= 100) {
-        size = size / 100;
-        string = "KB";
+      if (size >= 1024 * 1024 * 1024 * 1024 / 10) {
+        size = size / (1024 * 1024 * 1024 * 1024 / 10);
+        string = "TiB";
+      } else if (size >= 1024 * 1024 * 1024 / 10) {
+        size = size / (1024 * 1024 * 1024 / 10);
+        string = "GiB";
+      } else if (size >= 1024 * 1024 / 10) {
+        size = size / (1024 * 1024 / 10);
+        string = "MiB";
+      } else if (size >= 1024 / 10) {
+        size = size / (1024 / 10);
+        string = "KiB";
       } else {
         size = size * 10;
         string = "b";
@@ -1027,7 +1034,10 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
     };
 
     Dropzone.prototype._updateMaxFilesReachedClass = function() {
-      if (this.options.maxFiles && this.getAcceptedFiles().length >= this.options.maxFiles) {
+      if ((this.options.maxFiles != null) && this.getAcceptedFiles().length >= this.options.maxFiles) {
+        if (this.getAcceptedFiles().length === this.options.maxFiles) {
+          this.emit('maxfilesreached', this.files);
+        }
         return this.element.classList.add("dz-max-files-reached");
       } else {
         return this.element.classList.remove("dz-max-files-reached");
@@ -1084,7 +1094,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
         return done(this.options.dictFileTooBig.replace("{{filesize}}", Math.round(file.size / 1024 / 10.24) / 100).replace("{{maxFilesize}}", this.options.maxFilesize));
       } else if (!Dropzone.isValidFile(file, this.options.acceptedFiles)) {
         return done(this.options.dictInvalidFileType);
-      } else if (this.options.maxFiles && this.getAcceptedFiles().length >= this.options.maxFiles) {
+      } else if ((this.options.maxFiles != null) && this.getAcceptedFiles().length >= this.options.maxFiles) {
         done(this.options.dictMaxFilesExceeded.replace("{{maxFiles}}", this.options.maxFiles));
         return this.emit("maxfilesexceeded", file);
       } else {
@@ -1108,10 +1118,11 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       return this.accept(file, function(error) {
         if (error) {
           file.accepted = false;
-          return _this._errorProcessing([file], error);
+          _this._errorProcessing([file], error);
         } else {
-          return _this.enqueueFile(file);
+          _this.enqueueFile(file);
         }
+        return _this._updateMaxFilesReachedClass();
       });
     };
 
@@ -1197,7 +1208,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       fileReader = new FileReader;
       fileReader.onload = function() {
         var img;
-        img = new Image;
+        img = document.createElement("img");
         img.onload = function() {
           var canvas, ctx, resizeInfo, thumbnail, _ref, _ref1, _ref2, _ref3;
           file.width = img.width;
@@ -1314,7 +1325,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
     };
 
     Dropzone.prototype.uploadFiles = function(files) {
-      var file, formData, handleError, headerName, headerValue, headers, input, inputName, inputType, key, progressObj, response, updateProgress, value, xhr, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref, _ref1, _ref2, _ref3,
+      var file, formData, handleError, headerName, headerValue, headers, input, inputName, inputType, key, option, progressObj, response, updateProgress, value, xhr, _i, _j, _k, _l, _len, _len1, _len2, _len3, _len4, _m, _ref, _ref1, _ref2, _ref3, _ref4,
         _this = this;
       xhr = new XMLHttpRequest();
       for (_i = 0, _len = files.length; _i < _len; _i++) {
@@ -1432,13 +1443,21 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
           input = _ref2[_k];
           inputName = input.getAttribute("name");
           inputType = input.getAttribute("type");
-          if (!inputType || ((_ref3 = inputType.toLowerCase()) !== "checkbox" && _ref3 !== "radio") || input.checked) {
+          if (input.tagName === "SELECT" && input.hasAttribute("multiple")) {
+            _ref3 = input.options;
+            for (_l = 0, _len3 = _ref3.length; _l < _len3; _l++) {
+              option = _ref3[_l];
+              if (option.selected) {
+                formData.append(inputName, option.value);
+              }
+            }
+          } else if (!inputType || ((_ref4 = inputType.toLowerCase()) !== "checkbox" && _ref4 !== "radio") || input.checked) {
             formData.append(inputName, input.value);
           }
         }
       }
-      for (_l = 0, _len3 = files.length; _l < _len3; _l++) {
-        file = files[_l];
+      for (_m = 0, _len4 = files.length; _m < _len4; _m++) {
+        file = files[_m];
         formData.append("" + this.options.paramName + (this.options.uploadMultiple ? "[]" : ""), file, file.name);
       }
       return xhr.send(formData);
@@ -1482,13 +1501,13 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
 
   })(Em);
 
-  Dropzone.version = "3.7.3";
+  Dropzone.version = "3.7.4";
 
   Dropzone.options = {};
 
   Dropzone.optionsForElement = function(element) {
-    if (element.id) {
-      return Dropzone.options[camelize(element.id)];
+    if (element.getAttribute("id")) {
+      return Dropzone.options[camelize(element.getAttribute("id"))];
     } else {
       return void 0;
     }

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

@@ -124,6 +124,7 @@
 }
 .dropzone .dz-preview .dz-progress .dz-upload,
 .dropzone-previews .dz-preview .dz-progress .dz-upload {
+  display: block;
   position: absolute;
   top: 0;
   bottom: 0;

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

@@ -124,6 +124,7 @@
 }
 .dropzone .dz-preview .dz-progress .dz-upload,
 .dropzone-previews .dz-preview .dz-progress .dz-upload {
+  display: block;
   position: absolute;
   top: 0;
   bottom: 0;

metadata

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