diff --git a/src/smart-query.js b/src/smart-query.js index b96ef5df..d676e82e 100644 --- a/src/smart-query.js +++ b/src/smart-query.js @@ -30,13 +30,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 }