Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

Commit dad69fe

Browse files
ThomasBurlesontinayuangao
authored andcommitted
feat(ObservableMedia): use ObservableMedia class as provider token (#158)
* Refactor BreakPoint-related classes. * Refactor implementations of Providers * Improve DI and replace `ObservableMediaService` opaque token with **`ObservableMedia`** class BREAKING CHANGE: Deprecated use of `ObservableMediaService` opaque token. Developers now simply use the ObservableMedia class to inject the service. *before* ```js constructor( @Inject(ObserverableMediaService) private media:any ) { ... } ``` **after** ```js constructor(private media:ObservableMedia) { ... } ```
1 parent aaeb525 commit dad69fe

22 files changed

+110
-107
lines changed

src/demo-app/app/docs-layout-responsive/responsiveFlexDirective.demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {Subscription} from "rxjs/Subscription";
33
import 'rxjs/add/operator/filter';
44

55
import {MediaChange} from "../../../lib/media-query/media-change";
6-
import {ObservableMediaService} from "../../../lib/media-query/observable-media-service";
6+
import { ObservableMedia } from "../../../lib/media-query/observable-media-service";
77

88
@Component({
99
selector: 'demo-responsive-flex-directive',
@@ -32,7 +32,7 @@ export class DemoResponsiveFlexDirectives implements OnInit, OnDestroy {
3232
private _watcher : Subscription;
3333
public activeMediaQuery = "";
3434

35-
constructor(@Inject(ObservableMediaService) private _media$) { }
35+
constructor(private _media$:ObservableMedia) { }
3636

3737
ngOnInit() {
3838
this._watcher = this.watchMQChanges();

src/demo-app/app/docs-layout-responsive/responsiveFlexOrder.demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {Subscription} from "rxjs/Subscription";
33
import 'rxjs/add/operator/filter';
44

55
import {MediaChange} from "../../../lib/media-query/media-change";
6-
import {ObservableMediaService} from "../../../lib/media-query/observable-media-service";
6+
import { ObservableMedia } from "../../../lib/media-query/observable-media-service";
77

88
@Component({
99
selector: 'demo-responsive-flex-order',
@@ -44,7 +44,7 @@ export class DemoResponsiveFlexOrder implements OnInit, OnDestroy {
4444
public activeMediaQuery = "";
4545
private _watcher : Subscription;
4646

47-
constructor(@Inject(ObservableMediaService) private _media$) { }
47+
constructor(private _media$:ObservableMedia) { }
4848

4949
ngOnInit() {
5050
this._watcher = this.watchMQChanges();

src/demo-app/app/docs-layout-responsive/responsiveRowColumns.demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {Subscription} from "rxjs/Subscription";
33
import 'rxjs/add/operator/filter';
44

55
import {MediaChange} from "../../../lib/media-query/media-change";
6-
import {ObservableMediaService} from "../../../lib/media-query/observable-media-service";
6+
import { ObservableMedia } from "../../../lib/media-query/observable-media-service";
77

88
@Component({
99
selector: 'demo-responsive-row-column',
@@ -64,7 +64,7 @@ export class DemoResponsiveRows implements OnDestroy {
6464

6565
isVisible = true;
6666

67-
constructor(@Inject(ObservableMediaService) private _media$) {
67+
constructor(private _media$ : ObservableMedia ) {
6868
this._watcher = this._media$
6969
.subscribe((e:MediaChange) => {
7070
this._activeMQC = e;

src/lib/flexbox/api/flex.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import {Component, OnInit} from '@angular/core';
99
import {CommonModule} from '@angular/common';
1010
import {ComponentFixture, TestBed} from '@angular/core/testing';
1111

12+
import {BreakPointsProvider} from '../../media-query/breakpoints/break-points';
13+
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
1214
import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
1315
import {MatchMedia} from '../../media-query/match-media';
14-
import {BreakPointsProvider} from '../../media-query/providers/break-points-provider';
15-
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
1616
import {FlexLayoutModule} from '../_module';
1717

1818
import {__platform_browser_private__} from '@angular/platform-browser';

src/lib/flexbox/api/hide.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88
import {
9-
Component, OnInit, Inject
9+
Component, OnInit
1010
} from '@angular/core';
1111
import {CommonModule} from '@angular/common';
1212
import {ComponentFixture, TestBed} from '@angular/core/testing';
1313

14+
import {BreakPointsProvider} from '../../media-query/breakpoints/break-points';
15+
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
1416
import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
1517
import {MatchMedia} from '../../media-query/match-media';
16-
import {ObservableMediaService} from '../../media-query/observable-media-service';
17-
import {BreakPointsProvider} from '../../media-query/providers/break-points-provider';
18-
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
18+
import {ObservableMedia} from '../../media-query/observable-media-service';
1919

2020
import {customMatchers, expect, NgMatchers} from '../../utils/testing/custom-matchers';
2121
import {
@@ -290,7 +290,7 @@ export class TestHideComponent implements OnInit {
290290
isHidden = true;
291291
menuHidden = true;
292292

293-
constructor(@Inject(ObservableMediaService) private media) {
293+
constructor(private media: ObservableMedia) {
294294
}
295295

296296
toggleMenu() {

src/lib/flexbox/api/layout-align.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ import {Component, OnInit} from '@angular/core';
99
import {CommonModule} from '@angular/common';
1010
import {ComponentFixture, TestBed} from '@angular/core/testing';
1111

12+
import {BreakPointsProvider} from '../../media-query/breakpoints/break-points';
13+
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
14+
1215
import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
1316
import {MatchMedia} from '../../media-query/match-media';
14-
import {BreakPointsProvider} from '../../media-query/providers/break-points-provider';
15-
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
1617
import {FlexLayoutModule} from '../_module';
1718

1819
import {extendObject} from '../../utils/object-extend';

src/lib/flexbox/api/layout-gap.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import {Component, OnInit} from '@angular/core';
99
import {CommonModule} from '@angular/common';
1010
import {TestBed, ComponentFixture} from '@angular/core/testing';
1111

12+
import {BreakPointsProvider} from '../../media-query/breakpoints/break-points';
13+
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
1214
import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
1315
import {MatchMedia} from '../../media-query/match-media';
14-
import {BreakPointsProvider} from '../../media-query/providers/break-points-provider';
15-
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
1616
import {FlexLayoutModule} from '../_module';
1717

1818
import {customMatchers, expect} from '../../utils/testing/custom-matchers';

src/lib/flexbox/api/layout.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import {Component, OnInit} from '@angular/core';
99
import {CommonModule} from '@angular/common';
1010
import {ComponentFixture, TestBed} from '@angular/core/testing';
1111

12+
import {BreakPointsProvider} from '../../media-query/breakpoints/break-points';
13+
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
1214
import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
1315
import {MatchMedia} from '../../media-query/match-media';
14-
import {BreakPointsProvider} from '../../media-query/providers/break-points-provider';
15-
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
1616
import {FlexLayoutModule} from '../_module';
1717

1818
import {customMatchers} from '../../utils/testing/custom-matchers';

src/lib/flexbox/api/show.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
77
*/
8-
import {Component, OnInit, Inject} from '@angular/core';
8+
import {Component, OnInit} from '@angular/core';
99
import {CommonModule} from '@angular/common';
1010
import {ComponentFixture, TestBed} from '@angular/core/testing';
1111

12+
import {BreakPointsProvider} from '../../media-query/breakpoints/break-points';
13+
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
1214
import {MatchMedia} from '../../media-query/match-media';
1315
import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
14-
import {ObservableMediaService} from '../../media-query/observable-media-service';
15-
import {BreakPointsProvider} from '../../media-query/providers/break-points-provider';
16-
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
16+
import {ObservableMedia} from '../../media-query/observable-media-service';
1717
import {FlexLayoutModule} from '../_module';
1818

1919
import {customMatchers} from '../../utils/testing/custom-matchers';
@@ -234,7 +234,7 @@ export class TestShowComponent implements OnInit {
234234
isHidden = false;
235235
menuOpen: boolean = true;
236236

237-
constructor(@Inject(ObservableMediaService) private media) {
237+
constructor(private media: ObservableMedia) {
238238
}
239239

240240
toggleMenu() {

src/lib/flexbox/responsive/responsive-activation.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ import 'rxjs/add/operator/map';
1313

1414
import {TestBed, inject} from '@angular/core/testing';
1515

16-
import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
16+
import {BreakPointsProvider} from '../../media-query/breakpoints/break-points';
1717
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
18-
import {BreakPointsProvider} from '../../media-query/providers/break-points-provider';
18+
19+
import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
1920
import {MatchMedia} from '../../media-query/match-media';
2021
import {MediaMonitor} from '../../media-query/media-monitor';
2122
import {ResponsiveActivation, KeyOptions} from './responsive-activation';

0 commit comments

Comments
 (0)