Release 1.4.2

posva · posva · commit c9c91c229952 · 2017-04-06T14:09:17.000+02:00
diff --git a/dist/vuefire.js b/dist/vuefire.js
@@ -306,9 +306,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	  Vue = _Vue
 	  Vue.mixin(VueFireMixin)
 
-	  // use data-like merge strategy
+	  // use object-based merge strategy
+	  // TODO This makes impossible to merge functions
 	  var mergeStrats = Vue.config.optionMergeStrategies
-	  mergeStrats.firebase = mergeStrats.data
+	  mergeStrats.firebase = mergeStrats.methods
 
 	  // extend instance methods
 	  Vue.prototype.$bindAsObject = function (key, source, cancelCallback, readyCallback) {
diff --git a/dist/vuefire.min.js b/dist/vuefire.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vuefire",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Firebase bindings for Vue.js",
   "main": "dist/vuefire.js",
   "files": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vuefire",`
`3`		`- "version": "1.4.1",`
	`3`	`+ "version": "1.4.2",`
`4`	`4`	`"description": "Firebase bindings for Vue.js",`
`5`	`5`	`"main": "dist/vuefire.js",`
`6`	`6`	`"files": [`