refactor(abc): use preserveWhitespaces: false

ng-alain · Mar 13, 2018 · 9775c91 · 9775c91
1 parent 20b4fa0
commit 9775c91
Show file tree

Hide file tree

Showing 24 changed files with 51 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ dist
 coverage
 site/app/routes/gen
 .idea
+debug.log
diff --git a/src/core/abc/avatar-list/avatar-list.component.ts b/src/core/abc/avatar-list/avatar-list.component.ts
@@ -13,7 +13,8 @@ import { AvatarListItemComponent } from './avatar-list-item.component';
         </li>
     </ul>
     `,
-    styleUrls: [ './avatar-list.less' ]
+    styleUrls: [ './avatar-list.less' ],
+    preserveWhitespaces: false
 })
 export class AvatarListComponent {
 

diff --git a/src/core/abc/charts/bar/bar.component.ts b/src/core/abc/charts/bar/bar.component.ts
@@ -10,7 +10,8 @@ import { coerceBooleanProperty, coerceNumberProperty } from '@angular/cdk/coerci
     template: `
     <ng-container *ngIf="_title; else _titleTpl"><h4>{{_title}}</h4></ng-container>
     <div #container></div>`,
-    changeDetection: ChangeDetectionStrategy.OnPush
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    preserveWhitespaces: false
 })
 export class G2BarComponent implements OnDestroy, OnChanges, OnInit {
 

diff --git a/src/core/abc/charts/card/card.component.ts b/src/core/abc/charts/card/card.component.ts
@@ -31,7 +31,8 @@ import { coerceBooleanProperty } from '@angular/cdk/coercion';
         </nz-spin>
     </nz-card>
     `,
-    styleUrls: [ './card.less' ]
+    styleUrls: [ './card.less' ],
+    preserveWhitespaces: false
 })
 export class ChartCardComponent {
 

diff --git a/src/core/abc/charts/mini-progress/mini-progress.component.ts b/src/core/abc/charts/mini-progress/mini-progress.component.ts
@@ -14,7 +14,8 @@ import { coerceNumberProperty } from '@angular/cdk/coercion';
         <div class="progress" [ngStyle]="{'background-color': color, 'width.%': percent, 'height.px':strokeWidth}"></div>
     </div>
     `,
-    styleUrls: [ './mini-progress.less' ]
+    styleUrls: [ './mini-progress.less' ],
+    preserveWhitespaces: false
 })
 export class MiniProgressComponent {
 

diff --git a/src/core/abc/charts/pie/pie.component.ts b/src/core/abc/charts/pie/pie.component.ts
@@ -26,7 +26,8 @@ import { coerceNumberProperty, coerceBooleanProperty } from '@angular/cdk/coerci
     </ul>`,
     styleUrls: [ './pie.less' ],
     encapsulation: ViewEncapsulation.Emulated,
-    changeDetection: ChangeDetectionStrategy.OnPush
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    preserveWhitespaces: false
 })
 export class G2PieComponent implements OnDestroy, OnChanges, OnInit {
 

diff --git a/src/core/abc/charts/radar/radar.component.ts b/src/core/abc/charts/radar/radar.component.ts
@@ -18,7 +18,8 @@ import { coerceNumberProperty, coerceBooleanProperty } from '@angular/cdk/coerci
         </div>
     </div>`,
     styleUrls: [ './radar.less' ],
-    changeDetection: ChangeDetectionStrategy.OnPush
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    preserveWhitespaces: false
 })
 export class G2RadarComponent implements OnDestroy, OnChanges, OnInit {
 

diff --git a/src/core/abc/charts/timeline/timeline.component.ts b/src/core/abc/charts/timeline/timeline.component.ts
@@ -8,7 +8,8 @@ import { coerceNumberProperty } from '@angular/cdk/coercion';
     <div #container></div>
     <div #slider></div>`,
     styles: [ `:host {display:block}` ],
-    changeDetection: ChangeDetectionStrategy.OnPush
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    preserveWhitespaces: false
 })
 export class TimelineComponent implements OnDestroy, OnChanges, OnInit {
 

diff --git a/src/core/abc/charts/water-wave/water-wave.component.ts b/src/core/abc/charts/water-wave/water-wave.component.ts
@@ -16,7 +16,8 @@ import { coerceNumberProperty } from '@angular/cdk/coercion';
         <h4>{{percent}}%</h4>
     </div>`,
     styleUrls: [ './water-wave.less' ],
-    changeDetection: ChangeDetectionStrategy.OnPush
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    preserveWhitespaces: false
 })
 export class WaterWaveComponent implements OnDestroy, OnChanges, OnInit {
 

diff --git a/src/core/abc/count-down/count-down.component.ts b/src/core/abc/count-down/count-down.component.ts
@@ -9,7 +9,8 @@ import * as moment from 'moment';
         (finished)="_finished()"
         (notify)="_notify($event)"></countdown>
     `,
-    styleUrls: [ './count-down.less' ]
+    styleUrls: [ './count-down.less' ],
+    preserveWhitespaces: false
 })
 export class CountDownComponent {
 

diff --git a/src/core/abc/desc-list/desc-list-item.component.ts b/src/core/abc/desc-list/desc-list-item.component.ts
@@ -9,7 +9,8 @@ import { Component, Input, ViewChild, TemplateRef } from '@angular/core';
         </div>
         <div class="detail"><ng-content></ng-content></div>
     </ng-template>
-    `
+    `,
+    preserveWhitespaces: false
 })
 export class DescListItemComponent {
 

diff --git a/src/core/abc/desc-list/desc-list.component.ts b/src/core/abc/desc-list/desc-list.component.ts
@@ -14,7 +14,8 @@ import { DescListItemComponent } from './desc-list-item.component';
         </div>
     </div>
     `,
-    styleUrls: [ './desc-list.less' ]
+    styleUrls: [ './desc-list.less' ],
+    preserveWhitespaces: false
 })
 export class DescListComponent implements OnChanges, OnInit {
 

diff --git a/src/core/abc/error-collect/error-collect.component.ts b/src/core/abc/error-collect/error-collect.component.ts
@@ -9,8 +9,12 @@ import { coerceNumberProperty } from '@angular/cdk/coercion';
  */
 @Component({
     selector: 'error-collect, [error-collect]',
-    template: `<i class="anticon anticon-exclamation-circle"></i> {{count}}`,
-    changeDetection: ChangeDetectionStrategy.OnPush
+    template: `
+    <i class="anticon anticon-exclamation-circle"></i>
+    <span class="pl-sm">{{count}}</span>
+    `,
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    preserveWhitespaces: false
 })
 export class ErrorCollectComponent implements OnInit, OnDestroy {
 

diff --git a/src/core/abc/exception/exception.component.ts b/src/core/abc/exception/exception.component.ts
@@ -19,7 +19,8 @@ import { Component, Input, ContentChild, TemplateRef } from '@angular/core';
         </div>
     </div>
     `,
-    styleUrls: [ './exception.less' ]
+    styleUrls: [ './exception.less' ],
+    preserveWhitespaces: false
 })
 export class ExceptionComponent {
 

diff --git a/src/core/abc/footer-toolbar/footer-toolbar.component.ts b/src/core/abc/footer-toolbar/footer-toolbar.component.ts
@@ -13,7 +13,8 @@ const CLS = 'footer-toolbar';
         <error-collect *ngIf="errorCollect"></error-collect>
         <ng-content></ng-content>
     </div>
-    `
+    `,
+    preserveWhitespaces: false
 })
 export class FooterToolbarComponent implements OnInit, OnDestroy {
 

diff --git a/src/core/abc/global-footer/global-footer.component.ts b/src/core/abc/global-footer/global-footer.component.ts
@@ -8,7 +8,8 @@ import { Component, ContentChild, TemplateRef, Input } from '@angular/core';
     </div>
     <div *ngIf="copyright" class="copyright"><ng-template [ngTemplateOutlet]="copyright"></ng-template></div>
     `,
-    styleUrls: [ './global-footer.less' ]
+    styleUrls: [ './global-footer.less' ],
+    preserveWhitespaces: false
 })
 export class GlobalFooterComponent {
 

diff --git a/src/core/abc/number-info/number-info.component.ts b/src/core/abc/number-info/number-info.component.ts
@@ -14,7 +14,8 @@ import { coerceNumberProperty } from '@angular/cdk/coercion';
         </span>
     </div>
     `,
-    styleUrls: [ './number-info.less' ]
+    styleUrls: [ './number-info.less' ],
+    preserveWhitespaces: false
 })
 export class NumberInfoComponent implements OnChanges {
     _title = '';

diff --git a/src/core/abc/pro-header/pro-header.component.ts b/src/core/abc/pro-header/pro-header.component.ts
@@ -32,7 +32,8 @@ import { ProHeaderConfig } from './pro-header.config';
     <ng-content></ng-content>
     <ng-template [ngTemplateOutlet]="tab"></ng-template>
     `,
-    styleUrls: [ './pro-header.less' ]
+    styleUrls: [ './pro-header.less' ],
+    preserveWhitespaces: false
 })
 export class ProHeaderComponent implements OnInit, OnChanges {
 

diff --git a/src/core/abc/result/result.component.ts b/src/core/abc/result/result.component.ts
@@ -11,7 +11,8 @@ import { Component, Input, TemplateRef, ContentChild } from '@angular/core';
     </div>
     <div class="actions"><ng-content></ng-content></div>
     `,
-    styleUrls: [ './result.less' ]
+    styleUrls: [ './result.less' ],
+    preserveWhitespaces: false
 })
 export class ResultComponent {
 

diff --git a/src/core/abc/reuse-tab/reuse-tab.component.ts b/src/core/abc/reuse-tab/reuse-tab.component.ts
@@ -12,7 +12,8 @@ import { ReuseTabCached, ReuseTabNotify, ReuseTabMatchMode } from './interface';
     selector: 'reuse-tab',
     templateUrl: './reuse-tab.component.html',
     styleUrls: ['./reuse-tab.less'],
-    changeDetection: ChangeDetectionStrategy.OnPush
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    preserveWhitespaces: false
 })
 export class ReuseTabComponent implements OnInit, OnChanges, OnDestroy {
     private sub$: Subscription;

diff --git a/src/core/abc/simple-table/simple-table.component.ts b/src/core/abc/simple-table/simple-table.component.ts
@@ -17,7 +17,8 @@ import { SimpleTableExport } from './simple-table-export';
     selector: 'simple-table',
     templateUrl: './simple-table.component.html',
     styleUrls: [ './simple-table.less' ],
-    providers: [ SimpleTableExport, CNCurrencyPipe, MomentDatePipe, YNPipe, DecimalPipe ]
+    providers: [ SimpleTableExport, CNCurrencyPipe, MomentDatePipe, YNPipe, DecimalPipe ],
+    preserveWhitespaces: false
 })
 export class SimpleTableComponent implements OnInit, OnChanges, AfterViewInit, OnDestroy {
 

diff --git a/src/core/abc/standard-form-row/standard-form-row.component.ts b/src/core/abc/standard-form-row/standard-form-row.component.ts
@@ -7,7 +7,8 @@ import { coerceBooleanProperty } from '@angular/cdk/coercion';
     <div *ngIf="title" class="label"><span>{{title}}</span></div>
     <div class="control"><ng-content></ng-content></div>
     `,
-    styleUrls: [ './standard-form-row.less' ]
+    styleUrls: [ './standard-form-row.less' ],
+    preserveWhitespaces: false
 })
 export class StandardFormRowComponent implements OnChanges {
 

diff --git a/src/core/abc/tag-select/tag-select.component.ts b/src/core/abc/tag-select/tag-select.component.ts
@@ -6,7 +6,8 @@ import { coerceBooleanProperty } from '@angular/cdk/coercion';
     template: `
     <ng-content></ng-content>
     <a *ngIf="expandable" class="trigger" (click)="trigger()">{{expand ? '收起' : '展开'}}<i class="anticon anticon-{{expand ? 'up' : 'down'}} ml-sm"></i></a>`,
-    styleUrls: [ './tag-select.less' ]
+    styleUrls: [ './tag-select.less' ],
+    preserveWhitespaces: false
 })
 export class TagSelectComponent {
 

diff --git a/src/core/abc/trend/trend.component.ts b/src/core/abc/trend/trend.component.ts
@@ -11,7 +11,8 @@ import { coerceBooleanProperty } from '@angular/cdk/coercion';
     // tslint:disable-next-line:use-host-property-decorator
     host: {
         '[class.grey]': '!colorful'
-    }
+    },
+    preserveWhitespaces: false
 })
 export class TrendComponent {