Fix loading count bugs, variables change not using cache

Author: Akryum

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-apollo",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "Vue apollo integration",
   "main": "index.js",
   "scripts": {

src/smart-apollo.js

@@ -166,7 +166,8 @@ export class SmartQuery extends SmartApollo {
       })
     } else if (this.observer) {
       // Update variables
-      this.observer.setVariables(variables)
+      // Don't use setVariables directly or it will ignore cache
+      this.observer.setOptions(this.generateApolloOptions(variables))
     } else {
       if (this.sub) {
         this.sub.unsubscribe()
@@ -184,7 +185,9 @@ export class SmartQuery extends SmartApollo {
 
     const currentResult = this.observer.currentResult()
     if (currentResult.loading) {
-      this.applyLoadingModifier(1)
+      if (!this.loading) {
+        this.applyLoadingModifier(1)
+      }
       this.loading = true
     }