dropzonejs-rails 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e72ebde5086f7653ba4b2ff9faf9ba1247a832d
-  data.tar.gz: ca8b70f7a0ddbee0002bc570383bc76095d09e1b
+  metadata.gz: 20229c96f62878fc1f45521de96014fde6ff6ebd
+  data.tar.gz: ace779f77685ab4e67a5187d1c2547eee81ad2fa
 SHA512:
-  metadata.gz: 2721ae0a488c2a4fc21c7cc39517f6bb57de7d8047df5d598ba361b1b36e4082eb7be235ea932068512dde18486b721477d0d5127f74de78754b22ed931b8277
-  data.tar.gz: 8ed7a066b5a47585b2e77098bd230503785e121dd7ed8cc74d5b5605e72bbaa785df68e2d50e280ddfaace1d9e1f6c3e36bc1328d6bc22d4657757a7444cdc94
+  metadata.gz: 716b5a17f76ae375d0a073c985284ae88ea53ee3087c6ab8f44f44fcb33fbf873ecbc419003c3d75cba61925b931b2bdb29149654b00d23fcb31f215568d2965
+  data.tar.gz: 0092e7f67f209b100bb9506464b18ee2437e5975a67785239793c60cd29788b2b79c371908c8129a2e7be4b5eb57aeed1abd3ca318a6812977d4a1ed1ac53f68

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

data/lib/dropzonejs-rails/version.rb

@@ -1,4 +1,4 @@
 module DropzonejsRails
-  VERSION = '0.4.11'
-  DROPZONE_VERSION = '3.7.4'
+  VERSION = '0.4.12'
+  DROPZONE_VERSION = '3.8.2'
 end

data/vendor/assets/javascripts/dropzone.js

@@ -242,7 +242,8 @@ function mixin(obj) {
  * @api public
  */
 
-Emitter.prototype.on = function(event, fn){
+Emitter.prototype.on =
+Emitter.prototype.addEventListener = function(event, fn){
   this._callbacks = this._callbacks || {};
   (this._callbacks[event] = this._callbacks[event] || [])
     .push(fn);
@@ -268,7 +269,7 @@ Emitter.prototype.once = function(event, fn){
     fn.apply(this, arguments);
   }
 
-  fn._off = on;
+  on.fn = fn;
   this.on(event, on);
   return this;
 };
@@ -285,8 +286,17 @@ Emitter.prototype.once = function(event, fn){
 
 Emitter.prototype.off =
 Emitter.prototype.removeListener =
-Emitter.prototype.removeAllListeners = function(event, fn){
+Emitter.prototype.removeAllListeners =
+Emitter.prototype.removeEventListener = function(event, fn){
   this._callbacks = this._callbacks || {};
+
+  // all
+  if (0 == arguments.length) {
+    this._callbacks = {};
+    return this;
+  }
+
+  // specific event
   var callbacks = this._callbacks[event];
   if (!callbacks) return this;
 
@@ -297,8 +307,14 @@ Emitter.prototype.removeAllListeners = function(event, fn){
   }
 
   // remove specific handler
-  var i = callbacks.indexOf(fn._off || fn);
-  if (~i) callbacks.splice(i, 1);
+  var cb;
+  for (var i = 0; i < callbacks.length; i++) {
+    cb = callbacks[i];
+    if (cb === fn || cb.fn === fn) {
+      callbacks.splice(i, 1);
+      break;
+    }
+  }
   return this;
 };
 
@@ -389,7 +405,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
 
 
 (function() {
-  var Dropzone, Em, camelize, contentLoaded, noop, without,
+  var Dropzone, Em, camelize, contentLoaded, detectVerticalSquash, drawImageIOSFix, 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;
@@ -412,7 +428,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", "maxfilesreached"];
+    Dropzone.prototype.events = ["drop", "dragstart", "dragend", "dragenter", "dragover", "dragleave", "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,
@@ -438,7 +454,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       dictDefaultMessage: "Drop files here to upload",
       dictFallbackMessage: "Your browser does not support drag'n'drop file uploads.",
       dictFallbackText: "Please use the fallback form below to upload your files like in the olden days.",
-      dictFileTooBig: "File is too big ({{filesize}}MB). Max filesize: {{maxFilesize}}MB.",
+      dictFileTooBig: "File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.",
       dictInvalidFileType: "You can't upload files of this type.",
       dictResponseError: "Server responded with {{statusCode}} code.",
       dictCancelUpload: "Cancel upload",
@@ -526,17 +542,16 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       dragleave: function(e) {
         return this.element.classList.remove("dz-drag-hover");
       },
-      selectedfiles: function(files) {
-        if (this.element === this.previewsContainer) {
-          return this.element.classList.add("dz-started");
-        }
-      },
+      paste: noop,
       reset: function() {
         return this.element.classList.remove("dz-started");
       },
       addedfile: function(file) {
-        var node, _i, _j, _len, _len1, _ref, _ref1,
+        var node, removeFileEvent, removeLink, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _results,
           _this = this;
+        if (this.element === this.previewsContainer) {
+          this.element.classList.add("dz-started");
+        }
         file.previewElement = Dropzone.createElement(this.options.previewTemplate.trim());
         file.previewTemplate = file.previewElement;
         this.previewsContainer.appendChild(file.previewElement);
@@ -551,26 +566,33 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
           node.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) {
-              return Dropzone.confirm(_this.options.dictCancelUploadConfirmation, function() {
+          file._removeLink = Dropzone.createElement("<a class=\"dz-remove\" href=\"javascript:undefined;\" data-dz-remove>" + this.options.dictRemoveFile + "</a>");
+          file.previewElement.appendChild(file._removeLink);
+        }
+        removeFileEvent = function(e) {
+          e.preventDefault();
+          e.stopPropagation();
+          if (file.status === Dropzone.UPLOADING) {
+            return Dropzone.confirm(_this.options.dictCancelUploadConfirmation, function() {
+              return _this.removeFile(file);
+            });
+          } else {
+            if (_this.options.dictRemoveFileConfirmation) {
+              return Dropzone.confirm(_this.options.dictRemoveFileConfirmation, function() {
                 return _this.removeFile(file);
               });
             } else {
-              if (_this.options.dictRemoveFileConfirmation) {
-                return Dropzone.confirm(_this.options.dictRemoveFileConfirmation, function() {
-                  return _this.removeFile(file);
-                });
-              } else {
-                return _this.removeFile(file);
-              }
+              return _this.removeFile(file);
             }
-          });
-          return file.previewElement.appendChild(file._removeLink);
+          }
+        };
+        _ref2 = file.previewElement.querySelectorAll("[data-dz-remove]");
+        _results = [];
+        for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
+          removeLink = _ref2[_k];
+          _results.push(removeLink.addEventListener("click", removeFileEvent));
         }
+        return _results;
       },
       removedfile: function(file) {
         var _ref;
@@ -797,11 +819,13 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
           _this.hiddenFileInput.style.width = "0";
           document.body.appendChild(_this.hiddenFileInput);
           return _this.hiddenFileInput.addEventListener("change", function() {
-            var files;
+            var file, files, _i, _len;
             files = _this.hiddenFileInput.files;
             if (files.length) {
-              _this.emit("selectedfiles", files);
-              _this.handleFiles(files);
+              for (_i = 0, _len = files.length; _i < _len; _i++) {
+                file = files[_i];
+                _this.addFile(file);
+              }
             }
             return setupHiddenFileInput();
           });
@@ -823,6 +847,13 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       this.on("canceled", function(file) {
         return _this.emit("complete", file);
       });
+      this.on("complete", function(file) {
+        if (_this.getUploadingFiles().length === 0 && _this.getQueuedFiles().length === 0) {
+          return setTimeout((function() {
+            return _this.emit("queuecomplete");
+          }), 0);
+        }
+      });
       noPropagation = function(e) {
         e.stopPropagation();
         if (e.preventDefault) {
@@ -858,6 +889,10 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
             },
             "dragend": function(e) {
               return _this.emit("dragend", e);
+            },
+            "paste": function(e) {
+              noPropagation(e);
+              return _this.paste(e);
             }
           }
         }
@@ -1051,17 +1086,29 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       }
       this.emit("drop", e);
       files = e.dataTransfer.files;
-      this.emit("selectedfiles", files);
       if (files.length) {
         items = e.dataTransfer.items;
-        if (items && items.length && ((items[0].webkitGetAsEntry != null) || (items[0].getAsEntry != null))) {
-          this.handleItems(items);
+        if (items && items.length && (items[0].webkitGetAsEntry != null)) {
+          this._addFilesFromItems(items);
         } else {
           this.handleFiles(files);
         }
       }
     };
 
+    Dropzone.prototype.paste = function(e) {
+      var items, _ref;
+      return;
+      if ((e != null ? (_ref = e.clipboardData) != null ? _ref.items : void 0 : void 0) == null) {
+        return;
+      }
+      this.emit("paste", e);
+      items = e.clipboardData.items;
+      if (items.length) {
+        return this._addFilesFromItems(items);
+      }
+    };
+
     Dropzone.prototype.handleFiles = function(files) {
       var file, _i, _len, _results;
       _results = [];
@@ -1072,21 +1119,56 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       return _results;
     };
 
-    Dropzone.prototype.handleItems = function(items) {
-      var entry, item, _i, _len;
+    Dropzone.prototype._addFilesFromItems = function(items) {
+      var entry, item, _i, _len, _results;
+      _results = [];
       for (_i = 0, _len = items.length; _i < _len; _i++) {
         item = items[_i];
-        if (item.webkitGetAsEntry != null) {
-          entry = item.webkitGetAsEntry();
+        if ((item.webkitGetAsEntry != null) && (entry = item.webkitGetAsEntry())) {
           if (entry.isFile) {
-            this.addFile(item.getAsFile());
+            _results.push(this.addFile(item.getAsFile()));
           } else if (entry.isDirectory) {
-            this.addDirectory(entry, entry.name);
+            _results.push(this._addFilesFromDirectory(entry, entry.name));
+          } else {
+            _results.push(void 0);
+          }
+        } else if (item.getAsFile != null) {
+          if ((item.kind == null) || item.kind === "file") {
+            _results.push(this.addFile(item.getAsFile()));
+          } else {
+            _results.push(void 0);
           }
         } else {
-          this.addFile(item.getAsFile());
+          _results.push(void 0);
         }
       }
+      return _results;
+    };
+
+    Dropzone.prototype._addFilesFromDirectory = function(directory, path) {
+      var dirReader, entriesReader,
+        _this = this;
+      dirReader = directory.createReader();
+      entriesReader = function(entries) {
+        var entry, _i, _len;
+        for (_i = 0, _len = entries.length; _i < _len; _i++) {
+          entry = entries[_i];
+          if (entry.isFile) {
+            entry.file(function(file) {
+              if (_this.options.ignoreHiddenFiles && file.name.substring(0, 1) === '.') {
+                return;
+              }
+              file.fullPath = "" + path + "/" + file.name;
+              return _this.addFile(file);
+            });
+          } else if (entry.isDirectory) {
+            _this._addFilesFromDirectory(entry, "" + path + "/" + entry.name);
+          }
+        }
+      };
+      return dirReader.readEntries(entriesReader, function(error) {
+        return typeof console !== "undefined" && console !== null ? typeof console.log === "function" ? console.log(error) : void 0 : void 0;
+      });
     };
 
     Dropzone.prototype.accept = function(file, done) {
@@ -1112,9 +1194,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       this.files.push(file);
       file.status = Dropzone.ADDED;
       this.emit("addedfile", file);
-      if (this.options.createImageThumbnails && file.type.match(/image.*/) && file.size <= this.options.maxThumbnailFilesize * 1024 * 1024) {
-        this.createThumbnail(file);
-      }
+      this._enqueueThumbnail(file);
       return this.accept(file, function(error) {
         if (error) {
           file.accepted = false;
@@ -1143,36 +1223,36 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
         if (this.options.autoProcessQueue) {
           return setTimeout((function() {
             return _this.processQueue();
-          }), 1);
+          }), 0);
         }
       } else {
         throw new Error("This file can't be queued because it has already been processed or was rejected.");
       }
     };
 
-    Dropzone.prototype.addDirectory = function(entry, path) {
-      var dirReader, entriesReader,
-        _this = this;
-      dirReader = entry.createReader();
-      entriesReader = function(entries) {
-        var _i, _len;
-        for (_i = 0, _len = entries.length; _i < _len; _i++) {
-          entry = entries[_i];
-          if (entry.isFile) {
-            entry.file(function(file) {
-              if (_this.options.ignoreHiddenFiles && file.name.substring(0, 1) === '.') {
-                return;
-              }
-              file.fullPath = "" + path + "/" + file.name;
-              return _this.addFile(file);
-            });
-          } else if (entry.isDirectory) {
-            _this.addDirectory(entry, "" + path + "/" + entry.name);
-          }
-        }
-      };
-      return dirReader.readEntries(entriesReader, function(error) {
-        return typeof console !== "undefined" && console !== null ? typeof console.log === "function" ? console.log(error) : void 0 : void 0;
+    Dropzone.prototype._thumbnailQueue = [];
+
+    Dropzone.prototype._processingThumbnail = false;
+
+    Dropzone.prototype._enqueueThumbnail = function(file) {
+      var _this = this;
+      if (this.options.createImageThumbnails && file.type.match(/image.*/) && file.size <= this.options.maxThumbnailFilesize * 1024 * 1024) {
+        this._thumbnailQueue.push(file);
+        return setTimeout((function() {
+          return _this._processThumbnailQueue();
+        }), 0);
+      }
+    };
+
+    Dropzone.prototype._processThumbnailQueue = function() {
+      var _this = this;
+      if (this._processingThumbnail || this._thumbnailQueue.length === 0) {
+        return;
+      }
+      this._processingThumbnail = true;
+      return this.createThumbnail(this._thumbnailQueue.shift(), function() {
+        _this._processingThumbnail = false;
+        return _this._processThumbnailQueue();
       });
     };
 
@@ -1202,7 +1282,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       return null;
     };
 
-    Dropzone.prototype.createThumbnail = function(file) {
+    Dropzone.prototype.createThumbnail = function(file, callback) {
       var fileReader,
         _this = this;
       fileReader = new FileReader;
@@ -1224,9 +1304,12 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
           ctx = canvas.getContext("2d");
           canvas.width = resizeInfo.trgWidth;
           canvas.height = resizeInfo.trgHeight;
-          ctx.drawImage(img, (_ref = resizeInfo.srcX) != null ? _ref : 0, (_ref1 = resizeInfo.srcY) != null ? _ref1 : 0, resizeInfo.srcWidth, resizeInfo.srcHeight, (_ref2 = resizeInfo.trgX) != null ? _ref2 : 0, (_ref3 = resizeInfo.trgY) != null ? _ref3 : 0, resizeInfo.trgWidth, resizeInfo.trgHeight);
+          drawImageIOSFix(ctx, img, (_ref = resizeInfo.srcX) != null ? _ref : 0, (_ref1 = resizeInfo.srcY) != null ? _ref1 : 0, resizeInfo.srcWidth, resizeInfo.srcHeight, (_ref2 = resizeInfo.trgX) != null ? _ref2 : 0, (_ref3 = resizeInfo.trgY) != null ? _ref3 : 0, resizeInfo.trgWidth, resizeInfo.trgHeight);
           thumbnail = canvas.toDataURL("image/png");
-          return _this.emit("thumbnail", file, thumbnail);
+          _this.emit("thumbnail", file, thumbnail);
+          if (callback != null) {
+            return callback();
+          }
         };
         return img.src = fileReader.result;
       };
@@ -1501,7 +1584,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
 
   })(Em);
 
-  Dropzone.version = "3.7.4";
+  Dropzone.version = "3.8.2";
 
   Dropzone.options = {};
 
@@ -1730,6 +1813,50 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
 
   Dropzone.SUCCESS = "success";
 
+  /*
+  
+  Bugfix for iOS 6 and 7
+  Source: http://stackoverflow.com/questions/11929099/html5-canvas-drawimage-ratio-bug-ios
+  based on the work of https://github.com/stomita/ios-imagefile-megapixel
+  */
+
+
+  detectVerticalSquash = function(img) {
+    var alpha, canvas, ctx, data, ey, ih, iw, py, ratio, sy;
+    iw = img.naturalWidth;
+    ih = img.naturalHeight;
+    canvas = document.createElement("canvas");
+    canvas.width = 1;
+    canvas.height = ih;
+    ctx = canvas.getContext("2d");
+    ctx.drawImage(img, 0, 0);
+    data = ctx.getImageData(0, 0, 1, ih).data;
+    sy = 0;
+    ey = ih;
+    py = ih;
+    while (py > sy) {
+      alpha = data[(py - 1) * 4 + 3];
+      if (alpha === 0) {
+        ey = py;
+      } else {
+        sy = py;
+      }
+      py = (ey + sy) >> 1;
+    }
+    ratio = py / ih;
+    if (ratio === 0) {
+      return 1;
+    } else {
+      return ratio;
+    }
+  };
+
+  drawImageIOSFix = function(ctx, img, sx, sy, sw, sh, dx, dy, dw, dh) {
+    var vertSquashRatio;
+    vertSquashRatio = detectVerticalSquash(img);
+    return ctx.drawImage(img, sx, sy, sw, sh, dx, dy, dw, dh / vertSquashRatio);
+  };
+
   /*
   # contentloaded.js
   #

metadata

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