Merge pull request #133 from wangxiao/master

[feature] Upload base64 support nodejs, use browserify .

Author: aisk

lib/browserify-wrapper/parse-base64-browser.js

@@ -0,0 +1,23 @@
+'use strict';
+
+var dataURItoBlob = function(dataURI, type) {
+  var byteString;
+
+  // 传入的 base64，不是 dataURL
+  if (dataURI.indexOf('base64') < 0) {
+    byteString = atob(dataURI);
+  } else if (dataURI.split(',')[0].indexOf('base64') >= 0) {
+    byteString = atob(dataURI.split(',')[1]);
+  } else {
+    byteString = unescape(dataURI.split(',')[1]);
+  }
+  // separate out the mime component
+  var mimeString = type || dataURI.split(',')[0].split(':')[1].split(';')[0];
+  var ia = new Uint8Array(byteString.length);
+  for (var i = 0; i < byteString.length; i ++) {
+      ia[i] = byteString.charCodeAt(i);
+  }
+  return new Blob([ia], {type:mimeString});
+};
+
+module.exports = dataURItoBlob;

lib/browserify-wrapper/parse-base64.js

@@ -0,0 +1,11 @@
+'use strict';
+
+var dataURLToBlob = function(base64) {
+  // 兼容 dataURL
+  if (base64.split(',')[0] && base64.split(',')[0].indexOf('base64') >= 0) {
+    base64 = base64.split(',')[1];
+  }
+  return new Buffer(base64, 'base64').toString('utf8');
+};
+
+module.exports = dataURLToBlob;

lib/browserify-wrapper/upload.js

@@ -1,5 +1,6 @@
 'use strict';
 
+//Use qiniu sdk to upload files to qiniu.
 var qiniu = require('qiniu');
 var Promise = require('../promise');
 
@@ -8,8 +9,6 @@ module.exports =function upload(file) {
     file._base64 = base64;
     return file._qiniuToken(type);
   }).then(function(response) {
-    //Use qiniu sdk to upload files to qiniu.
-    var qiniu = require('qiniu');
     file._url = response.url;
     file._bucket = response.bucket;
     file.id = response.objectId;

lib/file.js

@@ -45,30 +45,6 @@ module.exports = function(AV) {
     return chunks.join("");
   };
 
-
-  var dataURItoBlob = function(dataURI, type) {
-    // convert base64/URLEncoded data component to raw binary data held in a string
-    var byteString;
-
-    // 传入的 base64，不是 dataURL
-    if (dataURI.indexOf('base64') < 0) {
-      byteString = atob(dataURI);
-    } else if (dataURI.split(',')[0].indexOf('base64') >= 0) {
-      byteString = atob(dataURI.split(',')[1]);
-    } else {
-      byteString = unescape(dataURI.split(',')[1]);
-    }
-    // separate out the mime component
-    var mimeString = type || dataURI.split(',')[0].split(':')[1].split(';')[0];
-
-    // write the bytes of the string to a typed array
-    var ia = new Uint8Array(byteString.length);
-    for (var i = 0; i < byteString.length; i ++) {
-        ia[i] = byteString.charCodeAt(i);
-    }
-    return new Blob([ia], {type:mimeString});
-  };
-
   // A list of file extensions to mime types as found here:
   // http://stackoverflow.com/questions/58510/using-net-how-can-you-find-the-
   //     mime-type-of-a-file-based-on-the-file-signature
@@ -353,8 +329,8 @@ module.exports = function(AV) {
       this._source = AV.Promise.as(encodeBase64(data), guessedType);
       this._metaData.size = data.length;
     } else if (data && data.base64) {
-      // 也可以是 dataURL，内部已做兼容
-      var dataBase64 = dataURItoBlob(data.base64, guessedType);
+      var parseBase64 = require('./browserify-wrapper/parse-base64');
+      var dataBase64 = parseBase64(data.base64, guessedType);
       this._source = AV.Promise.as(dataBase64, guessedType);
     } else if (data && data.blob) {
       this._source = AV.Promise.as(data.blob, guessedType);

package.json

@@ -39,6 +39,7 @@
   "browser": {
     "./lib/browserify-wrapper/upload.js": "./lib/browserify-wrapper/upload-browser.js",
     "xmlhttprequest": "./lib/browserify-wrapper/xmlhttprequest-browser.js",
-    "localStorage": "./lib/browserify-wrapper/localstorage-browser.js"
+    "localStorage": "./lib/browserify-wrapper/localstorage-browser.js",
+    "./lib/browserify-wrapper/parse-base64.js": "./lib/browserify-wrapper/parse-base64-browser.js"
   }
 }