Skip to content

Commit f5c676e

Browse files
committed
chore: switch to lettable
1 parent b1e734b commit f5c676e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/datatable.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
3-
import 'rxjs/add/observable/fromEvent';
43

54
import {
65
DatatableComponent,

src/directives/draggable.directive.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { Observable } from 'rxjs/Observable';
55
import { Subscription } from 'rxjs/Subscription';
66
import { takeUntil } from 'rxjs/operators';
77
import { MouseEvent } from '../events';
8+
import { fromEvent } from 'rxjs/observable/fromEvent';
89

910
/**
1011
* Draggable Directive for Angular2
@@ -70,11 +71,11 @@ export class DraggableDirective implements OnDestroy, OnChanges {
7071

7172
const mouseDownPos = { x: event.clientX, y: event.clientY };
7273

73-
const mouseup = Observable.fromEvent(document, 'mouseup');
74+
const mouseup = fromEvent(document, 'mouseup');
7475
this.subscription = mouseup
7576
.subscribe((ev: MouseEvent) => this.onMouseup(ev));
7677

77-
const mouseMoveSub = Observable.fromEvent(document, 'mousemove')
78+
const mouseMoveSub = fromEvent(document, 'mousemove')
7879
.pipe(takeUntil(mouseup))
7980
.subscribe((ev: MouseEvent) => this.move(ev, mouseDownPos));
8081

src/directives/long-press.directive.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
import { Observable } from 'rxjs/Observable';
66
import { Subscription } from 'rxjs/Subscription';
77
import { takeUntil } from 'rxjs/operators';
8-
8+
import { fromEvent } from 'rxjs/observable/fromEvent';
99
import { MouseEvent } from '../events';
1010

1111
@Directive({ selector: '[long-press]' })
@@ -50,7 +50,7 @@ export class LongPressDirective implements OnDestroy {
5050
this.pressing = true;
5151
this.isLongPressing = false;
5252

53-
const mouseup = Observable.fromEvent(document, 'mouseup');
53+
const mouseup = fromEvent(document, 'mouseup');
5454
this.subscription = mouseup.subscribe((ev: MouseEvent) => this.onMouseup());
5555

5656
this.timeout = setTimeout(() => {
@@ -61,7 +61,7 @@ export class LongPressDirective implements OnDestroy {
6161
});
6262

6363
this.subscription.add(
64-
Observable.fromEvent(document, 'mousemove')
64+
fromEvent(document, 'mousemove')
6565
.pipe(takeUntil(mouseup))
6666
.subscribe((mouseEvent: MouseEvent) => this.onMouseMove(mouseEvent))
6767
);

0 commit comments

Comments
 (0)