Skip to content

Commit d770ce8

Browse files
authored
Merge pull request #61 from mledour/update_angular_9
Update angular 9
2 parents 83225c4 + a3793f6 commit d770ce8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+5622
-16228
lines changed

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
node_js:
3-
- "10"
3+
- "12"
44
dist: trusty
55
sudo: false
66

@@ -33,6 +33,9 @@ after_success:
3333
- cat coverage/lcov.info | coveralls
3434
- bash scripts/gh-pages.sh $TMPDIR/gh-pages $TRAVIS_BUILD_DIR/dist/angular-admin-lte-demo
3535

36+
before_install:
37+
- npm install -g yarn
38+
3639
before_deploy:
3740
- cp README.md LICENSE dist/angular-admin-lte
3841
- cd dist/angular-admin-lte

angular.json

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"build": {
1414
"builder": "@angular-devkit/build-angular:browser",
1515
"options": {
16+
"aot": true,
1617
"outputPath": "dist/angular-admin-lte-demo",
1718
"index": "src/index.html",
1819
"main": "src/main.ts",
@@ -38,6 +39,12 @@
3839
},
3940
"configurations": {
4041
"production": {
42+
"budgets": [
43+
{
44+
"type": "anyComponentStyle",
45+
"maximumWarning": "6kb"
46+
}
47+
],
4148
"fileReplacements": [
4249
{
4350
"replace": "src/environments/environment.ts",
@@ -140,7 +147,8 @@
140147
},
141148
"configurations": {
142149
"production": {
143-
"project": "library/angular-admin-lte/ng-package.prod.json"
150+
"project": "library/angular-admin-lte/ng-package.prod.json",
151+
"tsConfig": "library/angular-admin-lte/tsconfig.lib.prod.json"
144152
}
145153
}
146154
},
@@ -167,5 +175,8 @@
167175
}
168176
}
169177
},
170-
"defaultProject": "angular-admin-lte-demo"
171-
}
178+
"defaultProject": "angular-admin-lte-demo",
179+
"cli": {
180+
"packageManager": "yarn"
181+
}
182+
}
File renamed without changes.

library/angular-admin-lte/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-admin-lte",
3-
"version": "2.0.1",
3+
"version": "3.0.0",
44
"homepage": "https://github.com/mledour/angular-admin-lte#README.MD",
55
"author": {
66
"name": "Mik@",

library/angular-admin-lte/src/lib/accordion/accordion.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h4 class="box-title">
88
</a>
99
</h4>
1010
</div>
11-
<div class="panel-collapse" [mkCollapseAnimation]="accordion.isCollapsed" (mkCollapseAnimation.start)="collapseStart($event, accordion)" (mkCollapseAnimation.done)="collapseDone($event, accordion)">
11+
<div class="panel-collapse" [mkCollapseAnimation]="accordion.isCollapsed" (mkCollapseAnimation.start)="onCollapseStart($event, accordion)" (mkCollapseAnimation.done)="onCollapseDone($event, accordion)">
1212
<div [ngClass]="accordion.contentStyleClass" [mkFontColor]="accordion.contentColor">
1313
<ng-template [ngTemplateOutlet]="accordion.contentTemplateRef"></ng-template>
1414
</div>

library/angular-admin-lte/src/lib/accordion/accordion.component.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import { Subscription } from 'rxjs';
3535
template: '<ng-template #templateRef><ng-content></ng-content></ng-template>'
3636
})
3737
export class AccordionHeaderComponent {
38-
@ViewChild('templateRef') public templateRef: TemplateRef<any>;
38+
@ViewChild('templateRef', { static: true }) public templateRef: TemplateRef<any>;
3939
}
4040

4141

@@ -47,7 +47,7 @@ export class AccordionHeaderComponent {
4747
template: '<ng-template #templateRef><ng-content></ng-content></ng-template>'
4848
})
4949
export class AccordionContentComponent {
50-
@ViewChild('templateRef') public templateRef: TemplateRef<any>;
50+
@ViewChild('templateRef', { static: true }) public templateRef: TemplateRef<any>;
5151
}
5252

5353

@@ -73,10 +73,10 @@ export class AccordionComponent implements OnInit {
7373
@Input() public headerColorHover: string;
7474
@Input() public headerStyleClass = 'box-header with-border';
7575

76-
@ContentChild(AccordionHeaderComponent) public accordionHeaderComponent: AccordionHeaderComponent;
77-
@ContentChild(AccordionContentComponent) public accordionContentComponent: AccordionContentComponent;
76+
@ContentChild(AccordionHeaderComponent, /* TODO: add static flag */ {}) public accordionHeaderComponent: AccordionHeaderComponent;
77+
@ContentChild(AccordionContentComponent, /* TODO: add static flag */ {}) public accordionContentComponent: AccordionContentComponent;
7878

79-
@ViewChild('templateRef') public templateRef: TemplateRef<any>;
79+
@ViewChild('templateRef', { static: true }) public templateRef: TemplateRef<any>;
8080

8181
/**
8282
* @method ngOnInit
@@ -107,7 +107,7 @@ export class AccordionComponent implements OnInit {
107107
export class AccordionGroupComponent implements AfterContentInit, AfterViewInit, OnChanges, OnDestroy {
108108
private activeIndex: any = [0];
109109
// @TODO change types for listeners to all files
110-
private listeners: Array<Function> = [];
110+
private listeners: Array<() => void> = [];
111111
// @TODO change types for subscriptions to all files
112112
private subscriptions: Array<Subscription> = [];
113113

@@ -118,8 +118,8 @@ export class AccordionGroupComponent implements AfterContentInit, AfterViewInit,
118118
@Input() public isMultiple: boolean;
119119
@Input() public styleClass = 'box-group';
120120

121-
@Output() public onCollapseStart = new EventEmitter();
122-
@Output() public onCollapseDone = new EventEmitter();
121+
@Output() public collapseStart = new EventEmitter();
122+
@Output() public collapseDone = new EventEmitter();
123123

124124
@ContentChildren(AccordionComponent) public accordionComponents: QueryList<AccordionComponent>;
125125

@@ -209,7 +209,7 @@ export class AccordionGroupComponent implements AfterContentInit, AfterViewInit,
209209
public toggleAccordion(event: Event, toggleIndex: number): void {
210210
event.preventDefault();
211211

212-
const indexOf = this.activeIndex['indexOf'](toggleIndex);
212+
const indexOf = this.activeIndex.indexOf(toggleIndex);
213213
if (indexOf === -1) {
214214
if (this.isMultiple) {
215215
this.activeIndex.push(toggleIndex);
@@ -232,9 +232,9 @@ export class AccordionGroupComponent implements AfterContentInit, AfterViewInit,
232232
* @param event [description]
233233
* @param accordion [description]
234234
*/
235-
public collapseStart(event: AnimationEvent, accordion: AccordionComponent): void {
235+
public onCollapseStart(event: AnimationEvent, accordion: AccordionComponent): void {
236236
accordion.isCollapsing = true;
237-
this.onCollapseStart.emit({animationEvent: event, index: accordion.index});
237+
this.collapseStart.emit({animationEvent: event, index: accordion.index});
238238
}
239239

240240
/**
@@ -243,9 +243,9 @@ export class AccordionGroupComponent implements AfterContentInit, AfterViewInit,
243243
* @param event [description]
244244
* @param accordion [description]
245245
*/
246-
public collapseDone(event: AnimationEvent, accordion: AccordionComponent): void {
246+
public onCollapseDone(event: AnimationEvent, accordion: AccordionComponent): void {
247247
accordion.isCollapsing = false;
248-
this.onCollapseDone.emit({animationEvent: event, index: accordion.index});
248+
this.collapseDone.emit({animationEvent: event, index: accordion.index});
249249
}
250250

251251
/**

library/angular-admin-lte/src/lib/alert/alert.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div *ngIf="!removed" [mkCollapseAnimation]="remove" (mkCollapseAnimation.start)="collapseStart($event)" (mkCollapseAnimation.done)="collapseDone($event)">
1+
<div *ngIf="!removed" [mkCollapseAnimation]="remove" (mkCollapseAnimation.start)="onCollapseStart($event)" (mkCollapseAnimation.done)="onCollapseDone($event)">
22
<div [mkColor]="backgroundColor" mkColorProperty="background-color" [mkColorPrefix]="type" [mkFontColor]="color" [ngClass]="[styleClass, dismissibleClass, type]">
33
<button *ngIf="isDismissible" type="button" class="close" #removeButtonElement>&times;</button>
44
<ng-content></ng-content>

library/angular-admin-lte/src/lib/alert/alert.component.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ export class AlertComponent implements AfterViewInit, OnDestroy {
5353
}
5454
@Input() public styleClass = '';
5555

56-
@Output() public onCollapseStart = new EventEmitter();
57-
@Output() public onCollapseDone = new EventEmitter();
56+
@Output() public collapseStart = new EventEmitter();
57+
@Output() public collapseDone = new EventEmitter();
5858

5959
@ViewChild('removeButtonElement') private removeButtonElement: ElementRef;
6060
@ViewChild('containerElementRef', { read: ViewContainerRef }) private containerElementRef: ViewContainerRef;
@@ -107,22 +107,22 @@ export class AlertComponent implements AfterViewInit, OnDestroy {
107107
* @method collapseStart
108108
* @param event [description]
109109
*/
110-
public collapseStart(event: AnimationEvent): void {
111-
this.onCollapseStart.emit(event);
110+
public onCollapseStart(event: AnimationEvent): void {
111+
this.collapseStart.emit(event);
112112
}
113113

114114
/**
115115
* [collapseDone description]
116116
* @method collapseDone
117117
* @param event [description]
118118
*/
119-
public collapseDone(event: AnimationEvent): void {
119+
public onCollapseDone(event: AnimationEvent): void {
120120
if (event.toState === '1') {
121121
this.listeners = removeListeners(this.listeners);
122122
this.removed = true;
123123
this.viewContainerRef.clear();
124124
this.changeDetectorRef.detectChanges();
125125
}
126-
this.onCollapseDone.emit(event);
126+
this.collapseDone.emit(event);
127127
}
128128
}

library/angular-admin-lte/src/lib/animations/animations.directive.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class CollapseAnimationDirective implements OnInit, AfterContentInit, OnD
1111
private isCollapsed: boolean;
1212
private lastIsCollapsed: boolean;
1313
private transitioning: boolean;
14-
private listener: Function;
14+
private listener: () => void;
1515

1616
@Input() public collapseAnimationDuration = 350;
1717
@Input() public collapseAnimationTiming: string;
@@ -28,7 +28,9 @@ export class CollapseAnimationDirective implements OnInit, AfterContentInit, OnD
2828
}
2929
}
3030

31+
// tslint:disable-next-line:no-output-rename
3132
@Output('mkCollapseAnimation.start') public startEventEmitter = new EventEmitter();
33+
// tslint:disable-next-line:no-output-rename
3234
@Output('mkCollapseAnimation.done') public doneEventEmitter = new EventEmitter();
3335

3436

@@ -137,7 +139,7 @@ export class CollapseAnimationDirective implements OnInit, AfterContentInit, OnD
137139
const event: AnimationEvent = {
138140
element: this.elementRef.nativeElement,
139141
fromState: this.lastIsCollapsed === undefined ? 'void' : this.lastIsCollapsed ? '1' : '0',
140-
phaseName: phaseName,
142+
phaseName,
141143
toState: this.isCollapsed === undefined ? 'void' : this.isCollapsed ? '1' : '0',
142144
totalTime: this.collapseAnimationDuration,
143145
triggerName: 'mkCollapseAnimation'

library/angular-admin-lte/src/lib/box-info/box-info.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ export class BoxInfoComponent implements OnInit {
2727
@Input() public progressWidth: number;
2828
@Input() public styleClass = 'info-box';
2929

30-
@ContentChild(BoxInfoHeaderDirective) public boxInfoHeaderDirective: BoxInfoHeaderDirective;
31-
@ContentChild(BoxInfoFooterDirective) public boxInfoFooterDirective: BoxInfoFooterDirective;
32-
@ContentChild(BoxInfoContentDirective) public boxInfoContentDirective: BoxInfoContentDirective;
30+
@ContentChild(BoxInfoHeaderDirective, /* TODO: add static flag */ {}) public boxInfoHeaderDirective: BoxInfoHeaderDirective;
31+
@ContentChild(BoxInfoFooterDirective, /* TODO: add static flag */ {}) public boxInfoFooterDirective: BoxInfoFooterDirective;
32+
@ContentChild(BoxInfoContentDirective, /* TODO: add static flag */ {}) public boxInfoContentDirective: BoxInfoContentDirective;
3333

3434
/**
3535
* @method ngOnInit

0 commit comments

Comments
 (0)