Merge branch 'base' of https://github.com/merlinsw/ui-uploader into merlinsw-base

Author: PowerKiKi

dist/uploader.js

@@ -1,7 +1,7 @@
 /*!
  * angular-ui-uploader
  * https://github.com/angular-ui/ui-uploader
- * Version: 1.1.0 - 2015-08-04T05:11:30.348Z
+ * Version: 1.1.1 - 2015-08-05T02:10:41.396Z
  * License: MIT
  */
 
@@ -70,7 +70,7 @@ function uiUploader($log) {
 
     function getHumanSize(bytes) {
         var sizes = ['n/a', 'bytes', 'KiB', 'MiB', 'GiB', 'TB', 'PB', 'EiB', 'ZiB', 'YiB'];
-        var i = +Math.floor(Math.log(bytes) / Math.log(1024));
+        var i = (bytes === 0) ? 0 : +Math.floor(Math.log(bytes) / Math.log(1024));
         return (bytes / Math.pow(1024, i)).toFixed(i ? 1 : 0) + ' ' + sizes[isNaN(bytes) ? 0 : i + 1];
     }
 

dist/uploader.min.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-uploader",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "author": "https://github.com/angular-ui/ui-uploader/graphs/contributors",
   "license": "MIT",
   "homepage": "https://github.com/angular-ui/ui-uploader",

package.json

@@ -60,7 +60,7 @@ function uiUploader($log) {
 
     function getHumanSize(bytes) {
         var sizes = ['n/a', 'bytes', 'KiB', 'MiB', 'GiB', 'TB', 'PB', 'EiB', 'ZiB', 'YiB'];
-        var i = +Math.floor(Math.log(bytes) / Math.log(1024));
+        var i = (bytes === 0) ? 0 : +Math.floor(Math.log(bytes) / Math.log(1024));
         return (bytes / Math.pow(1024, i)).toFixed(i ? 1 : 0) + ' ' + sizes[isNaN(bytes) ? 0 : i + 1];
     }