fix: $query defaultOptions in provider

This commit is contained in:
Guillaume Chau
2018-05-30 14:19:53 +02:00
parent 87d4bba03e
commit 36faab0a84
+10 -2
View File
@@ -88,11 +88,19 @@ export class DollarApollo {
let finalOptions = reapply(options, this.vm)
const apollo = this.vm.$options.apollo
const defaultOptions = this.provider.defaultOptions
let $query
if (apollo && apollo.$query) {
$query = apollo.$query
}
if ((!apollo || !apollo.$query) && defaultOptions && defaultOptions.$query) {
$query = defaultOptions.$query
}
if ($query) {
// Also replaces 'undefined' values
for (const key in apollo.$query) {
for (const key in $query) {
if (typeof finalOptions[key] === 'undefined') {
finalOptions[key] = apollo.$query[key]
finalOptions[key] = $query[key]
}
}
}