Skip to content

Commit 6c17cca

Browse files
committed
fix scroll dispatcher circular dep
1 parent 3ab087f commit 6c17cca

File tree

7 files changed

+22
-16
lines changed

7 files changed

+22
-16
lines changed

src/lib/core/overlay/overlay-directives.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {coerceBooleanProperty} from '../coercion/boolean-property';
2929
import {ESCAPE} from '../keyboard/keycodes';
3030
import {ScrollDispatcher} from './scroll/scroll-dispatcher';
3131
import {Subscription} from 'rxjs/Subscription';
32-
import {ScrollDispatchModule} from './scroll/scroll-dispatcher';
32+
import {ScrollDispatchModule} from './scroll/index';
3333

3434

3535
/** Default set of positions for the overlay. Follows the behavior of a dropdown. */

src/lib/core/overlay/position/connected-position-strategy.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {Scrollable} from '../scroll/scrollable';
77
import {Subscription} from 'rxjs/Subscription';
88
import {TestBed, inject} from '@angular/core/testing';
99
import Spy = jasmine.Spy;
10-
import {ScrollDispatchModule} from '../scroll/scroll-dispatcher';
10+
import {ScrollDispatchModule} from '../scroll/index';
1111

1212

1313
// Default width and height of the overlay and origin panels throughout these tests.

src/lib/core/overlay/position/viewport-ruler.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from './viewport-ruler';
22
import {TestBed, inject} from '@angular/core/testing';
3-
import {ScrollDispatchModule} from '../scroll/scroll-dispatcher';
3+
import {ScrollDispatchModule} from '../scroll/index';
44

55

66
// For all tests, we assume the browser window is 1024x786 (outerWidth x outerHeight).

src/lib/core/overlay/scroll/index.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import {NgModule} from '@angular/core';
2+
import {SCROLL_DISPATCHER_PROVIDER} from './scroll-dispatcher';
3+
import {Scrollable} from './scrollable';
4+
import {PlatformModule} from '../../platform/index';
5+
6+
export {Scrollable} from './scrollable';
7+
export {ScrollDispatcher} from './scroll-dispatcher';
8+
9+
@NgModule({
10+
imports: [PlatformModule],
11+
exports: [Scrollable],
12+
declarations: [Scrollable],
13+
providers: [SCROLL_DISPATCHER_PROVIDER],
14+
})
15+
export class ScrollDispatchModule { }

src/lib/core/overlay/scroll/scroll-dispatcher.ts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {NgModule, ElementRef, Injectable, NgZone, Optional, SkipSelf} from '@angular/core';
2-
import {Platform, PlatformModule} from '../../platform/index';
1+
import {ElementRef, Injectable, NgZone, Optional, SkipSelf} from '@angular/core';
2+
import {Platform} from '../../platform/index';
33
import {Scrollable} from './scrollable';
44
import {Subject} from 'rxjs/Subject';
55
import {Observable} from 'rxjs/Observable';
@@ -143,12 +143,3 @@ export const SCROLL_DISPATCHER_PROVIDER = {
143143
deps: [[new Optional(), new SkipSelf(), ScrollDispatcher], NgZone, Platform],
144144
useFactory: SCROLL_DISPATCHER_PROVIDER_FACTORY
145145
};
146-
147-
148-
@NgModule({
149-
imports: [PlatformModule],
150-
exports: [Scrollable],
151-
declarations: [Scrollable],
152-
providers: [SCROLL_DISPATCHER_PROVIDER],
153-
})
154-
export class ScrollDispatchModule { }

src/lib/core/ripple/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {NgModule} from '@angular/core';
22
import {MdRipple} from './ripple';
33
import {MdCommonModule} from '../common-behaviors/common-module';
44
import {VIEWPORT_RULER_PROVIDER} from '../overlay/position/viewport-ruler';
5-
import {ScrollDispatchModule} from '../overlay/scroll/scroll-dispatcher';
5+
import {ScrollDispatchModule} from '../overlay/scroll/index';
66
import {PlatformModule} from '../platform/index';
77

88
export {MdRipple, RippleGlobalOptions, MD_RIPPLE_GLOBAL_OPTIONS} from './ripple';

src/lib/tabs/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {MdInkBar} from './ink-bar';
1212
import {MdTabBody} from './tab-body';
1313
import {VIEWPORT_RULER_PROVIDER} from '../core/overlay/position/viewport-ruler';
1414
import {MdTabHeader} from './tab-header';
15-
import {ScrollDispatchModule} from '../core/overlay/scroll/scroll-dispatcher';
15+
import {ScrollDispatchModule} from '../core/overlay/scroll/index';
1616

1717

1818
@NgModule({

0 commit comments

Comments
 (0)