From fd8f21aaff51a8cfe0767c0e443aab700299a930 Mon Sep 17 00:00:00 2001 From: nixa <4dmitr@gmail.com> Date: Wed, 18 May 2016 17:19:24 +0300 Subject: [PATCH] pageTop -> baPageTop --- src/app/pages/pages.component.ts | 6 +++--- .../baMsgCenter/baMsgCenter.component.ts | 2 +- .../baPageTop.component.ts} | 16 ++++++++-------- .../pageTop.html => baPageTop/baPageTop.html} | 2 +- .../pageTop.scss => baPageTop/baPageTop.scss} | 0 src/app/theme/components/baPageTop/index.ts | 1 + src/app/theme/components/index.ts | 2 +- src/app/theme/components/pageTop/index.ts | 1 - 8 files changed, 15 insertions(+), 15 deletions(-) rename src/app/theme/components/{pageTop/pageTop.component.ts => baPageTop/baPageTop.component.ts} (72%) rename src/app/theme/components/{pageTop/pageTop.html => baPageTop/baPageTop.html} (97%) rename src/app/theme/components/{pageTop/pageTop.scss => baPageTop/baPageTop.scss} (100%) create mode 100644 src/app/theme/components/baPageTop/index.ts delete mode 100644 src/app/theme/components/pageTop/index.ts diff --git a/src/app/pages/pages.component.ts b/src/app/pages/pages.component.ts index 1047dbd7..9cfc9f38 100644 --- a/src/app/pages/pages.component.ts +++ b/src/app/pages/pages.component.ts @@ -1,7 +1,7 @@ import {Component, ViewEncapsulation} from '@angular/core'; import {RouteConfig} from '@angular/router-deprecated'; -import {PageTop, BaContentTop, Sidebar, BaBackTop} from '../theme/components'; +import {BaPageTop, BaContentTop, Sidebar, BaBackTop} from '../theme/components'; import {Dashboard} from './dashboard'; import {Ui} from './ui'; @@ -14,10 +14,10 @@ import {Tables} from './tables'; selector: 'pages', encapsulation: ViewEncapsulation.None, styles: [], - directives: [PageTop, Sidebar, BaContentTop, BaBackTop], + directives: [BaPageTop, Sidebar, BaContentTop, BaBackTop], template: ` - +
diff --git a/src/app/theme/components/baMsgCenter/baMsgCenter.component.ts b/src/app/theme/components/baMsgCenter/baMsgCenter.component.ts index 9baa9a6d..a06a5413 100644 --- a/src/app/theme/components/baMsgCenter/baMsgCenter.component.ts +++ b/src/app/theme/components/baMsgCenter/baMsgCenter.component.ts @@ -4,7 +4,7 @@ import {BaMsgCenterService} from './baMsgCenter.service'; import {BaProfilePicturePipe} from '../../pipes'; @Component({ - selector: 'msg-center', + selector: 'ba-msg-center', providers: [BaMsgCenterService], styles: [require('./baMsgCenter.scss')], template: require('./baMsgCenter.html'), diff --git a/src/app/theme/components/pageTop/pageTop.component.ts b/src/app/theme/components/baPageTop/baPageTop.component.ts similarity index 72% rename from src/app/theme/components/pageTop/pageTop.component.ts rename to src/app/theme/components/baPageTop/baPageTop.component.ts index f7295d41..205bb88a 100644 --- a/src/app/theme/components/pageTop/pageTop.component.ts +++ b/src/app/theme/components/baPageTop/baPageTop.component.ts @@ -6,17 +6,17 @@ import {BaMsgCenter} from '../../components/baMsgCenter'; import {BaScrollPosition} from '../../directives'; @Component({ - selector: 'page-top', - styles: [require('./pageTop.scss')], - template: require('./pageTop.html'), + selector: 'ba-page-top', + styles: [require('./baPageTop.scss')], + template: require('./baPageTop.html'), directives: [BaMsgCenter, BaScrollPosition], pipes: [BaProfilePicturePipe], encapsulation: ViewEncapsulation.None }) -export class PageTop { +export class BaPageTop { - isScrolled:Boolean = false; - isMenuCollapsed:boolean = false; + public isScrolled:boolean = false; + public isMenuCollapsed:boolean = false; constructor(private _state:AppState) { this._state.subscribe('menu.isCollapsed', (isCollapsed) => { @@ -24,12 +24,12 @@ export class PageTop { }); } - toggleMenu() { + public toggleMenu() { this.isMenuCollapsed = !this.isMenuCollapsed; this._state.notifyDataChanged('menu.isCollapsed', this.isMenuCollapsed); } - scrolledChanged(isScrolled) { + public scrolledChanged(isScrolled) { this.isScrolled = isScrolled; } } diff --git a/src/app/theme/components/pageTop/pageTop.html b/src/app/theme/components/baPageTop/baPageTop.html similarity index 97% rename from src/app/theme/components/pageTop/pageTop.html rename to src/app/theme/components/baPageTop/baPageTop.html index a537e1ac..1c2ef555 100644 --- a/src/app/theme/components/pageTop/pageTop.html +++ b/src/app/theme/components/baPageTop/baPageTop.html @@ -20,6 +20,6 @@
- + diff --git a/src/app/theme/components/pageTop/pageTop.scss b/src/app/theme/components/baPageTop/baPageTop.scss similarity index 100% rename from src/app/theme/components/pageTop/pageTop.scss rename to src/app/theme/components/baPageTop/baPageTop.scss diff --git a/src/app/theme/components/baPageTop/index.ts b/src/app/theme/components/baPageTop/index.ts new file mode 100644 index 00000000..308cccdc --- /dev/null +++ b/src/app/theme/components/baPageTop/index.ts @@ -0,0 +1 @@ +export * from './baPageTop.component.ts'; diff --git a/src/app/theme/components/index.ts b/src/app/theme/components/index.ts index e61d8d1d..2fd3e17a 100644 --- a/src/app/theme/components/index.ts +++ b/src/app/theme/components/index.ts @@ -1,4 +1,4 @@ -export * from './pageTop'; +export * from './baPageTop'; export * from './baMsgCenter'; export * from './sidebar'; export * from './baContentTop'; diff --git a/src/app/theme/components/pageTop/index.ts b/src/app/theme/components/pageTop/index.ts deleted file mode 100644 index f8243335..00000000 --- a/src/app/theme/components/pageTop/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './pageTop.component.ts';