dropzonejs-rails 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjA5NjgxODJhNTE2OTc2ZTEyMWViNWJlMzU2ZWJkMzE0NTBlMDk5Yg==
+    YzM0MjkzNDdiMDU2YTNkMzQ2Y2U0ZjY2MzJmZjYwZWE2ZDg2MGNhNQ==
   data.tar.gz: !binary |-
-    MTZkYTE1ODU2N2MyYzJkNzBlZDY1MjA1NjdjMjA0MjQ2YWY2YzNlMw==
+    MDg3OTBlYjM1MzA5OTRmMTBlYzkzNTljZmQ2NjJlYWJhMzY4ZTk2ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWY5NmIyNGQwNTRhNzI4NDBjMTUxN2RmMjliNTEyZTYyNGQ3MzZmMGNkNGNh
-    ZDBiMjY5ZTc5M2JlZTcwYTUzMjZmZjQzZTlmZTBkMjNjYTFiMDkxM2FmZDJh
-    MThlNjJlZjE5NjlkYjFiNjE2MzkyZmY1OGZiNzhhYTQyMWExNDU=
+    YjI0MWFkODhlZTMxOTRiNWI2ZWNkOTdjOWQ0NzQzY2ZjODMzZWI4MjZhOGY5
+    OTEzZjU1MTBkOGM2Y2UwMmQ0MDI0MjU2MWJjN2UyZDc2NzA4MjEzZjI5NWNl
+    ODliOTMxM2ExMDJkY2NlZmE2NzM1MDU1YjEwZWNkZmZhMDg1MWE=
   data.tar.gz: !binary |-
-    NWY3NjI2N2JjNGE3MDQ4MjYxOThjMzhlMmM4NGNjNGJmNDNjYjE4NGQ5ZTUz
-    OGY0MzBhNjkyYzc5MTNiMjZkYjdjNzhmZTYwYTA4NzNiOTIwYzRjZmMwMmRl
-    OTJlMDdmZjg5Yjc3NmU2YjFjMGQ5NjVlMjI1NzUxMGZiZjgzNWM=
+    OTQzN2M4YjQ0YmMyNDk4ZTg3YTY0MDJmMWNiOGYxMzg0ZTQ1NjdiZTQ2NTIy
+    ZGMyNWE3YjFhZWU0YTQwMjc1YTM1ODUxYmUyNTUyNWFhNDhmYjJmYWE5MDA0
+    MjJiYWYxOGQ5YzY2ZDMwYjQzYjBjMmNmNGU2MjBkN2VlOWE1ODA=

data/README.md

@@ -47,7 +47,7 @@ Go to [this secret place](https://github.com/ncuesta/dropzonejs-rails/issues).
 **DO NOT - I repeat - DO NOT bump version numbers.** Unless you **really** need to.
 
 
-### Getting the latest version of Raptor Editor
+### Getting the latest version of Dropzone
 
 1. Update `DropzonejsRails::DROPZONE_VERSION` to the newest version of Dropzone.
 1. Do a `rake get` - it'll download the file four you.

data/lib/dropzonejs-rails/version.rb

@@ -1,4 +1,4 @@
 module DropzonejsRails
-  VERSION = '0.1.4'
-  DROPZONE_VERSION = '2.0.11'
+  VERSION = '0.1.5'
+  DROPZONE_VERSION = '2.0.12'
 end

data/vendor/assets/javascripts/dropzone.js

@@ -443,6 +443,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       init: function() {
         return noop;
       },
+      forceFallback: false,
       fallback: function() {
         var child, messageElement, span, _i, _len, _ref;
 
@@ -532,7 +533,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
     };
 
     function Dropzone(element, options) {
-      var elementId, elementOptions, extend, fallback, _ref;
+      var elementOptions, extend, fallback, _ref;
 
       this.element = element;
       this.version = Dropzone.version;
@@ -543,12 +544,12 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       if (!(this.element && (this.element.nodeType != null))) {
         throw new Error("Invalid dropzone element.");
       }
-      if (Dropzone.forElement(this.element)) {
+      if (this.element.dropzone) {
         throw new Error("Dropzone already attached.");
       }
       Dropzone.instances.push(this);
-      elementId = this.element.id;
-      elementOptions = (_ref = (elementId ? Dropzone.options[camelize(elementId)] : void 0)) != null ? _ref : {};
+      element.dropzone = this;
+      elementOptions = (_ref = Dropzone.optionsForElement(this.element)) != null ? _ref : {};
       extend = function() {
         var key, object, objects, target, val, _i, _len;
 
@@ -570,7 +571,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
         throw new Error("No URL provided.");
       }
       this.options.method = this.options.method.toUpperCase();
-      if (!Dropzone.isBrowserSupported()) {
+      if (this.options.forceFallback || !Dropzone.isBrowserSupported()) {
         return this.options.fallback.call(this);
       }
       if ((fallback = this.getExistingFallback()) && fallback.parentNode) {
@@ -588,6 +589,18 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       } else {
         this.previewsContainer = this.element;
       }
+      if (this.options.clickable) {
+        if (this.options.clickable === true) {
+          this.clickableElement = this.element;
+        } else if (typeof this.options.clickable === "string") {
+          this.clickableElement = document.querySelector(this.options.clickable);
+        } else if (this.options.clickable.nodeType != null) {
+          this.clickableElement = this.options.clickable;
+        }
+        if (!this.clickableElement) {
+          throw new Error("Invalid `clickable` element provided. Please set it to `true`, a plain HTML element or a valid CSS selector.");
+        }
+      }
       this.init();
     }
 
@@ -601,7 +614,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       if (this.element.classList.contains("dropzone") && !this.element.querySelector(".message")) {
         this.element.appendChild(Dropzone.createElement("<div class=\"default message\"><span>" + this.options.dictDefaultMessage + "</span></div>"));
       }
-      if (this.options.clickable) {
+      if (this.clickableElement) {
         setupHiddenFileInput = function() {
           if (_this.hiddenFileInput) {
             document.body.removeChild(_this.hiddenFileInput);
@@ -641,38 +654,47 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
           return e.returnValue = false;
         }
       };
-      this.listeners = {
-        "dragstart": function(e) {
-          return _this.emit("dragstart", e);
-        },
-        "dragenter": function(e) {
-          noPropagation(e);
-          return _this.emit("dragenter", e);
-        },
-        "dragover": function(e) {
-          noPropagation(e);
-          return _this.emit("dragover", e);
-        },
-        "dragleave": function(e) {
-          return _this.emit("dragleave", e);
-        },
-        "drop": function(e) {
-          noPropagation(e);
-          _this.drop(e);
-          return _this.emit("drop", e);
-        },
-        "dragend": function(e) {
-          return _this.emit("dragend", e);
-        },
-        "click": function(evt) {
-          if (!_this.options.clickable) {
-            return;
-          }
-          if (evt.target === _this.element || Dropzone.elementInside(evt.target, _this.element.querySelector(".message"))) {
-            return _this.hiddenFileInput.click();
+      this.listeners = [
+        {
+          element: this.element,
+          events: {
+            "dragstart": function(e) {
+              return _this.emit("dragstart", e);
+            },
+            "dragenter": function(e) {
+              noPropagation(e);
+              return _this.emit("dragenter", e);
+            },
+            "dragover": function(e) {
+              noPropagation(e);
+              return _this.emit("dragover", e);
+            },
+            "dragleave": function(e) {
+              return _this.emit("dragleave", e);
+            },
+            "drop": function(e) {
+              noPropagation(e);
+              _this.drop(e);
+              return _this.emit("drop", e);
+            },
+            "dragend": function(e) {
+              return _this.emit("dragend", e);
+            }
           }
         }
-      };
+      ];
+      if (this.clickableElement) {
+        this.listeners.push({
+          element: this.clickableElement,
+          events: {
+            "click": function(evt) {
+              if ((_this.clickableElement !== _this.element) || (evt.target === _this.element || Dropzone.elementInside(evt.target, _this.element.querySelector(".message")))) {
+                return _this.hiddenFileInput.click();
+              }
+            }
+          }
+        });
+      }
       this.enable();
       return this.options.init.call(this);
     };
@@ -722,31 +744,51 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
     };
 
     Dropzone.prototype.setupEventListeners = function() {
-      var event, listener, _ref, _results;
+      var elementListeners, event, listener, _i, _len, _ref, _results;
 
       _ref = this.listeners;
       _results = [];
-      for (event in _ref) {
-        listener = _ref[event];
-        _results.push(this.element.addEventListener(event, listener, false));
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        elementListeners = _ref[_i];
+        _results.push((function() {
+          var _ref1, _results1;
+
+          _ref1 = elementListeners.events;
+          _results1 = [];
+          for (event in _ref1) {
+            listener = _ref1[event];
+            _results1.push(elementListeners.element.addEventListener(event, listener, false));
+          }
+          return _results1;
+        })());
       }
       return _results;
     };
 
     Dropzone.prototype.removeEventListeners = function() {
-      var event, listener, _ref, _results;
+      var elementListeners, event, listener, _i, _len, _ref, _results;
 
       _ref = this.listeners;
       _results = [];
-      for (event in _ref) {
-        listener = _ref[event];
-        _results.push(this.element.removeEventListener(event, listener, false));
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        elementListeners = _ref[_i];
+        _results.push((function() {
+          var _ref1, _results1;
+
+          _ref1 = elementListeners.events;
+          _results1 = [];
+          for (event in _ref1) {
+            listener = _ref1[event];
+            _results1.push(elementListeners.element.removeEventListener(event, listener, false));
+          }
+          return _results1;
+        })());
       }
       return _results;
     };
 
     Dropzone.prototype.disable = function() {
-      if (this.options.clickable) {
+      if (this.clickableElement === this.element) {
         this.element.classList.remove("clickable");
       }
       this.removeEventListeners();
@@ -755,7 +797,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
     };
 
     Dropzone.prototype.enable = function() {
-      if (this.options.clickable) {
+      if (this.clickableElement === this.element) {
         this.element.classList.add("clickable");
       }
       return this.setupEventListeners();
@@ -1012,26 +1054,68 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
 
   })(Em);
 
-  Dropzone.version = "2.0.11";
+  Dropzone.version = "2.0.12";
 
   Dropzone.options = {};
 
+  Dropzone.optionsForElement = function(element) {
+    if (element.id) {
+      return Dropzone.options[camelize(element.id)];
+    } else {
+      return void 0;
+    }
+  };
+
   Dropzone.instances = [];
 
   Dropzone.forElement = function(element) {
-    var instance, _i, _len, _ref;
+    var _ref;
 
     if (typeof element === "string") {
       element = document.querySelector(element);
     }
-    _ref = Dropzone.instances;
-    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-      instance = _ref[_i];
-      if (instance.element === element) {
-        return instance;
+    return (_ref = element.dropzone) != null ? _ref : null;
+  };
+
+  Dropzone.autoDiscover = true;
+
+  Dropzone.discover = function() {
+    var checkElements, dropzone, dropzones, _i, _len, _results;
+
+    if (!Dropzone.autoDiscover) {
+      return;
+    }
+    if (document.querySelectorAll) {
+      dropzones = document.querySelectorAll(".dropzone");
+    } else {
+      dropzones = [];
+      checkElements = function(elements) {
+        var el, _i, _len, _results;
+
+        _results = [];
+        for (_i = 0, _len = elements.length; _i < _len; _i++) {
+          el = elements[_i];
+          if (/(^| )dropzone($| )/.test(el.className)) {
+            _results.push(dropzones.push(el));
+          } else {
+            _results.push(void 0);
+          }
+        }
+        return _results;
+      };
+      checkElements(document.getElementsByTagName("div"));
+      checkElements(document.getElementsByTagName("form"));
+    }
+    _results = [];
+    for (_i = 0, _len = dropzones.length; _i < _len; _i++) {
+      dropzone = dropzones[_i];
+      if (Dropzone.optionsForElement(dropzone) !== false) {
+        _results.push(new Dropzone(dropzone));
+      } else {
+        _results.push(void 0);
       }
     }
-    return null;
+    return _results;
   };
 
   Dropzone.blacklistedBrowsers = [/opera.*Macintosh.*version\/12/i];
@@ -1158,37 +1242,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
     }
   };
 
-  contentLoaded(window, function() {
-    var checkElements, dropzone, dropzones, _i, _len, _results;
-
-    if (false) {
-      dropzones = document.querySelectorAll(".dropzone");
-    } else {
-      dropzones = [];
-      checkElements = function(elements) {
-        var el, _i, _len, _results;
-
-        _results = [];
-        for (_i = 0, _len = elements.length; _i < _len; _i++) {
-          el = elements[_i];
-          if (/(^| )dropzone($| )/.test(el.className)) {
-            _results.push(dropzones.push(el));
-          } else {
-            _results.push(void 0);
-          }
-        }
-        return _results;
-      };
-      checkElements(document.getElementsByTagName("div"));
-      checkElements(document.getElementsByTagName("form"));
-    }
-    _results = [];
-    for (_i = 0, _len = dropzones.length; _i < _len; _i++) {
-      dropzone = dropzones[_i];
-      _results.push(new Dropzone(dropzone));
-    }
-    return _results;
-  });
+  contentLoaded(window, Dropzone.discover);
 
 }).call(this);
 

metadata

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