Updated #57 支持传入base64,感谢@lsycxyj

think2011 · Nov 24, 2015 · 74649fb · 74649fb
1 parent cf72b1e
commit 74649fb
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 14 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "lrz",
-  "version": "4.7.35",
+  "version": "4.8.35",
   "homepage": "https://github.com/think2011/localResizeIMG",
   "authors": [
     "think2011 <[email protected]>"

diff --git a/dist/lrz.all.bundle.js b/dist/lrz.all.bundle.js
diff --git a/dist/lrz.all.bundle.js.map b/dist/lrz.all.bundle.js.map
diff --git a/dist/lrz.bundle.js b/dist/lrz.bundle.js
diff --git a/dist/lrz.bundle.js.map b/dist/lrz.bundle.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lrz",
-  "version": "4.7.35",
+  "version": "4.8.35",
   "description": "前端本地客户端压缩图片，兼容IOS，Android，PC、自动按需加载文件",
   "scripts": {
     "test": "node ./node_modules/karma/bin/karma start"

diff --git a/src/lrz.js b/src/lrz.js
@@ -54,14 +54,20 @@ Lrz.prototype.init = function () {
     var that         = this,
         file         = that.file,
         fileIsString = typeof file === 'string',
+        fileIsBase64 = /^data:/.test(file),
         img          = new Image(),
         canvas       = document.createElement('canvas'),
         blob         = fileIsString ? file : URL.createObjectURL(file);
 
-    that.img      = img;
-    that.blob     = blob;
-    that.canvas   = canvas;
-    that.fileName = fileIsString ? (file.split('/').pop()) : file.name;
+    that.img    = img;
+    that.blob   = blob;
+    that.canvas = canvas;
+
+    if (fileIsString) {
+        that.fileName = fileIsBase64 ? 'base64.jpg' : (file.split('/').pop());
+    } else {
+        that.fileName = file.name;
+    }
 
     if (!document.createElement('canvas').getContext) {
         throw new Error('浏览器不支持canvas');
@@ -111,7 +117,8 @@ Lrz.prototype.init = function () {
                 });
         };
 
-        img.crossOrigin = "*";
+        // 如果传入的是base64在移动端会报错
+        !fileIsBase64 && (img.crossOrigin = "*");
 
         img.src = blob;
     });

diff --git a/test/index.html b/test/index.html
@@ -91,7 +91,7 @@ <h3>旋转方向测试</h3>
 </footer>
 
 
-<script src="../dist/lrz.bundle.js?v=69f2c4b"></script>
+<script src="../dist/lrz.bundle.js?v=a1a6749"></script>
 <script src="./index.js?v=27ce5f7"></script>
 </body>
 </html>
diff --git a/test/lrz.spec.js b/test/lrz.spec.js
diff --git a/test/server.html b/test/server.html
@@ -95,7 +95,7 @@ <h3>旋转方向测试</h3>
 </footer>
 
 
-<script src="../dist/lrz.bundle.js?v=69f2c4b"></script>
+<script src="../dist/lrz.bundle.js?v=a1a6749"></script>
 <script src="./server.js?v=c8aaa97"></script>
 </body>
 </html>