Merge pull request #231 from wangxiao/master

修正构建后的文件名

Author: leeyeh

README.md

@@ -26,8 +26,8 @@ JavaScript SDK for [LeanCloud](http://leancloud.cn/).
 ├── changelog.md
 ├── dist                               // 编译之后生成的文件将会在此目录下
 │   ├── av-es6.js                      // 合并后的完整源码（ES6 版本）
-│   ├── av-es5.js                      // 合并并编译后的完整源码（ES5 版本）
-│   ├── av-mini.js                     // 合并、压缩并编译后的源码（ES5 版本）
+│   ├── av.js                          // 合并并编译后的完整源码（ES5 版本）
+│   ├── av-min.js                      // 合并、压缩并编译后的源码（ES5 版本）
 │   ├── node                           // 目录中为生成的 nodejs 版本代码
 │   └── ...
 ├── gulpfile.js

dist/av-es6.js

@@ -9721,30 +9721,35 @@ module.exports = function(AV) {
   };
 
   /**
-   * Call this method first to set up your authentication tokens for LC.
-   * You can get your keys from the Data Browser on http://leancloud.cn .
-   * @param {Object} incloud appId, appKey, masterKey
-   */
+    * Call this method first to set up your authentication tokens for AV.
+    * You can get your app keys from the LeanCloud dashboard on http://leancloud.cn .
+    * @function AV.init
+    * @param args initialize options.
+    * @param args.appId application id
+    * @param args.appKey application key
+    * @param args.masterKey application master key
+  */
 
-  AV.init = (...options) => {
-    switch (options.length) {
+  AV.init = (...args) => {
+    switch (args.length) {
       case 1:
+        const options = args[0];
         if (typeof options === 'object') {
           if (!AV._config.isNode && options.masterKey) {
             throw new Error('AV.init(): Master Key is only used in Node.js.');
           }
-          initialize(options[0].appId, options[0].appKey, options[0].masterKey);
+          initialize(options.appId, options.appKey, options.masterKey);
         } else {
           throw new Error('AV.init(): Parameter is not correct.');
         }
       break;
       // 兼容旧版本的初始化方法
       case 2:
       case 3:
-        if (!AV._config.isNode && options.length === 3) {
+        if (!AV._config.isNode && args.length === 3) {
           throw new Error('AV.init(): Master Key is only used in Node.js.');
         }
-        initialize(...options);
+        initialize(...args);
       break;
     }
   };
@@ -9769,6 +9774,7 @@ module.exports = function(AV) {
 
   /**
    * Call this method to set production environment variable.
+   * @function AV.setProduction
    * @param {Boolean} production True is production environment,and
    *  it's true by default.
    */

dist/av-mini.js dist/av-min.jsdist/av-mini.js renamed to dist/av-min.js

@@ -2834,11 +2834,15 @@ child.__super__=parent.prototype;return child;}; /**
    * @param {String} applicationId Your AV Application ID.
    * @param {String} applicationKey Your AV Application Key
    */var initialize=function initialize(applicationId,applicationKey,masterKey){if(AV.applicationId!==undefined&&applicationId!==AV.applicationId&&applicationKey!==AV.applicationKey&&masterKey!==AV.masterKey){console.warn('AVOSCloud SDK is already initialized, please don\'t reinitialize it.');}AV.applicationId=applicationId;AV.applicationKey=applicationKey;AV.masterKey=masterKey;AV._useMasterKey=false;}; /**
-   * Call this method first to set up your authentication tokens for LC.
-   * You can get your keys from the Data Browser on http://leancloud.cn .
-   * @param {Object} incloud appId, appKey, masterKey
-   */AV.init=function(){for(var _len=arguments.length,options=Array(_len),_key=0;_key<_len;_key++){options[_key]=arguments[_key];}switch(options.length){case 1:if((typeof options==="undefined"?"undefined":_typeof(options))==='object'){if(!AV._config.isNode&&options.masterKey){throw new Error('AV.init(): Master Key is only used in Node.js.');}initialize(options[0].appId,options[0].appKey,options[0].masterKey);}else {throw new Error('AV.init(): Parameter is not correct.');}break; // 兼容旧版本的初始化方法
-case 2:case 3:if(!AV._config.isNode&&options.length===3){throw new Error('AV.init(): Master Key is only used in Node.js.');}initialize.apply(undefined,options);break;}}; // If we're running in node.js, allow using the master key.
+    * Call this method first to set up your authentication tokens for AV.
+    * You can get your app keys from the LeanCloud dashboard on http://leancloud.cn .
+    * @function AV.init
+    * @param args initialize options.
+    * @param args.appId application id
+    * @param args.appKey application key
+    * @param args.masterKey application master key
+  */AV.init=function(){switch(arguments.length){case 1:var options=arguments.length<=0?undefined:arguments[0];if((typeof options==="undefined"?"undefined":_typeof(options))==='object'){if(!AV._config.isNode&&options.masterKey){throw new Error('AV.init(): Master Key is only used in Node.js.');}initialize(options.appId,options.appKey,options.masterKey);}else {throw new Error('AV.init(): Parameter is not correct.');}break; // 兼容旧版本的初始化方法
+case 2:case 3:if(!AV._config.isNode&&arguments.length===3){throw new Error('AV.init(): Master Key is only used in Node.js.');}initialize.apply(undefined,arguments);break;}}; // If we're running in node.js, allow using the master key.
 if(AV._config.isNode){AV.Cloud=AV.Cloud||{}; /**
      * Switches the AVOSCloud SDK to using the Master key.  The Master key grants
      * priveleged access to the data in AVOSCloud and can be used to bypass ACLs and
@@ -2848,6 +2852,7 @@ if(AV._config.isNode){AV.Cloud=AV.Cloud||{}; /**
      */AV.Cloud.useMasterKey=function(){AV._useMasterKey=true;};} // 兼容老版本的初始化方法
 AV.initialize=AV.init; /**
    * Call this method to set production environment variable.
+   * @function AV.setProduction
    * @param {Boolean} production True is production environment,and
    *  it's true by default.
    */AV.setProduction=function(production){if(!AV._isNullOrUndefined(production)){ //make sure it's a number

dist/av-es5.js dist/av.jsdist/av-es5.js renamed to dist/av.js

@@ -53,7 +53,7 @@ module.exports = function _ajax(method, resourceUrl, data, success, error) {
           promise.reject(err);
         }
       } else {
-        promise.reject(JSON.parse(responseText));
+        promise.reject({ responseText: responseText });
       }
     });
   });

dist/node/browserify-wrapper/ajax.js

@@ -98,34 +98,35 @@ module.exports = function (AV) {
   };
 
   /**
-   * Call this method first to set up your authentication tokens for LC.
-   * You can get your keys from the Data Browser on http://leancloud.cn .
-   * @param {Object} incloud appId, appKey, masterKey
-   */
+    * Call this method first to set up your authentication tokens for AV.
+    * You can get your app keys from the LeanCloud dashboard on http://leancloud.cn .
+    * @function AV.init
+    * @param args initialize options.
+    * @param args.appId application id
+    * @param args.appKey application key
+    * @param args.masterKey application master key
+  */
 
   AV.init = function () {
-    for (var _len = arguments.length, options = Array(_len), _key = 0; _key < _len; _key++) {
-      options[_key] = arguments[_key];
-    }
-
-    switch (options.length) {
+    switch (arguments.length) {
       case 1:
+        var options = arguments.length <= 0 ? undefined : arguments[0];
         if ((typeof options === 'undefined' ? 'undefined' : _typeof(options)) === 'object') {
           if (!AV._config.isNode && options.masterKey) {
             throw new Error('AV.init(): Master Key is only used in Node.js.');
           }
-          initialize(options[0].appId, options[0].appKey, options[0].masterKey);
+          initialize(options.appId, options.appKey, options.masterKey);
         } else {
           throw new Error('AV.init(): Parameter is not correct.');
         }
         break;
       // 兼容旧版本的初始化方法
       case 2:
       case 3:
-        if (!AV._config.isNode && options.length === 3) {
+        if (!AV._config.isNode && arguments.length === 3) {
           throw new Error('AV.init(): Master Key is only used in Node.js.');
         }
-        initialize.apply(undefined, options);
+        initialize.apply(undefined, arguments);
         break;
     }
   };
@@ -150,6 +151,7 @@ module.exports = function (AV) {
 
   /**
    * Call this method to set production environment variable.
+   * @function AV.setProduction
    * @param {Boolean} production True is production environment,and
    *  it's true by default.
    */

dist/node/utils.js

@@ -72,19 +72,19 @@ gulp.task('babel-browser', ['browserify'], () => {
   return gulp.src('dist/av-es6.js')
     // .pipe(sourcemaps.init())
     .pipe(babel())
-    .pipe(concat('av-es5.js'))
+    .pipe(concat('av.js'))
     // .pipe(sourcemaps.write("."))
     .pipe(gulp.dest('dist'));
 });
 
 gulp.task('uglify', ['babel-browser'], () => {
   return gulp.src([
-      'dist/av-es5.js'
+      'dist/av.js'
     ])
     .pipe(uglify())
     .pipe(rename((path) => {
       // path.basename += '-mini';
-      path.basename = 'av-mini';
+      path.basename = 'av-min';
     }))
     .pipe(gulp.dest('dist'));
 
@@ -99,8 +99,8 @@ gulp.task('compress-scripts', ['uglify'], () => {
 
   return gulp.src([
       'dist/av-es6.js',
-      'dist/av-es5.js',
-      'dist/av-mini.js',
+      'dist/av.js',
+      'dist/av-min.js',
       'readme.txt'
     ])
     .pipe(tar('avos-javascript-sdk-' + version + '.tar'))

gulpfile.babel.js

@@ -1,8 +1,8 @@
 解压后的文件包括：
 
 av-es6.js       未经压缩的 JavaScript SDK（ECMAScript 6 版本）
-av-es5.js       编译后的 JavaScript SDK（ECMAScript 5 版本）
-av-mini.js      经编译压缩后生成的 JavaScript SDK （ECMAScript 5 版本）
+av.js           编译后的 JavaScript SDK（ECMAScript 5 版本）
+av-min.js      经编译压缩后生成的 JavaScript SDK （ECMAScript 5 版本）
 
 快速入门： https://leancloud.cn/start.html
 开发指南： https://leancloud.cn/docs/js_guide.html

readme.txt

@@ -9,7 +9,7 @@
 
 
 
-    <script src="../dist/av-mini.js"></script>
+    <script src="../dist/av-min.js"></script>
 
   <!--Parse Test init-->
 

test/file.html

@@ -13,7 +13,7 @@
 
 
     <script type="text/javascript">var serverURL="http://stg.paas.com/";</script>
-    <script src="../dist/av-mini.js"></script>
+    <script src="../dist/av-min.js"></script>
     <script>
         var hasBlobConstructor = window.Blob && (function () {
                             try {