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 1
1
{
2
2
"name" : " vue-meteor-tracker" ,
3
- "version" : " 1.1.1 " ,
3
+ "version" : " 1.1.2 " ,
4
4
"description" : " Use Meteor Tracker reactivity inside Vue components" ,
5
5
"main" : " index.js" ,
6
6
"scripts" : {
Original file line number Diff line number Diff line change 1
- import { Meteor } from 'meteor/meteor' ;
2
- import { Tracker } from 'meteor/tracker' ;
3
1
import omit from 'lodash.omit' ;
4
2
5
3
function defaultSubscription ( ...args ) {
@@ -8,7 +6,7 @@ function defaultSubscription(...args) {
8
6
9
7
export default {
10
8
install ( Vue , options ) {
11
-
9
+
12
10
const vueVersion = parseInt ( Vue . version . charAt ( 0 ) ) ;
13
11
14
12
const { defineReactive } = Vue . util ;
@@ -21,12 +19,12 @@ export default {
21
19
for ( const k in options ) {
22
20
Vue . config . meteor [ k ] = options [ k ] ;
23
21
}
24
-
22
+
25
23
const merge = Vue . config . optionMergeStrategies . methods
26
24
Vue . config . optionMergeStrategies . meteor = function ( toVal , fromVal , vm ) {
27
25
if ( ! toVal ) return fromVal
28
26
if ( ! fromVal ) return toVal
29
-
27
+
30
28
const toData = Object . assign ( { } , omit ( toVal , [
31
29
'subscribe' ,
32
30
'data' ,
@@ -35,7 +33,7 @@ export default {
35
33
'subscribe' ,
36
34
'data' ,
37
35
] ) , fromVal . data ) ;
38
-
36
+
39
37
return Object . assign ( {
40
38
subscribe : merge ( toVal . subscribe , fromVal . subscribe ) ,
41
39
} , merge ( toData , fromData ) )
You can’t perform that action at this time.
0 commit comments