dropzonejs-rails 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzNjNTNmODFmNmVjOTJkNzNlMTVlY2E5YzhlMTJhMDdlNTE1ZGEwNQ==
+    YmRkMWIyNWYxMDJmZDQwYmMzZmE5ZjUzZTYwZjZhYTZkMDU1YmE0OQ==
   data.tar.gz: !binary |-
-    NTIyM2U3YjFiZTg1NDlkZTY3OWIyZmJkMWNlZTIyOTYxNjQ5M2RjMg==
+    NGU5NzM5MjUzZmFjODc1NTI2MDIyNzU1ZTk0ZjRiNWYwNWRhYWE3MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWM3NmI5YjJlNTdkZjMyZDZhMmZlNmNlNzdkMWViZjMwOTgxNThhZDMyYmMw
-    MmVjZWUzZDg1MWJjYjBmYmE2OTFhODM5MGVmY2RlY2JmNmU2MjdjNWM4Nzdi
-    NWU5Yzc2OTlkNGMyZDU4YjNmYWRkY2I4MTcyODM3MWI3ZjNhMDk=
+    NTA3OTAyNTc2NGVkMjk5NzNlYzNhYmRiZGRjZDhjNWIxYWZiNjRkMzA5ZTVj
+    NzMxZTlhOTQzOTZkM2NhY2Y0NjljNDcxNTAwNzExMWQ1MTFjZDZlMzc2ZGI5
+    MzgzMzUyZWMyZDg3MDFmYzIzNjVmM2E5OTAwMDZkZDY2ZDBiMjY=
   data.tar.gz: !binary |-
-    NjI2MDk3MjFkYWMwNTg3ODgzZTkwYzBmNWJjZWZkNDBkODYxMTE0OTM5ODk2
-    MzI5MmQ5MGQxNGNkODM1ZDkwMDFlYjdlMzlmNDQ2YjY5MzY0ZTYwNDQwZmRl
-    NTk2MzcyY2RkZjA4YjRhMjZhOGJmODhhYmM0OTQ2MDZiNTA4Mjc=
+    ZDUyNzFmZTg3ZjQ3MTA2MGQ4MzQ0N2Y2YmFlOTdlMDgwODhlZjdhMTgwYTVk
+    MmE5YmI4MTJhN2FhMmUwN2FjMmM1ZGY2MjBhNWY0OTAyNjJkZWY5MjM0Yzcx
+    OTY2ZjY5YzBkNzMyMTg4NWE5OWFiN2ZkNTQ5NjFkZmY1ODEwZTg=

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

data/lib/dropzonejs-rails/version.rb

@@ -1,4 +1,4 @@
 module DropzonejsRails
-  VERSION = '0.3.0'
-  DROPZONE_VERSION = '3.0.1'
+  VERSION = '0.3.1'
+  DROPZONE_VERSION = '3.1.0'
 end

data/vendor/assets/javascripts/dropzone.js

@@ -472,6 +472,33 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
         }
         return this.element.appendChild(this.getFallbackForm());
       },
+      resize: function(file) {
+        var info, srcRatio, trgRatio;
+
+        info = {
+          srcX: 0,
+          srcY: 0,
+          srcWidth: file.width,
+          srcHeight: file.height
+        };
+        srcRatio = file.width / file.height;
+        trgRatio = this.options.thumbnailWidth / this.options.thumbnailHeight;
+        if (file.height < this.options.thumbnailHeight || file.width < this.options.thumbnailWidth) {
+          info.trgHeight = info.srcHeight;
+          info.trgWidth = info.srcWidth;
+        } else {
+          if (srcRatio > trgRatio) {
+            info.srcHeight = file.height;
+            info.srcWidth = info.srcHeight * trgRatio;
+          } else {
+            info.srcWidth = file.width;
+            info.srcHeight = info.srcWidth / trgRatio;
+          }
+        }
+        info.srcX = (file.width - info.srcWidth) / 2;
+        info.srcY = (file.height - info.srcHeight) / 2;
+        return info;
+      },
       /*
       Those functions register themselves to the events on init and handle all
       the user interface specific stuff. Overwriting them won't break the upload
@@ -670,6 +697,20 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
         eventName = _ref1[_i];
         this.on(eventName, this.options[eventName]);
       }
+      this.on("uploadprogress", function(file) {
+        var totalBytes, totalBytesSent, totalUploadProgress, _j, _len1, _ref2;
+
+        totalBytesSent = 0;
+        totalBytes = 0;
+        _ref2 = _this.files;
+        for (_j = 0, _len1 = _ref2.length; _j < _len1; _j++) {
+          file = _ref2[_j];
+          totalBytesSent += file.upload.bytesSent;
+          totalBytes += file.upload.total;
+        }
+        totalUploadProgress = 100 * totalBytesSent / totalBytes;
+        return _this.emit("totaluploadprogress", totalUploadProgress, totalBytes, totalBytesSent);
+      });
       noPropagation = function(e) {
         e.stopPropagation();
         if (e.preventDefault) {
@@ -886,6 +927,11 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
     Dropzone.prototype.addFile = function(file) {
       var _this = this;
 
+      file.upload = {
+        progress: 0,
+        total: file.size,
+        bytesSent: 0
+      };
       this.files.push(file);
       this.emit("addedfile", file);
       if (this.options.createImageThumbnails && file.type.match(/image.*/) && file.size <= this.options.maxThumbnailFilesize * 1024 * 1024) {
@@ -938,39 +984,22 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
 
         img = new Image;
         img.onload = function() {
-          var canvas, ctx, srcHeight, srcRatio, srcWidth, srcX, srcY, thumbnail, trgHeight, trgRatio, trgWidth, trgX, trgY;
+          var canvas, ctx, resizeInfo, thumbnail, _ref, _ref1, _ref2, _ref3, _ref4, _ref5;
 
+          file.width = img.width;
+          file.height = img.height;
+          resizeInfo = _this.options.resize.call(_this, file);
+          if ((_ref = resizeInfo.trgWidth) == null) {
+            resizeInfo.trgWidth = _this.options.thumbnailWidth;
+          }
+          if ((_ref1 = resizeInfo.trgHeight) == null) {
+            resizeInfo.trgHeight = _this.options.thumbnailHeight;
+          }
           canvas = document.createElement("canvas");
           ctx = canvas.getContext("2d");
-          srcX = 0;
-          srcY = 0;
-          srcWidth = img.width;
-          srcHeight = img.height;
-          canvas.width = _this.options.thumbnailWidth;
-          canvas.height = _this.options.thumbnailHeight;
-          trgX = 0;
-          trgY = 0;
-          trgWidth = canvas.width;
-          trgHeight = canvas.height;
-          srcRatio = img.width / img.height;
-          trgRatio = canvas.width / canvas.height;
-          if (img.height < canvas.height || img.width < canvas.width) {
-            trgHeight = srcHeight;
-            trgWidth = srcWidth;
-          } else {
-            if (srcRatio > trgRatio) {
-              srcHeight = img.height;
-              srcWidth = srcHeight * trgRatio;
-            } else {
-              srcWidth = img.width;
-              srcHeight = srcWidth / trgRatio;
-            }
-          }
-          srcX = (img.width - srcWidth) / 2;
-          srcY = (img.height - srcHeight) / 2;
-          trgY = (canvas.height - trgHeight) / 2;
-          trgX = (canvas.width - trgWidth) / 2;
-          ctx.drawImage(img, srcX, srcY, srcWidth, srcHeight, trgX, trgY, trgWidth, trgHeight);
+          canvas.width = resizeInfo.trgWidth;
+          canvas.height = resizeInfo.trgHeight;
+          ctx.drawImage(img, (_ref2 = resizeInfo.srcX) != null ? _ref2 : 0, (_ref3 = resizeInfo.srcY) != null ? _ref3 : 0, resizeInfo.srcWidth, resizeInfo.srcHeight, (_ref4 = resizeInfo.trgX) != null ? _ref4 : 0, (_ref5 = resizeInfo.trgY) != null ? _ref5 : 0, resizeInfo.trgWidth, resizeInfo.trgHeight);
           thumbnail = canvas.toDataURL("image/png");
           return _this.emit("thumbnail", file, thumbnail);
         };
@@ -1026,7 +1055,6 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
         if (!((200 <= (_ref = xhr.status) && _ref < 300))) {
           return handleError();
         } else {
-          _this.emit("uploadprogress", file, 100, file.size);
           return _this.finished(file, response, e);
         }
       };
@@ -1035,7 +1063,15 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       };
       progressObj = (_ref = xhr.upload) != null ? _ref : xhr;
       progressObj.onprogress = function(e) {
-        return _this.emit("uploadprogress", file, Math.max(0, Math.min(100, 100 * e.loaded / e.total)), e.loaded);
+        var progress;
+
+        file.upload = {
+          progress: progress,
+          total: e.total,
+          bytesSent: e.loaded
+        };
+        progress = 100 * e.loaded / e.total;
+        return _this.emit("uploadprogress", file, progress, e.loaded);
       };
       xhr.setRequestHeader("Accept", "application/json");
       xhr.setRequestHeader("Cache-Control", "no-cache");
@@ -1086,7 +1122,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
 
   })(Em);
 
-  Dropzone.version = "3.0.1";
+  Dropzone.version = "3.1.0";
 
   Dropzone.options = {};
 

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

@@ -215,11 +215,6 @@
   box-shadow: 1px 1px 4px rgba(0,0,0,0.16);
   font-size: 14px;
 }
-.dropzone .dz-preview .dz-details img,
-.dropzone-previews .dz-preview .dz-details img {
-  width: 100px;
-  height: 100px;
-}
 .dropzone .dz-preview.dz-image-preview:hover .dz-details img,
 .dropzone-previews .dz-preview.dz-image-preview:hover .dz-details img {
   display: block;

metadata

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