Skip to content

Commit dd6065c

Browse files
klemenoslajmmalerba
authored andcommittedDec 3, 2018
fix(schematics): two consecutive commas generated (#14371)
When generating any Material schematic with OnPush changeDetection, we get two consecutive commas in component decorator. Fixes: #14366
1 parent 1e96b01 commit dd6065c

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed
 

‎src/lib/schematics/ng-generate/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import { FormBuilder, Validators } from '@angular/forms';
99
templateUrl: './<%= dasherize(name) %>.component.html',<% } if(inlineStyle) { %>
1010
styles: [`
1111
<%= indentTextContent(resolvedFiles.stylesheet, 4) %>
12-
`],<% } else { %>
13-
styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>'],<% } %><% if(!!viewEncapsulation) { %>
12+
`]<% } else { %>
13+
styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>']<% } %><% if(!!viewEncapsulation) { %>,
1414
encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
1515
changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %>
1616
})

‎src/lib/schematics/ng-generate/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import { Breakpoints, BreakpointObserver } from '@angular/cdk/layout';
1010
templateUrl: './<%= dasherize(name) %>.component.html',<% } if(inlineStyle) { %>
1111
styles: [`
1212
<%= indentTextContent(resolvedFiles.stylesheet, 4) %>
13-
`],<% } else { %>
14-
styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>'],<% } %><% if(!!viewEncapsulation) { %>
13+
`]<% } else { %>
14+
styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>']<% } %><% if(!!viewEncapsulation) { %>,
1515
encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
1616
changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %>
1717
})

‎src/lib/schematics/ng-generate/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import { map } from 'rxjs/operators';
1111
templateUrl: './<%= dasherize(name) %>.component.html',<% } if(inlineStyle) { %>
1212
styles: [`
1313
<%= indentTextContent(resolvedFiles.stylesheet, 4) %>
14-
`],<% } else { %>
15-
styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>'],<% } %><% if(!!viewEncapsulation) { %>
14+
`]<% } else { %>
15+
styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>']<% } %><% if(!!viewEncapsulation) { %>,
1616
encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
1717
changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %>
1818
})

‎src/lib/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import { <%= classify(name) %>DataSource } from './<%= dasherize(name) %>-dataso
1010
templateUrl: './<%= dasherize(name) %>.component.html',<% } if(inlineStyle) { %>
1111
styles: [`
1212
<%= indentTextContent(resolvedFiles.stylesheet, 4) %>
13-
`],<% } else { %>
14-
styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>'],<% } %><% if(!!viewEncapsulation) { %>
13+
`]<% } else { %>
14+
styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>']<% } %><% if(!!viewEncapsulation) { %>,
1515
encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
1616
changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %>
1717
})

‎src/lib/schematics/ng-generate/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ export interface FlatTreeNode {
3030
templateUrl: './<%= dasherize(name) %>.component.html',<% } if (inlineStyle) { %>
3131
styles: [`
3232
<%= indentTextContent(resolvedFiles.stylesheet, 4) %>
33-
`],<% } else { %>
34-
styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>'],<% } %><% if (!!viewEncapsulation) { %>
33+
`]<% } else { %>
34+
styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>']<% } %><% if(!!viewEncapsulation) { %>,
3535
encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
3636
changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %>
3737
})

0 commit comments

Comments
 (0)
Please sign in to comment.