Skip to content

Commit 52ad2ef

Browse files
regouyyx990803
authored andcommitted
fix warning (#39)
1 parent 230b098 commit 52ad2ef

File tree

2 files changed

+27
-13
lines changed

2 files changed

+27
-13
lines changed

src/directives/stream.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ export default {
1111
const event = binding.arg
1212
const streamName = binding.expression
1313

14+
if (!Rx.Observable.fromEvent) {
15+
warn(
16+
`No 'fromEvent' method on Observable class. ` +
17+
`v-stream directive requires Rx.Observable.fromEvent method. ` +
18+
`Try import 'rxjs/add/observable/fromEvent' for ${streamName}`,
19+
vnode.context
20+
)
21+
return
22+
}
1423
if (isSubject(handle)) {
1524
handle = { subject: handle }
1625
} else if (!handle || !isSubject(handle.subject)) {
@@ -21,14 +30,6 @@ export default {
2130
vnode.context
2231
)
2332
return
24-
} else if (!Rx.Observable.fromEvent) {
25-
warn(
26-
`No 'fromEvent' method on Observable class. ` +
27-
`v-stream directive requires Rx.Observable.fromEvent method. ` +
28-
`Try import 'rxjs/add/observable/fromEvent' for ${streamName}`,
29-
vnode.context
30-
)
31-
return
3233
}
3334

3435
const subject = handle.subject

test/test.js

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
1+
'use strict'
12
const Vue = require('vue/dist/vue.js')
23
const VueRx = require('../dist/vue-rx.js')
3-
const Rx = require('rxjs')
4+
5+
//library
6+
const Observable = require('rxjs/Observable').Observable;
7+
const Subject = require('rxjs/Subject').Subject;
8+
const Subscription = require('rxjs/Subscription').Subscription;
9+
require('rxjs/add/observable/fromEvent');
10+
11+
//user
12+
require('rxjs/add/operator/map');
13+
require('rxjs/add/operator/startWith');
14+
require('rxjs/add/operator/scan');
15+
require('rxjs/add/operator/pluck');
16+
417

518
const miniRx = {
6-
Observable: Rx.Observable,
7-
Subscription: Rx.Subscription,
8-
Subject: Rx.Subject
19+
Observable,
20+
Subscription,
21+
Subject
922
}
1023

1124
Vue.config.productionTip = false
@@ -15,7 +28,7 @@ const nextTick = Vue.nextTick
1528

1629
function mock () {
1730
let observer
18-
const observable = Rx.Observable.create(_observer => {
31+
const observable = Observable.create(_observer => {
1932
observer = _observer
2033
})
2134
return {

0 commit comments

Comments
 (0)