Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Akryum committed Mar 27, 2017
2 parents 3839681 + 0b04372 commit 98ad783
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/smart-apollo.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down

0 comments on commit 98ad783

Please sign in to comment.