Released 1.0.0-rc3

Author: killme2008

README.md

@@ -4,6 +4,11 @@ JavaScript SDK for [LeanCloud](http://leancloud.cn/).
 
 ## 使用方法请看 [官方文档](http://leancloud.cn/docs/js_guide.html)
 
+## 版本说明
+
+* 0.x.y 版本，是不兼容 React Native 运行时的老版本 SDK，相对稳定，云引擎主要依赖这个分支版本。
+* 1.0.0-x 版本，是我们最新开发的兼容 React Native 运行时的版本，处于开放测试阶段，欢迎大家尝试。我们最终将使用这个分支替代云引擎里的 `0.x.y` 版本。
+
 ## 贡献
 
 * fork 这个项目

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "leancloud-jssdk.js",
-  "version": "1.0.0-rc2",
+  "version": "1.0.0-rc3",
   "homepage": "https://github.com/leancloud/javascript-sdk",
   "authors": [
     "killme2008 <[email protected]>"

changelog.md

@@ -1,3 +1,13 @@
+# 1.0.0-rc3 日期：2015 年 10 月 27 日
+* 修复 `AV._request` 某些情况下无法正常工作的 Bug。
+* 修复某些登录 API 没有更新 currentUser 的问题
+* 修复 localStorage 没有生效的 Bug，感谢热心用户反馈。
+* AV.SearchQuery 增加 hasMore 和 reset 方法。
+
+# 0.6.4 日期：2015 年 10 月 27 日
+* 修复 localStorage 没有生效的 Bug，感谢热心用户反馈。
+* AV.SearchQuery 增加 hasMore 和 reset 方法。
+
 # 1.0.0-rc2 日期：215 年 10 月 22 日
 * 兼容 React Native 运行环境。
 * 修复 AV.Role 的兼容性问题。

dist/av-core-mini.js

@@ -359,7 +359,7 @@ if (global.localStorage) {
     if (localStorage.getItem(testKey) != testKey) {
       throw new Error();
     }
-    localStorage.remove(testKey);
+    localStorage.removeItem(testKey);
   } catch (e) {
     localStorage = require('localstorage-memory');
   }
@@ -436,11 +436,9 @@ module.exports = function upload(file, AV, saveOptions) {
 
     var xhr = new AV.XMLHttpRequest();
 
-    xhr.upload.addEventListener('progress', function(e) {
-      if (e.lengthComputable) {
-        saveOptions.onProgress && saveOptions.onProgress(e);
-      }
-    }, false);
+    if (xhr.upload) {
+      xhr.upload.onprogress = saveOptions.onProgress;
+    }
 
     xhr.onreadystatechange = function() {
       if (xhr.readyState === 4) {
@@ -4184,7 +4182,7 @@ _.extend(Promise, /** @lends AV.Promise */ {
    */
   as: function() {
     var promise = new Promise();
-    if (_.isFunction(arguments[0])) {
+    if (arguments[0] && _.isFunction(arguments[0].then)) {
       arguments[0].then(function(data) {
         promise.resolve.call(promise, data);
       }, function(err) {
@@ -5860,12 +5858,14 @@ module.exports = function(AV) {
       if (acl === undefined) {
         var defaultAcl = new AV.ACL();
         defaultAcl.setPublicReadAccess(true);
-        acl = defaultAcl;
-      }
-      if (!(acl instanceof AV.ACL)) {
+        if(!this.getACL()) {
+          this.setACL(defaultAcl);
+        }
+      } else if (!(acl instanceof AV.ACL)) {
         throw new TypeError('acl must be an instance of AV.ACL');
+      } else {
+        this.setACL(acl);
       }
-      this.setACL(acl);
     },
 
     /**
@@ -6157,6 +6157,26 @@ module.exports = function(AV) {
        return json;
     },
 
+    /**
+     * Returns true when there are more documents can be retrieved by this
+     * query instance, you can call find function to get more results.
+     * @see AV.SearchQuery#find
+     * @return {Boolean}
+     */
+    hasMore: function() {
+      return !this._hitEnd;
+    },
+
+    /**
+     * Reset current query instance state(such as sid, hits etc) except params
+     * for a new searching. After resetting, hasMore() will return true.
+     */
+    reset: function() {
+      this._hitEnd = false;
+      this._sid = null;
+      this._hits = 0;
+    },
+
     /**
      * Retrieves a list of AVObjects that satisfy this query.
      * Either options.success or options.error is called when the find
@@ -6177,6 +6197,9 @@ module.exports = function(AV) {
         if(response.sid) {
           self._oldSid = self._sid;
           self._sid = response.sid;
+        } else {
+          self._sid = null;
+          self._hitEnd = true;
         }
         self._hits = response.hits || 0;
 
@@ -6727,17 +6750,12 @@ module.exports = function(AV) {
         var authData = this.get('authData') || {};
         authData[authType] = options.authData;
         this.set('authData', authData);
-
-        // Overridden so that the user can be made the current user.
-        var newOptions = _.clone(options) || {};
-        newOptions.success = function(model) {
-          model._handleSaveResult(true).then(function() {
-            if (options.success) {
-              options.success.apply(this, arguments);
-            }
-          });
-        };
-        return this.save({'authData': authData}, newOptions);
+        return this.save({'authData': authData}, filterOutCallbacks(options))
+          .then(function(model) {
+            return model._handleSaveResult(true).then(function() {
+              return model;
+            });
+          })._thenRunCallbacks(options);
       } else {
         var self = this;
         var promise = new AV.Promise();
@@ -6871,7 +6889,7 @@ module.exports = function(AV) {
         return AV.Promise.error(error);
       }
 
-      return this.save(attrs).then(function(model) {
+      return this.save(attrs, filterOutCallbacks(options)).then(function(model) {
         return model._handleSaveResult(true).then(function() {
           return model;
         });
@@ -6925,21 +6943,17 @@ module.exports = function(AV) {
         return AV.Promise.error(error);
       }
 
-      // Overridden so that the user can be made the current user.
-      var newOptions = _.clone(options);
+      var newOptions = filterOutCallbacks(options);
       newOptions._makeRequest = function(route, className, id, method, json) {
         return AV._request('usersByMobilePhone', null, null, "POST", json);
       };
-      newOptions.success = function(model) {
-        model._handleSaveResult(true).then(function() {
-          delete model.attributes.smsCode;
-          delete model._serverData.smsCode;
-          if (options.success) {
-            options.success.apply(this, arguments);
-          }
+      return this.save(attrs, newOptions).then(function(model) {
+        delete model.attributes.smsCode;
+        delete model._serverData.smsCode;
+        return model._handleSaveResult(true).then(function() {
+          return model;
         });
-      };
-      return this.save(attrs, newOptions);
+      })._thenRunCallbacks(options);
     },
 
     /**
@@ -6985,15 +6999,13 @@ module.exports = function(AV) {
       }
       options = options || {};
 
-      var newOptions = _.clone(options);
-      newOptions.success = function(model) {
-        model._handleSaveResult(false).then(function() {
-          if (options.success) {
-            options.success.apply(this, arguments);
-          }
-        });
-      };
-      return AV.Object.prototype.save.call(this, attrs, newOptions);
+      return AV.Object.prototype.save
+        .call(this, attrs, filterOutCallbacks(options))
+        .then(function(model) {
+          return model._handleSaveResult(false).then(function() {
+            return model;
+          });
+        })._thenRunCallbacks(options);
     },
 
     /**
@@ -7066,15 +7078,12 @@ module.exports = function(AV) {
      * @see AV.Object#fetch
      */
     fetch: function(options) {
-      var newOptions = options ? _.clone(options) : {};
-      newOptions.success = function(model) {
-        model._handleSaveResult(false).then(function() {
-          if (options && options.success) {
-            options.success.apply(this, arguments);
-          }
-        });
-      };
-      return AV.Object.prototype.fetch.call(this, newOptions);
+      return AV.Object.prototype.fetch.call(this, filterOutCallbacks(options))
+        .then(function(model) {
+          return model._handleSaveResult(false).then(function() {
+            return model;
+          });
+        })._thenRunCallbacks(options);
     },
 
     /**
@@ -7652,6 +7661,13 @@ module.exports = function(AV) {
   });
 };
 
+function filterOutCallbacks(options) {
+  var newOptions = _.clone(options) || {};
+  delete newOptions.success;
+  delete newOptions.error;
+  return newOptions;
+}
+
 },{"underscore":30}],25:[function(require,module,exports){
 (function (process){
 'use strict';
@@ -8071,14 +8087,14 @@ module.exports = function(AV) {
         dataObject._MasterKey = AV.masterKey;
     dataObject._ClientVersion = AV.VERSION;
     // Pass the session token on every request.
-    var currentUser = AV.User.current();
-    if (currentUser && currentUser._sessionToken) {
-      dataObject._SessionToken = currentUser._sessionToken;
-    }
-
-    return AV._getInstallationId().then(function(_InstallationId) {
+    return AV.User.currentAsync().then(function(currentUser) {
+      if (currentUser && currentUser._sessionToken) {
+        dataObject._SessionToken = currentUser._sessionToken;
+      }
+      return AV._getInstallationId();
+    }).then(function(_InstallationId) {
       dataObject._InstallationId = _InstallationId;
-    }).then(function() {
+      
       var data = JSON.stringify(dataObject);
       return AV._ajax(method, url, data).then(null, function(response) {
         // Transform the error into an instance of AV.Error by trying to parse
@@ -8335,7 +8351,7 @@ module.exports = function(AV) {
 },{"_process":28,"underscore":30}],26:[function(require,module,exports){
 'use strict';
 
-module.exports = "js1.0.0-rc2";
+module.exports = "js1.0.0-rc3";
 
 },{}],27:[function(require,module,exports){