Skip to content

Commit d967c5c

Browse files
committed
Revert "Set mergeStrats to data"
This reverts commit 720c24c.
1 parent 9cd7007 commit d967c5c

File tree

2 files changed

+2
-28
lines changed

2 files changed

+2
-28
lines changed

src/vuefire.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,9 @@ function install (_Vue) {
250250
Vue = _Vue
251251
Vue.mixin(VueFireMixin)
252252

253-
// use data-like merge strategy
253+
// use object-based merge strategy
254254
var mergeStrats = Vue.config.optionMergeStrategies
255-
mergeStrats.firebase = mergeStrats.data
255+
mergeStrats.firebase = mergeStrats.methods
256256

257257
// extend instance methods
258258
Vue.prototype.$bindAsObject = function (key, source, cancelCallback, readyCallback) {

tests/vuefire.spec.js

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,30 +1012,4 @@ describe('VueFire', function () {
10121012
})
10131013
})
10141014
})
1015-
1016-
describe('mixins', function () {
1017-
var mixinFn
1018-
beforeEach(function () {
1019-
mixinFn = {
1020-
firebase: function () {
1021-
return {
1022-
items: firebaseRef.child('items')
1023-
}
1024-
}
1025-
}
1026-
})
1027-
1028-
it('func/func', function () {
1029-
var vm = new Vue({
1030-
firebase: function () {
1031-
return {
1032-
item: firebaseRef.child('first')
1033-
}
1034-
},
1035-
mixins: [mixinFn]
1036-
}).$mount()
1037-
expect(vm.items).to.not.be.undefined
1038-
expect(vm.item).to.not.be.undefined
1039-
})
1040-
})
10411015
})

0 commit comments

Comments
 (0)