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

Merge branch 'dev-tree-view' of https://github.com/Tibing/ng2-admin into Tibing-dev-tree-view

Browse source
This commit is contained in:
nixa 2016-07-12 12:06:10 +03:00
commit 0029160ee3
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/webpack.common.js
View file

@ -87,6 +87,7 @@ module.exports = {
loader: 'source-map-loader', loader: 'source-map-loader',
exclude: [ exclude: [
// these packages have problems with their sourcemaps // these packages have problems with their sourcemaps
helpers.root('node_modules/ng2-branchy'),
helpers.root('node_modules/rxjs') helpers.root('node_modules/rxjs')
] ]
} }

15
package.json
View file

@ -6,15 +6,16 @@
"homepage": "http://akveo.github.io/ng2-admin/", "homepage": "http://akveo.github.io/ng2-admin/",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@angular/common": "2.0.0-rc.3", "@angular/common": "2.0.0-rc.4",
"@angular/compiler": "2.0.0-rc.3", "@angular/compiler": "2.0.0-rc.4",
"@angular/core": "2.0.0-rc.3", "@angular/core": "2.0.0-rc.4",
"@angular/http": "2.0.0-rc.3", "@angular/http": "2.0.0-rc.4",
"@angular/platform-browser": "2.0.0-rc.3", "@angular/platform-browser": "2.0.0-rc.4",
"@angular/platform-browser-dynamic": "2.0.0-rc.3", "@angular/platform-browser-dynamic": "2.0.0-rc.4",
"@angular/platform-server": "2.0.0-rc.3", "@angular/platform-server": "2.0.0-rc.4",
"@angular/router": "3.0.0-alpha.8", "@angular/router": "3.0.0-alpha.8",
"@angular/router-deprecated": "2.0.0-rc.2", "@angular/router-deprecated": "2.0.0-rc.2",
"@angular/forms":"0.2.0",
"amcharts3": "github:amcharts/amcharts3", "amcharts3": "github:amcharts/amcharts3",
"ammap3": "github:amcharts/ammap3", "ammap3": "github:amcharts/ammap3",
"animate.css": "^3.5.1", "animate.css": "^3.5.1",

2
src/app/pages/components/components/treeView/treeView.component.ts
View file

@ -1,6 +1,6 @@
import {Component} from '@angular/core'; import {Component} from '@angular/core';
import {BranchyComponent, TreeModel} from 'ng2-branchy'; import {BranchyComponent, TreeModel} from 'ng2-branchy';
import {BaCard} from "../../../../theme/components/baCard/baCard.component"; import {BaCard} from '../../../../theme/components/baCard';
@Component({ @Component({
selector: 'tree-view', selector: 'tree-view',