mirror of
https://github.com/richard-loafle/fuse-angular.git
synced 2025-01-10 04:25:08 +00:00
Fix: Angular 5 AoT issues
This commit is contained in:
parent
d2bfc152a0
commit
d9c36cad82
|
@ -7,8 +7,8 @@
|
||||||
"start": "ng serve",
|
"start": "ng serve",
|
||||||
"start-hmr": "ng serve --hmr -e=hmr -sm=false",
|
"start-hmr": "ng serve --hmr -e=hmr -sm=false",
|
||||||
"start-hmr-sourcemaps": "ng serve --hmr -e=hmr",
|
"start-hmr-sourcemaps": "ng serve --hmr -e=hmr",
|
||||||
"build": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build",
|
"build": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --dev",
|
||||||
"build-prod": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build --prod",
|
"build-prod": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --prod",
|
||||||
"test": "ng test",
|
"test": "ng test",
|
||||||
"lint": "ng lint",
|
"lint": "ng lint",
|
||||||
"e2e": "ng e2e"
|
"e2e": "ng e2e"
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import { Component, Input, OnInit } from '@angular/core';
|
import { Component, Input, OnInit } from '@angular/core';
|
||||||
import * as moment from 'moment';
|
import * as moment from 'moment';
|
||||||
import { Observable } from 'rxjs/Rx';
|
import { Observable } from 'rxjs/Observable';
|
||||||
|
import 'rxjs/add/observable/interval';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector : 'fuse-countdown',
|
selector : 'fuse-countdown',
|
||||||
|
|
|
@ -45,6 +45,7 @@ export class FuseConfigService
|
||||||
this.defaultSettings.customScrollbars = false;
|
this.defaultSettings.customScrollbars = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Set the settings from the default settings
|
||||||
this.settings = Object.assign({}, this.defaultSettings);
|
this.settings = Object.assign({}, this.defaultSettings);
|
||||||
|
|
||||||
// Reload the default settings on every navigation start
|
// Reload the default settings on every navigation start
|
||||||
|
@ -59,7 +60,6 @@ export class FuseConfigService
|
||||||
|
|
||||||
// Create the behavior subject
|
// Create the behavior subject
|
||||||
this.onSettingsChanged = new BehaviorSubject(this.settings);
|
this.onSettingsChanged = new BehaviorSubject(this.settings);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -68,7 +68,10 @@ export class FuseConfigService
|
||||||
*/
|
*/
|
||||||
setSettings(settings)
|
setSettings(settings)
|
||||||
{
|
{
|
||||||
|
// Set the settings from the given object
|
||||||
this.settings = Object.assign({}, this.settings, settings);
|
this.settings = Object.assign({}, this.settings, settings);
|
||||||
|
|
||||||
|
// Trigger the event
|
||||||
this.onSettingsChanged.next(this.settings);
|
this.onSettingsChanged.next(this.settings);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,6 @@ import { CalendarEvent } from 'angular-calendar';
|
||||||
import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
|
import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
|
||||||
import { CalendarEventModel } from '../event.model';
|
import { CalendarEventModel } from '../event.model';
|
||||||
import { MatColors } from '../../../../../core/matColors';
|
import { MatColors } from '../../../../../core/matColors';
|
||||||
import 'rxjs/Rx';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector : 'fuse-calendar-event-form-dialog',
|
selector : 'fuse-calendar-event-form-dialog',
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
import { Component, OnDestroy, OnInit } from '@angular/core';
|
import { Component, OnDestroy, OnInit } from '@angular/core';
|
||||||
import { ChatService } from '../../../chat.service';
|
import { ChatService } from '../../../chat.service';
|
||||||
import { FormControl, FormGroup } from '@angular/forms';
|
import { FormControl, FormGroup } from '@angular/forms';
|
||||||
import 'rxjs/Rx';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector : 'fuse-chat-user-sidenav',
|
selector : 'fuse-chat-user-sidenav',
|
||||||
|
|
|
@ -2,7 +2,6 @@ import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core';
|
||||||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
|
||||||
import { CalendarEvent } from 'angular-calendar';
|
import { CalendarEvent } from 'angular-calendar';
|
||||||
import { FormBuilder, FormGroup } from '@angular/forms';
|
import { FormBuilder, FormGroup } from '@angular/forms';
|
||||||
import 'rxjs/Rx';
|
|
||||||
import { Contact } from '../contact.model';
|
import { Contact } from '../contact.model';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
|
Loading…
Reference in New Issue
Block a user