dropzonejs-rails 0.4.6 → 0.4.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWU2MGE3NTg5YmMxOGMxN2U0YWUwMTE3OTJmMzc5ZGQ5YmU1ZDI1MQ==
+    MWFhOTE0OTE4NWY4ZDBjYjk1ZDQ5ZDdkYzQwYzBjZjBmYjlhMjRhMA==
   data.tar.gz: !binary |-
-    NWVmNDUwNTNiZDgxOGUxOWIxMTA1OWMzZTc4MTA5ZTAzNjRhYTZkYg==
+    NjdmMjMyYWUyOWEzZjk4ZjQ2MTAzZTQwMmE4OWJkNWM0ZTMzOThiZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDY5MTY4MTYwMmU5YzE0ZDAyNDdiN2IwNjViNjM3ZjE3ODg3MmFmODMyNGI1
-    NThmMTQzMjRiNWZjMWQ4ZGMwMmFlNTE0NDI1YTQzMDhhYmY0OGU5YTI0NzY0
-    YmI1NWYyMThmZmQ1YmY5ZjVkOWE4Zjg1MTI3MDNjMzFmMjQ0MTE=
+    MzE4NDU5ODU4YjczNzVlM2EyODY2ZjFhZGZkOGJmMjkxYjk5N2U4ZGUwZmFi
+    NjM0MGJjNzE5ODVmYjJkMzU2NzFkYjEyYzA2MWU5ODFjYzc4ZmI1YTFlYzU2
+    Mzc5ZTllNzU0YTQwMTgxOGM5MzkyNjBlMjdhMzc4ZjhlZDAyNzQ=
   data.tar.gz: !binary |-
-    MjIzYzM5N2RmMGJkOWZiOWIzODg1NzYyZGUxYjM3NWViNmNhNmYxZWUzN2Uz
-    Mzk3M2JmNDk5NDVkODE5NGJmNTI0MzZmM2Y0YTY2YjZkYzJmYmYwOWU2NTE1
-    NjI5M2MyYzE2YWI4YzM4MWY0YjI4MThiMThlYTRjYWMzMDIxNGQ=
+    MTczYTk1MWQzNTgwOWI5NTY2OTI1MmQ0NTQwNTU4NDQ5MjQzNjk5NDUxYjA3
+    ODkwN2ZiZGEyZWJiYTBiYTE0YTlkMTJmNjkxMTBjM2E5OWZkYTExMDBiMGE2
+    MjJlNTk0ZTBhMzQwNjkwZTc3MjQ5ZTU5YzFiNDBmYjYxMzAyNzc=

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

data/lib/dropzonejs-rails/version.rb

@@ -1,4 +1,4 @@
 module DropzonejsRails
-  VERSION = '0.4.6'
-  DROPZONE_VERSION = '3.6.1'
+  VERSION = '0.4.7'
+  DROPZONE_VERSION = '3.6.2'
 end

data/vendor/assets/javascripts/dropzone.js

@@ -439,6 +439,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       dictCancelUpload: "Cancel upload",
       dictCancelUploadConfirmation: "Are you sure you want to cancel this upload?",
       dictRemoveFile: "Remove file",
+      dictRemoveFileConfirmation: null,
       accept: function(file, done) {
         return done();
       },
@@ -544,7 +545,13 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
                 return _this.removeFile(file);
               }
             } else {
-              return _this.removeFile(file);
+              if (_this.options.dictRemoveFileConfirmation) {
+                if (window.confirm(_this.options.dictRemoveFileConfirmation)) {
+                  return _this.removeFile(file);
+                }
+              } else {
+                return _this.removeFile(file);
+              }
             }
           });
           return file.previewElement.appendChild(file._removeLink);
@@ -733,9 +740,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
           }
           _this.hiddenFileInput = document.createElement("input");
           _this.hiddenFileInput.setAttribute("type", "file");
-          if (_this.options.uploadMultiple) {
-            _this.hiddenFileInput.setAttribute("multiple", "multiple");
-          }
+          _this.hiddenFileInput.setAttribute("multiple", "multiple");
           if (_this.options.acceptedFiles != null) {
             _this.hiddenFileInput.setAttribute("accept", _this.options.acceptedFiles);
           }
@@ -1169,12 +1174,15 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       parallelUploads = this.options.parallelUploads;
       processingLength = this.getUploadingFiles().length;
       i = processingLength;
+      if (processingLength >= parallelUploads) {
+        return;
+      }
       queuedFiles = this.getQueuedFiles();
       if (!(queuedFiles.length > 0)) {
         return;
       }
       if (this.options.uploadMultiple) {
-        return this.processFiles(queuedFiles.slice(0, parallelUploads));
+        return this.processFiles(queuedFiles.slice(0, parallelUploads - processingLength));
       } else {
         while (i < parallelUploads) {
           if (!queuedFiles.length) {
@@ -1253,7 +1261,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
     };
 
     Dropzone.prototype.uploadFiles = function(files) {
-      var file, formData, handleError, header, headers, input, inputName, inputType, key, name, 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, progressObj, response, updateProgress, value, xhr, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref, _ref1, _ref2, _ref3,
         _this = this;
       xhr = new XMLHttpRequest();
       for (_i = 0, _len = files.length; _i < _len; _i++) {
@@ -1346,9 +1354,9 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       if (this.options.headers) {
         extend(headers, this.options.headers);
       }
-      for (header in headers) {
-        name = headers[header];
-        xhr.setRequestHeader(header, name);
+      for (headerName in headers) {
+        headerValue = headers[headerName];
+        xhr.setRequestHeader(headerName, headerValue);
       }
       formData = new FormData();
       if (this.options.params) {
@@ -1421,7 +1429,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
 
   })(Em);
 
-  Dropzone.version = "3.6.1";
+  Dropzone.version = "3.6.2";
 
   Dropzone.options = {};
 
@@ -1449,9 +1457,6 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
 
   Dropzone.discover = function() {
     var checkElements, dropzone, dropzones, _i, _len, _results;
-    if (!Dropzone.autoDiscover) {
-      return;
-    }
     if (document.querySelectorAll) {
       dropzones = document.querySelectorAll(".dropzone");
     } else {
@@ -1704,14 +1709,19 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
     }
   };
 
-  contentLoaded(window, Dropzone.discover);
+  Dropzone._autoDiscoverFunction = function() {
+    if (Dropzone.autoDiscover) {
+      return Dropzone.discover();
+    }
+  };
+
+  contentLoaded(window, Dropzone._autoDiscoverFunction);
 
 }).call(this);
 
 });
 require.alias("component-emitter/index.js", "dropzone/deps/emitter/index.js");
 require.alias("component-emitter/index.js", "emitter/index.js");
-
 if (typeof exports == "object") {
   module.exports = require("dropzone");
 } else if (typeof define == "function" && define.amd) {

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

@@ -180,7 +180,7 @@
   top: 50%;
   left: 50%;
 }
-@media all and (-webkit-min-device-pixel-ratio: 1.5) {
+@media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) {
   .dropzone .dz-default.dz-message {
     background-image: image-url("dropzone/spritemap@2x.png");
     -webkit-background-size: 428px 406px;
@@ -200,14 +200,14 @@
 }
 .dropzone.dz-drag-hover .dz-message {
   opacity: 0.15;
-  filter: alpha(opacity=15);
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=15)";
+  filter: alpha(opacity=15);
 }
 .dropzone.dz-started .dz-message {
   display: block;
   opacity: 0;
-  filter: alpha(opacity=0);
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+  filter: alpha(opacity=0);
 }
 .dropzone .dz-preview,
 .dropzone-previews .dz-preview {
@@ -219,8 +219,8 @@
 .dropzone-previews .dz-preview.dz-image-preview:hover .dz-details img {
   display: block;
   opacity: 0.1;
-  filter: alpha(opacity=10);
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=10)";
+  filter: alpha(opacity=10);
 }
 .dropzone .dz-preview.dz-success .dz-success-mark,
 .dropzone-previews .dz-preview.dz-success .dz-success-mark {
@@ -244,8 +244,8 @@
 .dropzone-previews .dz-preview .dz-success-mark {
   display: block;
   opacity: 0;
-  filter: alpha(opacity=0);
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+  filter: alpha(opacity=0);
   -webkit-transition: opacity 0.4s ease-in-out;
   -moz-transition: opacity 0.4s ease-in-out;
   -o-transition: opacity 0.4s ease-in-out;
@@ -254,7 +254,7 @@
   background-image: image-url("dropzone/spritemap.png");
   background-repeat: no-repeat;
 }
-@media all and (-webkit-min-device-pixel-ratio: 1.5) {
+@media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) {
   .dropzone .dz-preview .dz-error-mark,
   .dropzone-previews .dz-preview .dz-error-mark,
   .dropzone .dz-preview .dz-success-mark,
@@ -302,7 +302,7 @@
   background-repeat: repeat-x;
   background-position: 0px -400px;
 }
-@media all and (-webkit-min-device-pixel-ratio: 1.5) {
+@media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) {
   .dropzone .dz-preview .dz-progress .dz-upload,
   .dropzone-previews .dz-preview .dz-progress .dz-upload {
     background-image: image-url("dropzone/spritemap@2x.png");
@@ -315,8 +315,8 @@
 .dropzone-previews .dz-preview.dz-success .dz-progress {
   display: block;
   opacity: 0;
-  filter: alpha(opacity=0);
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+  filter: alpha(opacity=0);
   -webkit-transition: opacity 0.4s ease-in-out;
   -moz-transition: opacity 0.4s ease-in-out;
   -o-transition: opacity 0.4s ease-in-out;
@@ -327,8 +327,8 @@
 .dropzone-previews .dz-preview .dz-error-message {
   display: block;
   opacity: 0;
-  filter: alpha(opacity=0);
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+  filter: alpha(opacity=0);
   -webkit-transition: opacity 0.3s ease-in-out;
   -moz-transition: opacity 0.3s ease-in-out;
   -o-transition: opacity 0.3s ease-in-out;
@@ -344,11 +344,11 @@
 .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%);
+  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;

metadata

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