diff --git a/dist/vuefire.js b/dist/vuefire.js index 6b81efef..449a37e9 100644 --- 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 index af13d106..614adf31 100644 --- a/dist/vuefire.min.js +++ b/dist/vuefire.min.js @@ -1 +1 @@ -!function(e,n){"object"==typeof exports&&"object"==typeof module?module.exports=n():"function"==typeof define&&define.amd?define([],n):"object"==typeof exports?exports.VueFire=n():e.VueFire=n()}(this,function(){return function(e){function n(i){if(r[i])return r[i].exports;var t=r[i]={exports:{},id:i,loaded:!1};return e[i].call(t.exports,t,t.exports,n),t.loaded=!0,t.exports}var r={};return n.m=e,n.c=r,n.p="",n(0)}([function(e,n){function r(e){return"function"==typeof e.key?e.key():e.key}function i(e){return"function"==typeof e.ref?e=e.ref():"object"==typeof e.ref&&(e=e.ref),e}function t(e){return"[object Object]"===Object.prototype.toString.call(e)}function o(e){var n=e.val(),i=t(n)?n:{".value":n};return i[".key"]=r(e),i}function s(e,n){for(var r=0;r