Add download files and bump version

W-prog · Oct 11, 2015 · ba2f259 · ba2f259
1 parent 849609e
commit ba2f259
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 43 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "dropzone",
   "location": "enyo/dropzone",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "Dropzone is an easy to use drag'n'drop library. It supports image previews and shows nice progress bars.",
   "homepage": "http://www.dropzonejs.com",
   "main": [

diff --git a/component.json b/component.json
@@ -1,7 +1,7 @@
 {
   "name": "dropzone",
   "repo": "enyo/dropzone",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "Handles drag and drop of files for you.",
   "scripts": [ "index.js", "dist/dropzone.js" ],
   "styles": [ "dist/basic.css" ],

diff --git a/dist/dropzone-amd-module.js b/dist/dropzone-amd-module.js
@@ -680,14 +680,9 @@
             events: {
               "click": function(evt) {
                 if ((clickableElement !== _this.element) || (evt.target === _this.element || Dropzone.elementInside(evt.target, _this.element.querySelector(".dz-message")))) {
-                  return _this.hiddenFileInput.click();
-                }
-              },
-              "touchstart": function(evt) {
-                noPropagation(evt);
-                if ((clickableElement !== _this.element) || (evt.target === _this.element || Dropzone.elementInside(evt.target, _this.element.querySelector(".dz-message")))) {
-                  return _this.hiddenFileInput.click();
+                  _this.hiddenFileInput.click();
                 }
+                return true;
               }
             }
           });
@@ -841,18 +836,21 @@
 
     Dropzone.prototype.filesize = function(size) {
       var cutoff, i, selectedSize, selectedUnit, unit, units, _i, _len;
-      units = ['TB', 'GB', 'MB', 'KB', 'b'];
-      selectedSize = selectedUnit = null;
-      for (i = _i = 0, _len = units.length; _i < _len; i = ++_i) {
-        unit = units[i];
-        cutoff = Math.pow(this.options.filesizeBase, 4 - i) / 10;
-        if (size >= cutoff) {
-          selectedSize = size / Math.pow(this.options.filesizeBase, 4 - i);
-          selectedUnit = unit;
-          break;
+      selectedSize = 0;
+      selectedUnit = "b";
+      if (size > 0) {
+        units = ['TB', 'GB', 'MB', 'KB', 'b'];
+        for (i = _i = 0, _len = units.length; _i < _len; i = ++_i) {
+          unit = units[i];
+          cutoff = Math.pow(this.options.filesizeBase, 4 - i) / 10;
+          if (size >= cutoff) {
+            selectedSize = size / Math.pow(this.options.filesizeBase, 4 - i);
+            selectedUnit = unit;
+            break;
+          }
         }
+        selectedSize = Math.round(10 * selectedSize) / 10;
       }
-      selectedSize = Math.round(10 * selectedSize) / 10;
       return "<strong>" + selectedSize + "</strong> " + selectedUnit;
     };
 
@@ -1419,7 +1417,7 @@
 
   })(Emitter);
 
-  Dropzone.version = "4.1.0";
+  Dropzone.version = "4.1.1";
 
   Dropzone.options = {};
 

diff --git a/dist/dropzone.js b/dist/dropzone.js
@@ -668,14 +668,9 @@
             events: {
               "click": function(evt) {
                 if ((clickableElement !== _this.element) || (evt.target === _this.element || Dropzone.elementInside(evt.target, _this.element.querySelector(".dz-message")))) {
-                  return _this.hiddenFileInput.click();
-                }
-              },
-              "touchstart": function(evt) {
-                noPropagation(evt);
-                if ((clickableElement !== _this.element) || (evt.target === _this.element || Dropzone.elementInside(evt.target, _this.element.querySelector(".dz-message")))) {
-                  return _this.hiddenFileInput.click();
+                  _this.hiddenFileInput.click();
                 }
+                return true;
               }
             }
           });
@@ -829,18 +824,21 @@
 
     Dropzone.prototype.filesize = function(size) {
       var cutoff, i, selectedSize, selectedUnit, unit, units, _i, _len;
-      units = ['TB', 'GB', 'MB', 'KB', 'b'];
-      selectedSize = selectedUnit = null;
-      for (i = _i = 0, _len = units.length; _i < _len; i = ++_i) {
-        unit = units[i];
-        cutoff = Math.pow(this.options.filesizeBase, 4 - i) / 10;
-        if (size >= cutoff) {
-          selectedSize = size / Math.pow(this.options.filesizeBase, 4 - i);
-          selectedUnit = unit;
-          break;
+      selectedSize = 0;
+      selectedUnit = "b";
+      if (size > 0) {
+        units = ['TB', 'GB', 'MB', 'KB', 'b'];
+        for (i = _i = 0, _len = units.length; _i < _len; i = ++_i) {
+          unit = units[i];
+          cutoff = Math.pow(this.options.filesizeBase, 4 - i) / 10;
+          if (size >= cutoff) {
+            selectedSize = size / Math.pow(this.options.filesizeBase, 4 - i);
+            selectedUnit = unit;
+            break;
+          }
         }
+        selectedSize = Math.round(10 * selectedSize) / 10;
       }
-      selectedSize = Math.round(10 * selectedSize) / 10;
       return "<strong>" + selectedSize + "</strong> " + selectedUnit;
     };
 
@@ -1407,7 +1405,7 @@
 
   })(Emitter);
 
-  Dropzone.version = "4.1.0";
+  Dropzone.version = "4.1.1";
 
   Dropzone.options = {};
 

diff --git a/dist/min/dropzone-amd-module.min.js b/dist/min/dropzone-amd-module.min.js
diff --git a/dist/min/dropzone.min.js b/dist/min/dropzone.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dropzone",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "Handles drag and drop of files for you.",
   "keywords": [
     "dragndrop",

diff --git a/src/dropzone.coffee b/src/dropzone.coffee
@@ -1252,7 +1252,7 @@ class Dropzone extends Emitter
 
 
 
-Dropzone.version = "4.1.0"
+Dropzone.version = "4.1.1"
 
 
 # This is a map of options for your different dropzones. Add configurations

diff --git a/test/test.js b/test/test.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1252,7 +1252,7 @@ class Dropzone extends Emitter



		Dropzone.version = "4.1.0"
		Dropzone.version = "4.1.1"


		# This is a map of options for your different dropzones. Add configurations
Expand Down