fix build

positive-js · Jul 30, 2018 · 5a169ef · 5a169ef
1 parent 455cff9
commit 5a169ef
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 14 deletions.
diff --git a/src/lib/core/pipes/css-unit.pipe.ts → src/lib/modal/css-unit.pipe.ts b/src/lib/core/pipes/css-unit.pipe.ts → src/lib/modal/css-unit.pipe.ts
diff --git a/src/lib/modal/modal.component.ts b/src/lib/modal/modal.component.ts
@@ -70,7 +70,7 @@ export class McModalComponent<T = any, R = any> extends McModalRef<T, R>
     }
 
     // tslint:disable-next-line:no-any
-    @Input() mcModalType: ModalType = ModalType.DEFAULT;
+    @Input() mcModalType: ModalType = 'default';
     // If not specified, will use <ng-content>
     @Input() mcContent: string | TemplateRef<{}> | Type<T>;
     // avaliable when mcContent is a component
@@ -126,7 +126,7 @@ export class McModalComponent<T = any, R = any> extends McModalRef<T, R>
         private viewContainer: ViewContainerRef,
         private mcMeasureScrollbarService: McMeasureScrollbarService,
         private modalControl: McModalControlService,
-        @Inject(DOCUMENT) private document: any) { // tslint:disable-line:no-any
+        @Inject(DOCUMENT) private document: any) {
 
         super();
     }

diff --git a/src/lib/modal/modal.module.ts b/src/lib/modal/modal.module.ts
@@ -1,19 +1,17 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { OverlayModule } from '@ptsecurity/cdk/overlay';
-
-import { CssUnitPipe } from '../core/pipes/css-unit.pipe';
 
-import { McButtonModule } from '../button';
-import { McIconModule } from '../icon';
+import { OverlayModule } from '@ptsecurity/cdk/overlay';
+import { McButtonModule } from '@ptsecurity/mosaic/button';
 
+import { CssUnitPipe } from './css-unit.pipe';
 import { McModalControlService } from './modal-control.service';
 import { McModalComponent } from './modal.component';
 import { McModalService } from './modal.service';
 
 
 @NgModule({
-    imports: [ CommonModule, OverlayModule, McButtonModule, McIconModule ],
+    imports: [ CommonModule, OverlayModule, McButtonModule ],
     exports: [ McModalComponent ],
     declarations: [ McModalComponent, CssUnitPipe ],
     entryComponents: [ McModalComponent ],

diff --git a/src/lib/modal/modal.service.ts b/src/lib/modal/modal.service.ts
@@ -96,7 +96,7 @@ export class McModalService {
             }; // Leave a empty function to close this modal by default
         }
 
-        options.mcModalType = ModalType.CONFIRM;
+        options.mcModalType = 'confirm';
         options.mcClassName = `mc-confirm mc-confirm-${confirmType} ${options.mcClassName || ''}`;
         options.mcMaskClosable = false;
 

diff --git a/src/lib/modal/modal.type.ts b/src/lib/modal/modal.type.ts
@@ -6,10 +6,7 @@ import { OverlayRef } from '@ptsecurity/cdk/overlay';
 export type OnClickCallback<T> = ((instance: T) => (false | void | {}) | Promise<false | void | {}>);
 
 // Different modal styles we have supported
-export enum ModalType {
-    DEFAULT = 'default',
-    CONFIRM = 'confirm'
-}
+export type ModalType = 'default' | 'confirm';
 
 // Subtypes of Confirm Modal
 export type ConfirmType = 'confirm' | 'info' | 'success' | 'error' | 'warning';

diff --git a/src/lib/modal/tsconfig.build.json b/src/lib/modal/tsconfig.build.json
@@ -4,7 +4,6 @@
         "public-api.ts"
     ],
     "angularCompilerOptions": {
-        "annotateForClosureCompiler": true,
         "strictMetadataEmit": true,
         "flatModuleOutFile": "index.js",
         "flatModuleId": "@ptsecurity/mosaic/modal",

diff --git a/src/lib/public-api.ts b/src/lib/public-api.ts
@@ -11,3 +11,4 @@ export * from '@ptsecurity/mosaic/checkbox';
 export * from '@ptsecurity/mosaic/progress-bar';
 export * from '@ptsecurity/mosaic/progress-spinner';
 export * from '@ptsecurity/mosaic/navbar';
+export * from '@ptsecurity/mosaic/modal';