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

Commit 176958e

Browse files
CaerusKaruCaerusKaru
committed
Address PR comments
1 parent 4d9e74f commit 176958e

40 files changed

+385
-248
lines changed

‎src/lib/api/core/base-adapter.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import {ElementRef} from '@angular/core';
99
import {BaseFxDirectiveAdapter} from './base-adapter';
1010
import {expect} from '../../utils/testing/custom-matchers';
1111
import {MediaMonitor} from '../../media-query/media-monitor';
12-
import {StyleService} from '../../utils/styling/styler';
12+
import {StyleUtils} from '../../utils/styling/style-utils';
1313

1414
describe('BaseFxDirectiveAdapter class', () => {
1515
let component;
1616
beforeEach(() => {
17-
component = new BaseFxDirectiveAdapter('', {} as MediaMonitor, {} as ElementRef, {} as StyleService); // tslint:disable-line:max-line-length
17+
component = new BaseFxDirectiveAdapter('', {} as MediaMonitor, {} as ElementRef, {} as StyleUtils); // tslint:disable-line:max-line-length
1818
});
1919
describe('cacheInput', () => {
2020
it('should call _cacheInputArray when source is an array', () => {

‎src/lib/api/core/base-adapter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {BaseFxDirective} from './base';
1111
import {ResponsiveActivation} from './responsive-activation';
1212
import {MediaQuerySubscriber} from '../../media-query/media-change';
1313
import {MediaMonitor} from '../../media-query/media-monitor';
14-
import {StyleService} from '../../utils/styling/styler';
14+
import {StyleUtils} from '../../utils/styling/style-utils';
1515

1616

1717
/**
@@ -49,7 +49,7 @@ export class BaseFxDirectiveAdapter extends BaseFxDirective {
4949
constructor(protected _baseKey: string, // non-responsive @Input property name
5050
protected _mediaMonitor: MediaMonitor,
5151
protected _elementRef: ElementRef,
52-
protected _styler: StyleService) {
52+
protected _styler: StyleUtils) {
5353
super(_mediaMonitor, _elementRef, _styler);
5454
}
5555

‎src/lib/api/core/base.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import {
1616
import {buildLayoutCSS} from '../../utils/layout-validator';
1717
import {
1818
StyleDefinition,
19-
StyleService,
20-
} from '../../utils/styling/styler';
19+
StyleUtils,
20+
} from '../../utils/styling/style-utils';
2121

2222
import {ResponsiveActivation, KeyOptions} from '../core/responsive-activation';
2323
import {MediaMonitor} from '../../media-query/media-monitor';
@@ -63,7 +63,7 @@ export abstract class BaseFxDirective implements OnDestroy, OnChanges {
6363
*/
6464
constructor(protected _mediaMonitor: MediaMonitor,
6565
protected _elementRef: ElementRef,
66-
protected _styler: StyleService) {
66+
protected _styler: StyleUtils) {
6767
}
6868

6969
// *********************************************

‎src/lib/api/ext/class.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-regi
2222
import {ClassDirective} from './class';
2323
import {MediaQueriesModule} from '../../media-query/_module';
2424
import {ServerStylesheet} from '../../utils/styling/server-stylesheet';
25-
import {StyleService} from '../../utils/styling/styler';
25+
import {StyleUtils} from '../../utils/styling/style-utils';
2626

2727
describe('class directive', () => {
2828
let fixture: ComponentFixture<any>;
@@ -52,7 +52,7 @@ describe('class directive', () => {
5252
BreakPointRegistry, DEFAULT_BREAKPOINTS_PROVIDER,
5353
{provide: MatchMedia, useClass: MockMatchMedia},
5454
ServerStylesheet,
55-
StyleService,
55+
StyleUtils,
5656
]
5757
});
5858
});

‎src/lib/api/ext/class.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {BaseFxDirectiveAdapter} from '../core/base-adapter';
2727
import {MediaChange} from '../../media-query/media-change';
2828
import {MediaMonitor} from '../../media-query/media-monitor';
2929
import {RendererAdapter} from '../core/renderer-adapter';
30-
import {StyleService} from '../../utils/styling/styler';
30+
import {StyleUtils} from '../../utils/styling/style-utils';
3131

3232
/** NgClass allowed inputs **/
3333
export type NgClassType = string | string[] | Set<string> | {[klass: string]: any};
@@ -94,7 +94,7 @@ export class ClassDirective extends BaseFxDirective
9494
protected _ngEl: ElementRef,
9595
protected _renderer: Renderer2,
9696
@Optional() @Self() private _ngClassInstance: NgClass,
97-
protected _styler: StyleService) {
97+
protected _styler: StyleUtils) {
9898
super(monitor, _ngEl, _styler);
9999
this._configureAdapters();
100100
}

‎src/lib/api/ext/hide.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ import {ShowHideDirective} from './show-hide';
2323
import {MediaQueriesModule} from '../../media-query/_module';
2424

2525
import {ServerStylesheet} from '../../utils/styling/server-stylesheet';
26-
import {StyleService} from '../../utils/styling/styler';
26+
import {StyleUtils} from '../../utils/styling/style-utils';
2727
import {SERVER_TOKEN} from '../../utils/styling/server-token';
2828

2929
describe('hide directive', () => {
3030
let fixture: ComponentFixture<any>;
3131
let matchMedia: MockMatchMedia;
32-
let styler: StyleService;
32+
let styler: StyleUtils;
3333
let platformId: Object;
3434
let createTestComponent = (template: string) => {
3535
fixture = makeCreateTestComponent(() => TestHideComponent)(template);
3636

37-
inject([MatchMedia, StyleService, PLATFORM_ID],
38-
(_matchMedia: MockMatchMedia, _styler: StyleService, _platformId: Object) => {
37+
inject([MatchMedia, StyleUtils, PLATFORM_ID],
38+
(_matchMedia: MockMatchMedia, _styler: StyleUtils, _platformId: Object) => {
3939
matchMedia = _matchMedia;
4040
styler = _styler;
4141
platformId = _platformId;
@@ -69,7 +69,7 @@ describe('hide directive', () => {
6969
BreakPointRegistry, DEFAULT_BREAKPOINTS_PROVIDER,
7070
{provide: MatchMedia, useClass: MockMatchMedia},
7171
ServerStylesheet,
72-
StyleService,
72+
StyleUtils,
7373
{provide: SERVER_TOKEN, useValue: true},
7474
]
7575
});

‎src/lib/api/ext/img-src.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {expectEl, makeCreateTestComponent, queryFor} from '../../utils/testing/h
2020
import {expect} from '../../utils/testing/custom-matchers';
2121
import {_dom as _} from '../../utils/testing/dom-tools';
2222
import {SERVER_TOKEN} from '../../utils/styling/server-token';
23-
import {StyleService} from '../../utils/styling/styler';
23+
import {StyleUtils} from '../../utils/styling/style-utils';
2424

2525
const SRC_URLS = {
2626
'xs': [
@@ -54,13 +54,13 @@ describe('img-src directive', () => {
5454
let fixture: ComponentFixture<any>;
5555
let matchMedia: MockMatchMedia;
5656
let platformId: Object;
57-
let styler: StyleService;
57+
let styler: StyleUtils;
5858

5959
let componentWithTemplate = (template: string) => {
6060
fixture = makeCreateTestComponent(() => TestSrcComponent)(template);
6161

62-
inject([MatchMedia, PLATFORM_ID, StyleService],
63-
(_matchMedia: MockMatchMedia, _platformId: Object, _styler: StyleService) => {
62+
inject([MatchMedia, PLATFORM_ID, StyleUtils],
63+
(_matchMedia: MockMatchMedia, _platformId: Object, _styler: StyleUtils) => {
6464
matchMedia = _matchMedia;
6565
platformId = _platformId;
6666
styler = _styler;

‎src/lib/api/ext/img-src.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {isPlatformServer} from '@angular/common';
1919

2020
import {BaseFxDirective} from '../core/base';
2121
import {MediaMonitor} from '../../media-query/media-monitor';
22-
import {StyleService} from '../../utils/styling/styler';
22+
import {StyleUtils} from '../../utils/styling/style-utils';
2323
import {SERVER_TOKEN} from '../../utils/styling/server-token';
2424

2525
/**
@@ -62,7 +62,7 @@ export class ImgSrcDirective extends BaseFxDirective implements OnInit, OnChange
6262

6363
constructor(protected _elRef: ElementRef,
6464
protected _monitor: MediaMonitor,
65-
protected _styler: StyleService,
65+
protected _styler: StyleUtils,
6666
@Inject(PLATFORM_ID) protected _platformId: Object,
6767
@Optional() @Inject(SERVER_TOKEN) protected _serverModuleLoaded: boolean) {
6868
super(_monitor, _elRef, _styler);
@@ -108,7 +108,7 @@ export class ImgSrcDirective extends BaseFxDirective implements OnInit, OnChange
108108
if (this.hasResponsiveKeys) {
109109
let url = this.activatedValue || this.defaultSrc;
110110
if (isPlatformServer(this._platformId) && this._serverModuleLoaded) {
111-
this._styler.applyStyleToElement(this.nativeElement, 'content', url ? `url(${url})` : '');
111+
this._styler.applyStyleToElement(this.nativeElement, {'content': url ? `url(${url})` : ''});
112112
} else {
113113
this.nativeElement.setAttribute('src', String(url));
114114
}

‎src/lib/api/ext/show-hide.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {BaseFxDirective} from '../core/base';
2525
import {MediaChange} from '../../media-query/media-change';
2626
import {MediaMonitor} from '../../media-query/media-monitor';
2727
import {LayoutDirective} from '../flexbox/layout';
28-
import {StyleService} from '../../utils/styling/styler';
28+
import {StyleUtils} from '../../utils/styling/style-utils';
2929
import {SERVER_TOKEN} from '../../utils/styling/server-token';
3030

3131
const FALSY = ['false', false, 0];
@@ -107,7 +107,7 @@ export class ShowHideDirective extends BaseFxDirective implements OnInit, OnChan
107107
constructor(monitor: MediaMonitor,
108108
@Optional() @Self() protected layout: LayoutDirective,
109109
protected elRef: ElementRef,
110-
protected styleUtils: StyleService,
110+
protected styleUtils: StyleUtils,
111111
@Inject(PLATFORM_ID) protected platformId: Object,
112112
@Optional() @Inject(SERVER_TOKEN) protected serverModuleLoaded: boolean) {
113113

‎src/lib/api/ext/show.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ import {FlexLayoutModule} from '../../module';
1919
import {customMatchers} from '../../utils/testing/custom-matchers';
2020
import {makeCreateTestComponent, expectNativeEl} from '../../utils/testing/helpers';
2121
import {ServerStylesheet} from '../../utils/styling/server-stylesheet';
22-
import {StyleService} from '../../utils/styling/styler';
22+
import {StyleUtils} from '../../utils/styling/style-utils';
2323
import {SERVER_TOKEN} from '../../utils/styling/server-token';
2424

2525
describe('show directive', () => {
2626
let fixture: ComponentFixture<any>;
2727
let matchMedia: MockMatchMedia;
28-
let styler: StyleService;
28+
let styler: StyleUtils;
2929
let platformId: Object;
3030
let createTestComponent = (template) => {
3131
fixture = makeCreateTestComponent(() => TestShowComponent)(template);
3232

33-
inject([MatchMedia, StyleService, PLATFORM_ID],
34-
(_matchMedia: MockMatchMedia, _styler: StyleService, _platformId: Object) => {
33+
inject([MatchMedia, StyleUtils, PLATFORM_ID],
34+
(_matchMedia: MockMatchMedia, _styler: StyleUtils, _platformId: Object) => {
3535
matchMedia = _matchMedia;
3636
styler = _styler;
3737
platformId = _platformId;
@@ -49,7 +49,7 @@ describe('show directive', () => {
4949
BreakPointRegistry, DEFAULT_BREAKPOINTS_PROVIDER,
5050
{provide: MatchMedia, useClass: MockMatchMedia},
5151
ServerStylesheet,
52-
StyleService,
52+
StyleUtils,
5353
{provide: SERVER_TOKEN, useValue: true}
5454
]
5555
});

‎src/lib/api/ext/style.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ import {
2323
makeCreateTestComponent, expectNativeEl
2424
} from '../../utils/testing/helpers';
2525
import {ServerStylesheet} from '../../utils/styling/server-stylesheet';
26-
import {StyleService} from '../../utils/styling/styler';
26+
import {StyleUtils} from '../../utils/styling/style-utils';
2727

2828
describe('style directive', () => {
2929
let fixture: ComponentFixture<any>;
3030
let matchMedia: MockMatchMedia;
31-
let styler: StyleService;
31+
let styler: StyleUtils;
3232
let createTestComponent = (template) => {
3333
fixture = makeCreateTestComponent(() => TestStyleComponent)(template);
3434

35-
inject([MatchMedia, StyleService], (_matchMedia: MockMatchMedia, _styler: StyleService) => {
35+
inject([MatchMedia, StyleUtils], (_matchMedia: MockMatchMedia, _styler: StyleUtils) => {
3636
matchMedia = _matchMedia;
3737
styler = _styler;
3838
})();
@@ -49,7 +49,7 @@ describe('style directive', () => {
4949
BreakPointRegistry, DEFAULT_BREAKPOINTS_PROVIDER,
5050
{provide: MatchMedia, useClass: MockMatchMedia},
5151
ServerStylesheet,
52-
StyleService,
52+
StyleUtils,
5353
]
5454
});
5555
});

‎src/lib/api/ext/style.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import {
3636
ngStyleUtils as _
3737
} from '../../utils/styling/style-transforms';
3838
import {RendererAdapter} from '../core/renderer-adapter';
39-
import {StyleService} from '../../utils/styling/styler';
39+
import {StyleUtils} from '../../utils/styling/style-utils';
4040

4141

4242
/**
@@ -92,7 +92,7 @@ export class StyleDirective extends BaseFxDirective
9292
protected _renderer: Renderer2,
9393
protected _differs: KeyValueDiffers,
9494
@Optional() @Self() private _ngStyleInstance: NgStyle,
95-
protected _styler: StyleService) {
95+
protected _styler: StyleUtils) {
9696

9797
super(monitor, _ngEl, _styler);
9898
this._configureAdapters();

‎src/lib/api/flexbox/flex-align.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
import {BaseFxDirective} from '../core/base';
1919
import {MediaChange} from '../../media-query/media-change';
2020
import {MediaMonitor} from '../../media-query/media-monitor';
21-
import {StyleService} from '../../utils/styling/styler';
21+
import {StyleUtils} from '../../utils/styling/style-utils';
2222

2323
/**
2424
* 'flex-align' flexbox styling directive
@@ -56,7 +56,7 @@ export class FlexAlignDirective extends BaseFxDirective implements OnInit, OnCha
5656
/* tslint:enable */
5757
constructor(monitor: MediaMonitor,
5858
elRef: ElementRef,
59-
styleUtils: StyleService) {
59+
styleUtils: StyleUtils) {
6060
super(monitor, elRef, styleUtils);
6161
}
6262

‎src/lib/api/flexbox/flex-fill.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {Directive, ElementRef} from '@angular/core';
99

1010
import {MediaMonitor} from '../../media-query/media-monitor';
1111
import {BaseFxDirective} from '../core/base';
12-
import {StyleService} from '../../utils/styling/styler';
12+
import {StyleUtils} from '../../utils/styling/style-utils';
1313

1414
const FLEX_FILL_CSS = {
1515
'margin': 0,
@@ -32,7 +32,7 @@ const FLEX_FILL_CSS = {
3232
export class FlexFillDirective extends BaseFxDirective {
3333
constructor(monitor: MediaMonitor,
3434
public elRef: ElementRef,
35-
styleUtils: StyleService) {
35+
styleUtils: StyleUtils) {
3636
super(monitor, elRef, styleUtils);
3737
this._applyStyleToElement(FLEX_FILL_CSS);
3838
}

‎src/lib/api/flexbox/flex-offset.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ import {
2525
expectEl,
2626
expectNativeEl,
2727
} from '../../utils/testing/helpers';
28-
import {StyleService} from '../../utils/styling/styler';
28+
import {StyleUtils} from '../../utils/styling/style-utils';
2929
import {SERVER_TOKEN} from '../../utils/styling/server-token';
3030

3131
describe('flex-offset directive', () => {
3232
let fixture: ComponentFixture<any>;
3333
let fakeDocument: {body: {dir?: string}, documentElement: {dir?: string}};
34-
let styler: StyleService;
34+
let styler: StyleUtils;
3535
let platform: Platform;
3636
let platformId: Object;
3737
let componentWithTemplate = (template: string) => {
3838
fixture = makeCreateTestComponent(() => TestFlexComponent)(template);
3939

40-
inject([StyleService, Platform, PLATFORM_ID],
41-
(_styler: StyleService, _platform: Platform, _platformId: Object) => {
40+
inject([StyleUtils, Platform, PLATFORM_ID],
41+
(_styler: StyleUtils, _platform: Platform, _platformId: Object) => {
4242
styler = _styler;
4343
platform = _platform;
4444
platformId = _platformId;
@@ -57,7 +57,7 @@ describe('flex-offset directive', () => {
5757
BreakPointRegistry, DEFAULT_BREAKPOINTS_PROVIDER,
5858
{provide: MatchMedia, useClass: MockMatchMedia},
5959
{provide: DIR_DOCUMENT, useValue: fakeDocument},
60-
StyleService,
60+
StyleUtils,
6161
{provide: SERVER_TOKEN, useValue: true}
6262
]
6363
});

‎src/lib/api/flexbox/flex-offset.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {MediaChange} from '../../media-query/media-change';
2525
import {MediaMonitor} from '../../media-query/media-monitor';
2626
import {LayoutDirective} from './layout';
2727
import {isFlowHorizontal} from '../../utils/layout-validator';
28-
import {StyleService} from '../../utils/styling/styler';
28+
import {StyleUtils} from '../../utils/styling/style-utils';
2929

3030
/**
3131
* 'flex-offset' flexbox styling directive
@@ -63,7 +63,7 @@ export class FlexOffsetDirective extends BaseFxDirective implements OnInit, OnCh
6363
elRef: ElementRef,
6464
@Optional() @SkipSelf() protected _container: LayoutDirective,
6565
private _directionality: Directionality,
66-
styleUtils: StyleService) {
66+
styleUtils: StyleUtils) {
6767
super(monitor, elRef, styleUtils);
6868

6969
this._directionWatcher =

‎src/lib/api/flexbox/flex-order.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
import {BaseFxDirective} from '../core/base';
1919
import {MediaChange} from '../../media-query/media-change';
2020
import {MediaMonitor} from '../../media-query/media-monitor';
21-
import {StyleService} from '../../utils/styling/styler';
21+
import {StyleUtils} from '../../utils/styling/style-utils';
2222

2323
/**
2424
* 'flex-order' flexbox styling directive
@@ -54,7 +54,7 @@ export class FlexOrderDirective extends BaseFxDirective implements OnInit, OnCha
5454
/* tslint:enable */
5555
constructor(monitor: MediaMonitor,
5656
elRef: ElementRef,
57-
styleUtils: StyleService) {
57+
styleUtils: StyleUtils) {
5858
super(monitor, elRef, styleUtils);
5959
}
6060

0 commit comments

Comments
 (0)