From 359499729dd3b7ec8c562d2868b1a176578b83b3 Mon Sep 17 00:00:00 2001 From: shootermv Date: Thu, 16 Jun 2016 10:07:10 +0300 Subject: [PATCH 1/4] trying to fix issue sidebar angle icon no pointing up when expanded --- src/app/theme/components/baSidebar/baSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/theme/components/baSidebar/baSidebar.html b/src/app/theme/components/baSidebar/baSidebar.html index a393c8df..cdb4d344 100644 --- a/src/app/theme/components/baSidebar/baSidebar.html +++ b/src/app/theme/components/baSidebar/baSidebar.html @@ -14,7 +14,7 @@ {{ item.title }} - From 9312084fa47e50d3879ae8cbddb31247ff458402 Mon Sep 17 00:00:00 2001 From: nixa <4dmitr@gmail.com> Date: Wed, 29 Jun 2016 11:54:16 +0300 Subject: [PATCH 2/4] chore(angular): update angular to rc3 --- package.json | 20 ++++++++++---------- src/platform/environment.ts | 24 +++++++++++++++++++----- typings.json | 8 ++++---- 3 files changed, 33 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index cf510e1f..60107cbf 100644 --- a/package.json +++ b/package.json @@ -6,14 +6,14 @@ "homepage": "http://akveo.github.io/ng2-admin/", "license": "MIT", "dependencies": { - "@angular/common": "2.0.0-rc.2", - "@angular/compiler": "2.0.0-rc.2", - "@angular/core": "2.0.0-rc.2", - "@angular/http": "2.0.0-rc.2", - "@angular/platform-browser": "2.0.0-rc.2", - "@angular/platform-browser-dynamic": "2.0.0-rc.2", - "@angular/platform-server": "2.0.0-rc.2", - "@angular/router": "2.0.0-rc.2", + "@angular/common": "2.0.0-rc.3", + "@angular/compiler": "2.0.0-rc.3", + "@angular/core": "2.0.0-rc.3", + "@angular/http": "2.0.0-rc.3", + "@angular/platform-browser": "2.0.0-rc.3", + "@angular/platform-browser-dynamic": "2.0.0-rc.3", + "@angular/platform-server": "2.0.0-rc.3", + "@angular/router": "3.0.0-alpha.8", "@angular/router-deprecated": "2.0.0-rc.2", "amcharts3": "github:amcharts/amcharts3", "ammap3": "github:amcharts/ammap3", @@ -42,7 +42,7 @@ }, "devDependencies": { "angular2-hmr": "~0.7.0", - "awesome-typescript-loader": "^1.0.0", + "awesome-typescript-loader": "1.1.1", "codelyzer": "~0.0.19", "compression-webpack-plugin": "^0.3.1", "copy-webpack-plugin": "^3.0.1", @@ -71,7 +71,7 @@ "ts-node": "^0.9.0", "tslint": "^3.7.1", "tslint-loader": "^2.1.3", - "typedoc": "^0.4.2", + "typedoc": "^0.4.4", "typescript": "~1.8.9", "typings": "^1.0.5", "url-loader": "^0.5.7", diff --git a/src/platform/environment.ts b/src/platform/environment.ts index 252bc2ac..a1b1b4ee 100644 --- a/src/platform/environment.ts +++ b/src/platform/environment.ts @@ -1,25 +1,39 @@ // Angular 2 -import {enableProdMode} from '@angular/core'; - +// rc2 workaround +import { enableDebugTools, disableDebugTools } from '@angular/platform-browser'; +import { enableProdMode } from '@angular/core'; // Environment Providers -let PROVIDERS = []; +let PROVIDERS = [ + // common env directives +]; + +// Angular debug tools in the dev console +// https://github.com/angular/angular/blob/86405345b781a9dc2438c0fbe3e9409245647019/TOOLS_JS.md +let _decorateComponentRef = function identity(value) { return value; }; if ('production' === ENV) { // Production + disableDebugTools(); enableProdMode(); PROVIDERS = [ - ...PROVIDERS + ...PROVIDERS, + // custom providers in production ]; } else { + + _decorateComponentRef = (cmpRef) => enableDebugTools(cmpRef); + // Development PROVIDERS = [ - ...PROVIDERS + ...PROVIDERS, + // custom providers in development ]; } +export const decorateComponentRef = _decorateComponentRef; export const ENV_PROVIDERS = [ ...PROVIDERS diff --git a/typings.json b/typings.json index 73a8a4b6..7c44bf64 100644 --- a/typings.json +++ b/typings.json @@ -1,14 +1,14 @@ { "globalDependencies": { "angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459", - "core-js": "registry:dt/core-js#0.0.0+20160317120654", + "core-js": "registry:dt/core-js#0.0.0+20160602141332", "hammerjs": "registry:dt/hammerjs#2.0.4+20160417130828", - "jasmine": "registry:dt/jasmine#2.2.0+20160505161446", - "node": "registry:dt/node#6.0.0+20160514165920", + "jasmine": "registry:dt/jasmine#2.2.0+20160621224255", + "node": "registry:dt/node#6.0.0+20160621231320", "selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654", "source-map": "registry:dt/source-map#0.0.0+20160317120654", "uglify-js": "registry:dt/uglify-js#2.6.1+20160316155526", - "webpack": "registry:dt/webpack#1.12.9+20160321060707" + "webpack": "registry:dt/webpack#1.12.9+20160523035535" }, "dependencies": { "lodash": "registry:npm/lodash#4.0.0+20160416211519" From affc122a779b1a99a42778f1f9c998064155ad94 Mon Sep 17 00:00:00 2001 From: nixa <4dmitr@gmail.com> Date: Wed, 29 Jun 2016 12:01:38 +0300 Subject: [PATCH 3/4] fix(baSidebar): fix current selected menu --- .../baSidebar/baSidebar.component.ts | 6 +++--- .../components/baSidebar/baSidebar.service.ts | 19 +++++-------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/app/theme/components/baSidebar/baSidebar.component.ts b/src/app/theme/components/baSidebar/baSidebar.component.ts index 7cf37c05..929b4662 100644 --- a/src/app/theme/components/baSidebar/baSidebar.component.ts +++ b/src/app/theme/components/baSidebar/baSidebar.component.ts @@ -35,7 +35,7 @@ export class BaSidebar { private _state:AppState) { this.menuItems = this._sidebarService.getMenuItems(); - this._onRouteChange = this._router.root.subscribe((path) => this._selectMenuItem(path)); + this._onRouteChange = this._router.root.subscribe((path) => this._selectMenuItem()); this._state.subscribe('menu.isCollapsed', (isCollapsed) => { this.isMenuCollapsed = isCollapsed; }); @@ -113,9 +113,9 @@ export class BaSidebar { return window.innerWidth <= layoutSizes.resWidthCollapseSidebar; } - private _selectMenuItem(currentPath = null):void { + private _selectMenuItem():void { - let currentMenu = this._sidebarService.setRouter(this._router).selectMenuItem(this.menuItems, currentPath); + let currentMenu = this._sidebarService.setRouter(this._router).selectMenuItem(this.menuItems); this._state.notifyDataChanged('menu.activeLink', currentMenu); // hide menu after natigation on mobile devises if (this._shouldMenuCollapse()) { diff --git a/src/app/theme/components/baSidebar/baSidebar.service.ts b/src/app/theme/components/baSidebar/baSidebar.service.ts index 198811d8..7653aae1 100644 --- a/src/app/theme/components/baSidebar/baSidebar.service.ts +++ b/src/app/theme/components/baSidebar/baSidebar.service.ts @@ -15,19 +15,19 @@ export class BaSidebarService { return this; } - public selectMenuItem(items:Array, currentPath:string) { + public selectMenuItem(items:Array) { let currentMenu; let assignCurrent = (menu) => (menu.selected ? currentMenu = menu : null); items.forEach((menu: any) => { - this._selectItem(currentPath, [menu.component], menu); + this._selectItem([menu.component], menu); assignCurrent(menu); if (menu.subMenu) { menu.subMenu.forEach((subMenu) => { - this._selectItem(currentPath, [menu.component, subMenu.component], subMenu, menu); + this._selectItem([menu.component, subMenu.component], subMenu, menu); assignCurrent(subMenu); }); } @@ -35,9 +35,9 @@ export class BaSidebarService { return currentMenu; } - private _selectItem(currentPath, instructions, item, parentMenu = null) { + private _selectItem(instructions, item, parentMenu = null) { let route = this._generateRoute(instructions); - item.selected = !item.disabled && this._isCurrent(route) && this._resolvePath(route, '') == currentPath; + item.selected = !item.disabled && this._isCurrent(route); if (parentMenu) { parentMenu.expanded = parentMenu.expanded || item.selected; } @@ -50,13 +50,4 @@ export class BaSidebarService { private _generateRoute(instructions) { return instructions.filter(i => typeof i !== 'undefined').length > 0 ? this._router.generate(instructions) : null; } - - private _resolvePath(instruction, collected) { - if (instruction !== null) { - collected += instruction.urlPath + '/'; - return this._resolvePath(instruction.child, collected) - } else { - return collected.slice(0, -1); - } - } } From 9af0e22650c649242cb059b29c953aa53f0290d4 Mon Sep 17 00:00:00 2001 From: nixa <4dmitr@gmail.com> Date: Wed, 29 Jun 2016 12:16:06 +0300 Subject: [PATCH 4/4] chore(version): update version to 0.3.0 --- CHANGELOG.md | 21 +++++++++++++++++++-- package.json | 2 +- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2996acc..fc7360c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ + +# 0.3.0 (2016-06-29) + +### Bug Fixes + +* Sidebar menu angle fixed +* Sidebar menu selected item fixed + +### Features + +* Angular updated to rc.3 +* Dependencies updated accordingly + +### How to update + +* Remove `node_modules` and `typings` folders +* run `npm install` + # 0.2.1 (2016-06-21) @@ -19,5 +37,4 @@ ### How to update * Remove `node_modules` and `typings` folders -* run `npm install` - +* run `npm install` \ No newline at end of file diff --git a/package.json b/package.json index 60107cbf..a0b6d38f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ng2-admin", - "version": "0.2.1", + "version": "0.3.0", "description": "Angular 2 and Bootstrap 4 Admin Template.", "author": "akveo", "homepage": "http://akveo.github.io/ng2-admin/",