Skip to content

Commit 51b1c4e

Browse files
committed
style updates
1 parent 3a9bd0a commit 51b1c4e

File tree

1 file changed

+41
-37
lines changed

1 file changed

+41
-37
lines changed

vue-rx.js

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,28 @@
1313
}
1414
return true
1515
}
16-
function isObservable(ob) {
17-
return ob && typeof ob.subscribe === 'function';
18-
}
19-
function isSubject(subject) {
20-
return subject && (typeof subject.next === 'function' || typeof subject.onNext === 'function');
16+
17+
function isObservable (ob) {
18+
return ob && typeof ob.subscribe === 'function'
19+
}
20+
21+
function isSubject (subject) {
22+
return subject && (
23+
typeof subject.next === 'function' ||
24+
typeof subject.onNext === 'function'
25+
)
2126
}
22-
function unsub(handle) {
23-
if(!handle){return}
27+
28+
function unsub (handle) {
29+
if (!handle) { return }
2430
if (handle.dispose) {
2531
handle.dispose()
2632
} else if (handle.unsubscribe) {
2733
handle.unsubscribe()
2834
}
2935
}
30-
function getDisposable(target) {
36+
37+
function getDisposable (target) {
3138
if (Rx.Subscription) { // Rx5
3239
return new Rx.Subscription(target)
3340
} else { // Rx4
@@ -102,7 +109,7 @@
102109
}
103110

104111
// Returns function which disconnects the $watch expression
105-
var disposable = getDisposable(unwatch);
112+
var disposable = getDisposable(unwatch)
106113

107114
return disposable
108115
})
@@ -123,10 +130,10 @@
123130
var doc = document.documentElement
124131
var obs$ = Rx.Observable.create(function (observer) {
125132
function listener (e) {
126-
if (!vm.$el) return;
133+
if (!vm.$el) return
127134
if (selector === null && vm.$el === e.target) return observer.next(e)
128-
var els = vm.$el.querySelectorAll(selector);
129-
var el = e.target;
135+
var els = vm.$el.querySelectorAll(selector)
136+
var el = e.target
130137
for (var i = 0, len = els.length; i < len; i++) {
131138
if (els[i] === el) return observer.next(e)
132139
}
@@ -144,51 +151,48 @@
144151
return obs$
145152
}
146153

147-
148154
Vue.directive('stream', {
149-
//Example ./example/counter_dir.html
155+
// Example ./example/counter_dir.html
150156
bind: function (el, binding, vnode) {
151157
if (!hasRx()) {
152158
return
153159
}
154-
var streamName = binding.arg;
155-
var vmStream = vnode.context[streamName] || vnode.context.$observables[streamName];
156-
var eventNames = Object.keys(binding.modifiers);
160+
var streamName = binding.arg
161+
var vmStream = vnode.context[streamName] || vnode.context.$observables[streamName]
162+
var eventNames = Object.keys(binding.modifiers)
157163

158-
if(isSubject(vmStream)){
159-
var onNext = (vmStream.next || vmStream.onNext).bind(vmStream); //Rx4 Rx5
160-
el.vStreamData = binding.value;
164+
if (isSubject(vmStream)) {
165+
var onNext = (vmStream.next || vmStream.onNext).bind(vmStream) // Rx4 Rx5
166+
el.vStreamData = binding.value
161167
el._obs$ = eventNames.map(function (evtName) {
162-
return Rx.Observable.fromEvent(el,evtName)
163-
.subscribe(function (evt) {
164-
onNext({
165-
event:evt,
166-
data:el.vStreamData //Not using binding.value for data updating reason
167-
});
168-
});
168+
return Rx.Observable.fromEvent(el, evtName)
169+
.subscribe(function (evt) {
170+
onNext({
171+
event: evt,
172+
data: el.vStreamData // Not using binding.value for data updating reason
173+
})
174+
})
169175
})
170-
}else{
176+
} else {
171177
warn(
172-
'Invalid Subject found in directive with key "' + streamName + '".' + 'Please declare ' + streamName + ' as an new Rx.Subject'
178+
'Invalid Subject found in directive with key "' + streamName + '".' +
179+
'Please declare ' + streamName + ' as an new Rx.Subject'
173180
)
174181
}
175182
},
176-
update:function (el, binding, vnode) {
177-
el.vStreamData = binding.value;
183+
update: function (el, binding, vnode) {
184+
el.vStreamData = binding.value
178185
},
179186
unbind: function (el, binding, vnode) {
180-
if(Array.isArray(el._obs$)){
187+
if (Array.isArray(el._obs$)) {
181188
el._obs$.forEach(function (ob) {
182189
unsub(ob)
183190
})
184191
}
185192
}
186-
});
187-
188-
189-
193+
})
190194

191-
Vue.prototype.$subscribeTo = function(observable, next, error, complete) {
195+
Vue.prototype.$subscribeTo = function (observable, next, error, complete) {
192196
var obs$ = observable.subscribe(next, error, complete)
193197
;(this._obSubscriptions || (this._obSubscriptions = [])).push(obs$)
194198
return obs$

0 commit comments

Comments
 (0)