Merge remote-tracking branch 'origin/master'

Akryum · Akryum · commit 98ad7836a58a · 2017-03-27T02:22:01.000+02:00
diff --git a/src/smart-apollo.js b/src/smart-apollo.js
@@ -228,8 +228,8 @@ export class SmartQuery extends SmartApollo {
       this.vm[this.options.loadingKey] += value
     }
 
-    if (this.options.loadingChangeCb) {
-      this.options.loadingChangeCb.call(this.vm, value === 1, value)
+    if (this.options.watchLoading) {
+      this.options.watchLoading.call(this.vm, value === 1, value)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -228,8 +228,8 @@ export class SmartQuery extends SmartApollo {`
`228`	`228`	`this.vm[this.options.loadingKey] += value`
`229`	`229`	`}`
`230`	`230`
`231`		`- if (this.options.loadingChangeCb) {`
`232`		`- this.options.loadingChangeCb.call(this.vm, value === 1, value)`
	`231`	`+ if (this.options.watchLoading) {`
	`232`	`+ this.options.watchLoading.call(this.vm, value === 1, value)`
`233`	`233`	`}`
`234`	`234`	`}`
`235`	`235`