relax getter on loading (#237)

dohomi · Akryum · commit a9dffa3906c0 · 2018-05-21T19:39:33.000+02:00
* relax getter on loading

* fix setter as well
diff --git a/src/smart-query.js b/src/smart-query.js
@@ -45,13 +45,13 @@ export default class SmartQuery extends SmartApollo {
   }
 
   get loading () {
-    return this.vm.$data.$apolloData ? this.vm.$data.$apolloData.queries[this.key].loading : this._loading
+    return this.vm.$data.$apolloData && this.vm.$data.$apolloData.queries[this.key] ? this.vm.$data.$apolloData.queries[this.key].loading : this._loading
   }
 
   set loading (value) {
     if (this._loading !== value) {
       this._loading = value
-      if (this.vm.$data.$apolloData) {
+      if (this.vm.$data.$apolloData && this.vm.$data.$apolloData.queries[this.key]) {
         this.vm.$data.$apolloData.queries[this.key].loading = value
         this.vm.$data.$apolloData.loading += value ? 1 : -1
       }

Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,13 @@ export default class SmartQuery extends SmartApollo {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`get loading () {`
`48`		`- return this.vm.$data.$apolloData ? this.vm.$data.$apolloData.queries[this.key].loading : this._loading`
	`48`	`+ return this.vm.$data.$apolloData && this.vm.$data.$apolloData.queries[this.key] ? this.vm.$data.$apolloData.queries[this.key].loading : this._loading`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`set loading (value) {`
`52`	`52`	`if (this._loading !== value) {`
`53`	`53`	`this._loading = value`
`54`		`- if (this.vm.$data.$apolloData) {`
	`54`	`+ if (this.vm.$data.$apolloData && this.vm.$data.$apolloData.queries[this.key]) {`
`55`	`55`	`this.vm.$data.$apolloData.queries[this.key].loading = value`
`56`	`56`	`this.vm.$data.$apolloData.loading += value ? 1 : -1`
`57`	`57`	`}`