File tree Expand file tree Collapse file tree 2 files changed +5
-7
lines changed Expand file tree Collapse file tree 2 files changed +5
-7
lines changed Original file line number Diff line number Diff line change 11{
22 "name" : " vue-meteor-tracker" ,
3- "version" : " 1.1.1 " ,
3+ "version" : " 1.1.2 " ,
44 "description" : " Use Meteor Tracker reactivity inside Vue components" ,
55 "main" : " index.js" ,
66 "scripts" : {
Original file line number Diff line number Diff line change 1- import { Meteor } from 'meteor/meteor' ;
2- import { Tracker } from 'meteor/tracker' ;
31import omit from 'lodash.omit' ;
42
53function defaultSubscription ( ...args ) {
@@ -8,7 +6,7 @@ function defaultSubscription(...args) {
86
97export default {
108 install ( Vue , options ) {
11-
9+
1210 const vueVersion = parseInt ( Vue . version . charAt ( 0 ) ) ;
1311
1412 const { defineReactive } = Vue . util ;
@@ -21,12 +19,12 @@ export default {
2119 for ( const k in options ) {
2220 Vue . config . meteor [ k ] = options [ k ] ;
2321 }
24-
22+
2523 const merge = Vue . config . optionMergeStrategies . methods
2624 Vue . config . optionMergeStrategies . meteor = function ( toVal , fromVal , vm ) {
2725 if ( ! toVal ) return fromVal
2826 if ( ! fromVal ) return toVal
29-
27+
3028 const toData = Object . assign ( { } , omit ( toVal , [
3129 'subscribe' ,
3230 'data' ,
@@ -35,7 +33,7 @@ export default {
3533 'subscribe' ,
3634 'data' ,
3735 ] ) , fromVal . data ) ;
38-
36+
3937 return Object . assign ( {
4038 subscribe : merge ( toVal . subscribe , fromVal . subscribe ) ,
4139 } , merge ( toData , fromData ) )
You can’t perform that action at this time.
0 commit comments