Fix #97

Author: Guillaume Chau

dist/vue-apollo.esm.js

@@ -2829,11 +2829,18 @@ var SmartQuery = function (_SmartApollo) {
   }, {
     key: 'fetchMore',
     value: function fetchMore() {
+      var _this4 = this;
+
       if (this.observer) {
         var _observer;
 
         this.maySetLoading(true);
-        return (_observer = this.observer).fetchMore.apply(_observer, arguments);
+        return (_observer = this.observer).fetchMore.apply(_observer, arguments).then(function (result) {
+          if (!result.loading) {
+            _this4.loadingDone();
+          }
+          return result;
+        });
       }
     }
   }, {
@@ -2850,14 +2857,15 @@ var SmartQuery = function (_SmartApollo) {
   }, {
     key: 'refetch',
     value: function refetch(variables) {
-      var _this4 = this;
+      var _this5 = this;
 
       variables && (this.options.variables = variables);
       if (this.observer) {
         var result = this.observer.refetch(variables).then(function (result) {
           if (!result.loading) {
-            _this4.loadingDone();
+            _this5.loadingDone();
           }
+          return result;
         });
         this.maySetLoading();
         return result;
@@ -2911,15 +2919,15 @@ var SmartSubscription = function (_SmartApollo2) {
   function SmartSubscription() {
     var _ref;
 
-    var _temp, _this5, _ret;
+    var _temp, _this6, _ret;
 
     classCallCheck(this, SmartSubscription);
 
     for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
 
-    return _ret = (_temp = (_this5 = possibleConstructorReturn(this, (_ref = SmartSubscription.__proto__ || Object.getPrototypeOf(SmartSubscription)).call.apply(_ref, [this].concat(args))), _this5), _this5.type = 'subscription', _this5.vueApolloSpecialKeys = ['variables', 'result', 'error', 'throttle', 'debounce', 'linkedQuery'], _temp), possibleConstructorReturn(_this5, _ret);
+    return _ret = (_temp = (_this6 = possibleConstructorReturn(this, (_ref = SmartSubscription.__proto__ || Object.getPrototypeOf(SmartSubscription)).call.apply(_ref, [this].concat(args))), _this6), _this6.type = 'subscription', _this6.vueApolloSpecialKeys = ['variables', 'result', 'error', 'throttle', 'debounce', 'linkedQuery'], _temp), possibleConstructorReturn(_this6, _ret);
   }
 
   createClass(SmartSubscription, [{

dist/vue-apollo.min.js

@@ -2835,11 +2835,18 @@ var SmartQuery = function (_SmartApollo) {
   }, {
     key: 'fetchMore',
     value: function fetchMore() {
+      var _this4 = this;
+
       if (this.observer) {
         var _observer;
 
         this.maySetLoading(true);
-        return (_observer = this.observer).fetchMore.apply(_observer, arguments);
+        return (_observer = this.observer).fetchMore.apply(_observer, arguments).then(function (result) {
+          if (!result.loading) {
+            _this4.loadingDone();
+          }
+          return result;
+        });
       }
     }
   }, {
@@ -2856,14 +2863,15 @@ var SmartQuery = function (_SmartApollo) {
   }, {
     key: 'refetch',
     value: function refetch(variables) {
-      var _this4 = this;
+      var _this5 = this;
 
       variables && (this.options.variables = variables);
       if (this.observer) {
         var result = this.observer.refetch(variables).then(function (result) {
           if (!result.loading) {
-            _this4.loadingDone();
+            _this5.loadingDone();
           }
+          return result;
         });
         this.maySetLoading();
         return result;
@@ -2917,15 +2925,15 @@ var SmartSubscription = function (_SmartApollo2) {
   function SmartSubscription() {
     var _ref;
 
-    var _temp, _this5, _ret;
+    var _temp, _this6, _ret;
 
     classCallCheck(this, SmartSubscription);
 
     for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
 
-    return _ret = (_temp = (_this5 = possibleConstructorReturn(this, (_ref = SmartSubscription.__proto__ || Object.getPrototypeOf(SmartSubscription)).call.apply(_ref, [this].concat(args))), _this5), _this5.type = 'subscription', _this5.vueApolloSpecialKeys = ['variables', 'result', 'error', 'throttle', 'debounce', 'linkedQuery'], _temp), possibleConstructorReturn(_this5, _ret);
+    return _ret = (_temp = (_this6 = possibleConstructorReturn(this, (_ref = SmartSubscription.__proto__ || Object.getPrototypeOf(SmartSubscription)).call.apply(_ref, [this].concat(args))), _this6), _this6.type = 'subscription', _this6.vueApolloSpecialKeys = ['variables', 'result', 'error', 'throttle', 'debounce', 'linkedQuery'], _temp), possibleConstructorReturn(_this6, _ret);
   }
 
   createClass(SmartSubscription, [{

dist/vue-apollo.umd.js

@@ -1,6 +1,6 @@
 {
   "name": "vue-apollo",
-  "version": "2.1.0-beta.22",
+  "version": "2.1.0-beta.23",
   "description": "Vue apollo integration",
   "main": "dist/vue-apollo.umd.js",
   "module": "dist/vue-apollo.esm.js",

package.json

@@ -253,7 +253,12 @@ export class SmartQuery extends SmartApollo {
   fetchMore (...args) {
     if (this.observer) {
       this.maySetLoading(true)
-      return this.observer.fetchMore(...args)
+      return this.observer.fetchMore(...args).then(result => {
+        if (!result.loading) {
+          this.loadingDone()
+        }
+        return result
+      })
     }
   }
 
@@ -272,6 +277,7 @@ export class SmartQuery extends SmartApollo {
         if (!result.loading) {
           this.loadingDone()
         }
+        return result
       })
       this.maySetLoading()
       return result