uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor keymap-edit keymap$

Browse Source
This commit is contained in:
Farkas József
2016-12-14 23:27:52 +01:00
parent 5e7e0c4933
commit f935ec4a09
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/keymap/edit/keymap-edit.component.ts
View File

@@ -8,7 +8,6 @@ import 'rxjs/add/operator/let';
import 'rxjs/add/operator/publishReplay'; import 'rxjs/add/operator/publishReplay';
import 'rxjs/add/operator/switchMap'; import 'rxjs/add/operator/switchMap';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import { ConnectableObservable } from 'rxjs/observable/ConnectableObservable';
import { Keymap } from '../../../config-serializer/config-items/Keymap'; import { Keymap } from '../../../config-serializer/config-items/Keymap';
import { AppState } from '../../../store'; import { AppState } from '../../../store';
@@ -30,14 +29,12 @@ export class KeymapEditComponent {
private store: Store<AppState>, private store: Store<AppState>,
private route: ActivatedRoute private route: ActivatedRoute
) { ) {
let keymapConnectable: ConnectableObservable<Keymap> = route this.keymap$ = route
.params .params
.select<string>('abbr') .select<string>('abbr')
.switchMap((abbr: string) => store.let(getKeymap(abbr))) .switchMap((abbr: string) => store.let(getKeymap(abbr)))
.publishReplay(); .publishReplay(1)
.refCount();
this.keymap$ = keymapConnectable;
keymapConnectable.connect();
this.deletable$ = store.let(getKeymapEntities()) this.deletable$ = store.let(getKeymapEntities())
.map((keymaps: Keymap[]) => keymaps.length > 1); .map((keymaps: Keymap[]) => keymaps.length > 1);