diff --git a/package.json b/package.json index 73c59c23..0f051c4c 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "leaflet": "^0.7.7", "leaflet-map": "^0.2.1", "lodash": "^4.12.0", - "ng2-bootstrap": "1.1.16", + "ng2-bootstrap": "^1.3.0", "ng2-ckeditor": "1.0.7", "ng2-smart-table": "^0.3.2", "ng2-tree": "^0.0.2-7", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 77218e19..25441a4d 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -6,7 +6,6 @@ import { BaImageLoaderService, BaThemePreloader, BaThemeSpinner } from './theme/ import { layoutPaths } from './theme/theme.constants'; import { BaThemeConfig } from './theme/theme.config'; import { BaMenuService } from './theme'; -import {ComponentsHelper } from 'ng2-bootstrap'; import { MENU } from './app.menu'; /* @@ -37,8 +36,6 @@ export class App { this._menuService.updateMenuByRoutes(MENU); - this._fixModals(); - this._loadImages(); this._state.subscribe('menu.isCollapsed', (isCollapsed) => { @@ -57,26 +54,4 @@ export class App { // register some loaders BaThemePreloader.registerLoader(this._imageLoader.load(layoutPaths.images.root + 'sky-bg.jpg')); } - - private _fixModals(): void { - ComponentsHelper.prototype.getRootViewContainerRef = function () { - // https://github.com/angular/angular/issues/9293 - if (this.root) { - return this.root; - } - var comps = this.applicationRef.components; - if (!comps.length) { - throw new Error("ApplicationRef instance not found"); - } - try { - /* one more ugly hack, read issue above for details */ - var rootComponent = this.applicationRef._rootComponents[0]; - this.root = rootComponent._component.viewContainerRef; - return this.root; - } - catch (e) { - throw new Error("ApplicationRef instance not found"); - } - }; - } } diff --git a/src/app/pages/forms/forms.module.ts b/src/app/pages/forms/forms.module.ts index 40fe484c..0619f5a1 100644 --- a/src/app/pages/forms/forms.module.ts +++ b/src/app/pages/forms/forms.module.ts @@ -5,7 +5,7 @@ import { NgaModule } from '../../theme/nga.module'; import { routing } from './forms.routing'; -import { RatingModule } from 'ng2-bootstrap/ng2-bootstrap'; +import { RatingModule } from 'ng2-bootstrap'; import { Forms } from './forms.component'; import { Inputs } from './components/inputs'; import { Layouts } from './components/layouts'; @@ -28,7 +28,7 @@ import { WithoutLabelsForm } from './components/layouts/components/withoutLabels CommonModule, AngularFormsModule, NgaModule, - RatingModule, + RatingModule.forRoot(), routing ], declarations: [ diff --git a/src/app/pages/ui/ui.module.ts b/src/app/pages/ui/ui.module.ts index 83c4619e..5ed69b2b 100644 --- a/src/app/pages/ui/ui.module.ts +++ b/src/app/pages/ui/ui.module.ts @@ -4,7 +4,7 @@ import { FormsModule } from '@angular/forms'; import { NgaModule } from '../../theme/nga.module'; import { routing } from './ui.routing'; -import { DropdownModule, ModalModule } from 'ng2-bootstrap/ng2-bootstrap'; +import { DropdownModule, ModalModule } from 'ng2-bootstrap'; import { Ui } from './ui.component'; import { Buttons } from './components/buttons/buttons.component'; import { Grid } from './components/grid/grid.component'; @@ -28,8 +28,8 @@ import { IconsService } from './components/icons/icons.service'; CommonModule, FormsModule, NgaModule, - DropdownModule, - ModalModule, + DropdownModule.forRoot(), + ModalModule.forRoot(), routing ], declarations: [