Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-19 17:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "fix(bug): temporary fix for ng2-bootstrap modals (#493)"

Browse source 
This reverts commit ca89355e96.
This commit is contained in:
Xing 2017-01-10 11:05:44 -08:00
parent e315b1a4df
commit 1d31e75ced
2 changed files with 1 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -43,7 +43,7 @@
"leaflet": "^0.7.7", "leaflet": "^0.7.7",
"leaflet-map": "^0.2.1", "leaflet-map": "^0.2.1",
"lodash": "^4.12.0", "lodash": "^4.12.0",
"ng2-bootstrap": "1.1.16", "ng2-bootstrap": "1.1.14",
"ng2-ckeditor": "1.0.7", "ng2-ckeditor": "1.0.7",
"ng2-smart-table": "^0.3.2", "ng2-smart-table": "^0.3.2",
"ng2-tree": "^0.0.2-7", "ng2-tree": "^0.0.2-7",

25
src/app/app.component.ts
View file

@ -6,7 +6,6 @@ import { BaImageLoaderService, BaThemePreloader, BaThemeSpinner } from './theme/
import { layoutPaths } from './theme/theme.constants'; import { layoutPaths } from './theme/theme.constants';
import { BaThemeConfig } from './theme/theme.config'; import { BaThemeConfig } from './theme/theme.config';
import { BaMenuService } from './theme'; import { BaMenuService } from './theme';
import {ComponentsHelper } from 'ng2-bootstrap';
import { MENU } from './app.menu'; import { MENU } from './app.menu';
/* /*
@ -37,8 +36,6 @@ export class App {
this._menuService.updateMenuByRoutes(<Routes>MENU); this._menuService.updateMenuByRoutes(<Routes>MENU);
this._fixModals();
this._loadImages(); this._loadImages();
this._state.subscribe('menu.isCollapsed', (isCollapsed) => { this._state.subscribe('menu.isCollapsed', (isCollapsed) => {
@ -57,26 +54,4 @@ export class App {
// register some loaders // register some loaders
BaThemePreloader.registerLoader(this._imageLoader.load(layoutPaths.images.root + 'sky-bg.jpg')); 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");
}
};
}
} }