dropzonejs-rails 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDRiZTA1MTFjM2EwNzliZjliZTQzODVkNTMzYWQwOGNkNjc4YzYwYQ==
+    NzkxOTExMWY3OTFlYWY2NmNmODg0ZDYyYTY0NWM0Zjc4YTQ5YWQ1NQ==
   data.tar.gz: !binary |-
-    OWU3MmI2ZDVlOGViYWMxYzE4NzE3YjM0ZDY5MTkwMjY5NmRiODEyMQ==
+    YjhjN2Q5MTdhOGNhMjNkN2EzYjkzMmQxZmRiOGQzNzI4ODM3MTM2MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGIzN2U3YmVjN2M5N2ViNWZkMzczN2Q2NDhmMmQzODZiODVkOWM5MmE1NWE4
-    Mjc1M2E5MWJlZWM0MDhkMjAxYWIzZmJiZjBlODc2MzhhMWExNjc0YmViNzY2
-    NWNhMjQxNDhjZWIyNGVjNGI4MmVmZGNkOTY4OTg4OTY2ODU1NmU=
+    YTQ4YTEyODM2YjNlYTE0ZmJjYTUzMzAxNjdjMjU2NzZlODYxYzE3MGEzYjIz
+    YTViZDM5NmVjMzY2MGUxNDNhOGZhNGE0MWY5M2ZjZjBlNjE3NDM3NjEyYjIw
+    MDQ1NjNjMDY4MWYwOWUxNTJmYjc1ZTg3ZDNhYjQ5M2VkNDJhMTI=
   data.tar.gz: !binary |-
-    M2VhYTlhYWExM2ViODc4OGUyNjJjY2JmN2Q2ZDk2MTQyODA1MTk2NmEyODgx
-    NjAyYWRmNWE3ZjY0NTMyZjI4NWM5ZGE5YmMzYjc2NTRmMmVlNTJlNjdmZjE5
-    NTE5NzE2NjdiZWZlNzIyZDU0YmQzOGMxNTlhYTg5ZGFmZmY1MmQ=
+    OTY3MzI1YjAxZWZmMzRmY2MwNmNhZmYxY2JiOWNhMjU3NzViZTdlYmExOWU1
+    ODUxNjEyYjEwNzYwZWY1YmNhMzY1OGY3ZTEwYzExY2JjYzgwNWU5YjhjMzQ4
+    MWQ4OGU0NDcxNDRiYTY4OGQwZjA4ODI4M2RlN2Q3YjMwODQ4YzY=

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 v2.0.15**.
+The latest version of this gem bundles **Dropzone v2.0.16**.
 
 ## Installation and usage
 

data/lib/dropzonejs-rails/version.rb

@@ -1,4 +1,4 @@
 module DropzonejsRails
-  VERSION = '0.2.0'
-  DROPZONE_VERSION = '2.0.15'
+  VERSION = '0.2.1'
+  DROPZONE_VERSION = '2.0.16'
 end

data/vendor/assets/javascripts/dropzone.js

@@ -432,13 +432,19 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       thumbnailHeight: 100,
       params: {},
       clickable: true,
+      acceptedMimeTypes: null,
       acceptParameter: null,
       enqueueForUpload: true,
       previewsContainer: null,
       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.",
+      dictInvalidFileType: "You can't upload files of this type.",
+      dictResponseError: "Server responded with {{statusCode}} code.",
       accept: function(file, done) {
+        if (!Dropzone.isValidMimeType(file.type, this.options.acceptedMimeTypes)) {
+          return done(this.options.dictInvalidFileType);
+        }
         return done();
       },
       init: function() {
@@ -502,32 +508,33 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
         return this.element.classList.remove("started");
       },
       addedfile: function(file) {
-        file.previewTemplate = Dropzone.createElement(this.options.previewTemplate);
-        this.previewsContainer.appendChild(file.previewTemplate);
-        file.previewTemplate.querySelector(".filename span").textContent = file.name;
-        return file.previewTemplate.querySelector(".details").appendChild(Dropzone.createElement("<div class=\"size\">" + (this.filesize(file.size)) + "</div>"));
+        file.previewElement = Dropzone.createElement(this.options.previewTemplate);
+        file.previewTemplate = file.previewElement;
+        this.previewsContainer.appendChild(file.previewElement);
+        file.previewElement.querySelector(".filename span").textContent = file.name;
+        return file.previewElement.querySelector(".details").appendChild(Dropzone.createElement("<div class=\"size\">" + (this.filesize(file.size)) + "</div>"));
       },
       removedfile: function(file) {
-        return file.previewTemplate.parentNode.removeChild(file.previewTemplate);
+        return file.previewElement.parentNode.removeChild(file.previewElement);
       },
       thumbnail: function(file, dataUrl) {
-        file.previewTemplate.classList.remove("file-preview");
-        file.previewTemplate.classList.add("image-preview");
-        return file.previewTemplate.querySelector(".details").appendChild(Dropzone.createElement("<img alt=\"" + file.name + "\" src=\"" + dataUrl + "\"/>"));
+        file.previewElement.classList.remove("file-preview");
+        file.previewElement.classList.add("image-preview");
+        return file.previewElement.querySelector(".details").appendChild(Dropzone.createElement("<img alt=\"" + file.name + "\" src=\"" + dataUrl + "\"/>"));
       },
       error: function(file, message) {
-        file.previewTemplate.classList.add("error");
-        return file.previewTemplate.querySelector(".error-message span").textContent = message;
+        file.previewElement.classList.add("error");
+        return file.previewElement.querySelector(".error-message span").textContent = message;
       },
       processingfile: function(file) {
-        return file.previewTemplate.classList.add("processing");
+        return file.previewElement.classList.add("processing");
       },
       uploadprogress: function(file, progress, bytesSent) {
-        return file.previewTemplate.querySelector(".progress .upload").style.width = "" + progress + "%";
+        return file.previewElement.querySelector(".progress .upload").style.width = "" + progress + "%";
       },
       sending: noop,
       success: function(file) {
-        return file.previewTemplate.classList.add("success");
+        return file.previewElement.classList.add("success");
       },
       complete: noop,
       previewTemplate: "<div class=\"preview file-preview\">\n  <div class=\"details\">\n   <div class=\"filename\"><span></span></div>\n  </div>\n  <div class=\"progress\"><span class=\"upload\"></span></div>\n  <div class=\"success-mark\"><span>✔</span></div>\n  <div class=\"error-mark\"><span>✘</span></div>\n  <div class=\"error-message\"><span></span></div>\n</div>"
@@ -571,6 +578,9 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       if (!this.options.url) {
         throw new Error("No URL provided.");
       }
+      if (this.options.acceptParameter && this.options.acceptedMimeTypes) {
+        throw new Error("You can't provide both 'acceptParameter' and 'acceptedMimeTypes'. 'acceptParameter' is deprecated.");
+      }
       this.options.method = this.options.method.toUpperCase();
       if (this.options.forceFallback || !Dropzone.isBrowserSupported()) {
         return this.options.fallback.call(this);
@@ -623,6 +633,9 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
           _this.hiddenFileInput = document.createElement("input");
           _this.hiddenFileInput.setAttribute("type", "file");
           _this.hiddenFileInput.setAttribute("multiple", "multiple");
+          if (_this.options.acceptedMimeTypes != null) {
+            _this.hiddenFileInput.setAttribute("accept", _this.options.acceptedMimeTypes);
+          }
           if (_this.options.acceptParameter != null) {
             _this.hiddenFileInput.setAttribute("accept", _this.options.acceptParameter);
           }
@@ -988,7 +1001,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       xhr = new XMLHttpRequest();
       xhr.open(this.options.method, this.options.url, true);
       handleError = function() {
-        return _this.errorProcessing(file, xhr.responseText || ("Server responded with " + xhr.status + " code."));
+        return _this.errorProcessing(file, xhr.responseText || _this.options.dictResponseError.replace("{{statusCode}}", xhr.status), xhr);
       };
       xhr.onload = function(e) {
         var response, _ref;
@@ -1048,11 +1061,11 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       return this.emit("complete", file);
     };
 
-    Dropzone.prototype.errorProcessing = function(file, message) {
+    Dropzone.prototype.errorProcessing = function(file, message, xhr) {
       this.filesProcessing = without(this.filesProcessing, file);
       file.processing = false;
       this.processQueue();
-      this.emit("error", file, message);
+      this.emit("error", file, message, xhr);
       return this.emit("complete", file);
     };
 
@@ -1060,7 +1073,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
 
   })(Em);
 
-  Dropzone.version = "2.0.15";
+  Dropzone.version = "2.0.16";
 
   Dropzone.options = {};
 
@@ -1188,6 +1201,30 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
     return false;
   };
 
+  Dropzone.isValidMimeType = function(mimeType, acceptedMimeTypes) {
+    var baseMimeType, validMimeType, _i, _len;
+
+    if (!acceptedMimeTypes) {
+      return true;
+    }
+    acceptedMimeTypes = acceptedMimeTypes.split(",");
+    baseMimeType = mimeType.replace(/\/.*$/, "");
+    for (_i = 0, _len = acceptedMimeTypes.length; _i < _len; _i++) {
+      validMimeType = acceptedMimeTypes[_i];
+      validMimeType = validMimeType.trim();
+      if (/\/\*$/.test(validMimeType)) {
+        if (baseMimeType === validMimeType.replace(/\/.*$/, "")) {
+          return true;
+        }
+      } else {
+        if (mimeType === validMimeType) {
+          return true;
+        }
+      }
+    }
+    return false;
+  };
+
   if (typeof jQuery !== "undefined" && jQuery !== null) {
     jQuery.fn.dropzone = function(options) {
       return this.each(function() {

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

@@ -171,7 +171,7 @@
   -o-transition: opacity 0.3s ease-in-out;
   -ms-transition: opacity 0.3s ease-in-out;
   transition: opacity 0.3s ease-in-out;
-  background-image: image-url("dropzone/spritemap.png");
+  background-image: image-path("dropzone/spritemap.png");
   background-repeat: no-repeat;
   background-position: 0 0;
   position: absolute;
@@ -184,7 +184,7 @@
 }
 @media all and (-webkit-min-device-pixel-ratio: 1.5) {
   .dropzone .default.message {
-    background-image: image-url("dropzone/spritemap@2x.png");
+    background-image: image-path("dropzone/spritemap@2x.png");
     -webkit-background-size: 428px 406px;
     -moz-background-size: 428px 406px;
     background-size: 428px 406px;
@@ -258,7 +258,7 @@
   -o-transition: opacity 0.4s ease-in-out;
   -ms-transition: opacity 0.4s ease-in-out;
   transition: opacity 0.4s ease-in-out;
-  background-image: image-url("dropzone/spritemap.png");
+  background-image: image-path("dropzone/spritemap.png");
   background-repeat: no-repeat;
 }
 @media all and (-webkit-min-device-pixel-ratio: 1.5) {
@@ -266,7 +266,7 @@
   .dropzone-previews .preview .error-mark,
   .dropzone .preview .success-mark,
   .dropzone-previews .preview .success-mark {
-    background-image: image-url("dropzone/spritemap@2x.png");
+    background-image: image-path("dropzone/spritemap@2x.png");
     -webkit-background-size: 428px 406px;
     -moz-background-size: 428px 406px;
     background-size: 428px 406px;
@@ -305,14 +305,14 @@
   left: 0;
   width: 0%;
   height: 100%;
-  background-image: image-url("dropzone/spritemap.png");
+  background-image: image-path("dropzone/spritemap.png");
   background-repeat: repeat-x;
   background-position: 0px -400px;
 }
 @media all and (-webkit-min-device-pixel-ratio: 1.5) {
   .dropzone .preview .progress .upload,
   .dropzone-previews .preview .progress .upload {
-    background-image: image-url("dropzone/spritemap@2x.png");
+    background-image: image-path("dropzone/spritemap@2x.png");
     -webkit-background-size: 428px 406px;
     -moz-background-size: 428px 406px;
     background-size: 428px 406px;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dropzonejs-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - José Nahuel Cuesta Luengo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails