From 5f360a73a84455880f77dd6e9863b299320f142f Mon Sep 17 00:00:00 2001
From: nixa <4dmitr@gmail.com>
Date: Wed, 18 May 2016 16:45:01 +0300
Subject: [PATCH] scrollPosition - baScrollPosition
---
.../theme/components/pageTop/pageTop.component.ts | 4 ++--
src/app/theme/components/pageTop/pageTop.html | 2 +-
.../baScrollPosition.directive.ts} | 13 +++++++------
src/app/theme/directives/baScrollPosition/index.ts | 1 +
src/app/theme/directives/index.ts | 2 +-
src/app/theme/directives/scrollPosition/index.ts | 1 -
6 files changed, 12 insertions(+), 11 deletions(-)
rename src/app/theme/directives/{scrollPosition/scrollPosition.directive.ts => baScrollPosition/baScrollPosition.directive.ts} (60%)
create mode 100644 src/app/theme/directives/baScrollPosition/index.ts
delete mode 100644 src/app/theme/directives/scrollPosition/index.ts
diff --git a/src/app/theme/components/pageTop/pageTop.component.ts b/src/app/theme/components/pageTop/pageTop.component.ts
index e1593cf5..d797e065 100644
--- a/src/app/theme/components/pageTop/pageTop.component.ts
+++ b/src/app/theme/components/pageTop/pageTop.component.ts
@@ -3,13 +3,13 @@ import {Component, ViewEncapsulation} from '@angular/core';
import {AppState} from '../../../app.state';
import {ProfilePicturePipe} from '../../pipes';
import {MsgCenter} from '../../components/msgCenter';
-import {ScrollPosition} from '../../directives';
+import {BaScrollPosition} from '../../directives';
@Component({
selector: 'page-top',
styles: [require('./pageTop.scss')],
template: require('./pageTop.html'),
- directives: [MsgCenter, ScrollPosition],
+ directives: [MsgCenter, BaScrollPosition],
pipes: [ProfilePicturePipe],
encapsulation: ViewEncapsulation.None
})
diff --git a/src/app/theme/components/pageTop/pageTop.html b/src/app/theme/components/pageTop/pageTop.html
index c9f1a7fe..bd59c4af 100644
--- a/src/app/theme/components/pageTop/pageTop.html
+++ b/src/app/theme/components/pageTop/pageTop.html
@@ -1,4 +1,4 @@
-
ng2-admin
diff --git a/src/app/theme/directives/scrollPosition/scrollPosition.directive.ts b/src/app/theme/directives/baScrollPosition/baScrollPosition.directive.ts
similarity index 60%
rename from src/app/theme/directives/scrollPosition/scrollPosition.directive.ts
rename to src/app/theme/directives/baScrollPosition/baScrollPosition.directive.ts
index b8173b09..a78823b5 100644
--- a/src/app/theme/directives/scrollPosition/scrollPosition.directive.ts
+++ b/src/app/theme/directives/baScrollPosition/baScrollPosition.directive.ts
@@ -1,15 +1,16 @@
import {Directive, Input, Output, EventEmitter, HostListener} from '@angular/core';
@Directive({
- selector: '[scrollPosition]'
+ selector: '[baScrollPosition]'
})
-export class ScrollPosition {
- @Input() maxHeight:Number;
- @Output() scrollChange:EventEmitter
= new EventEmitter();
+export class BaScrollPosition {
- private _isScrolled:Boolean;
+ @Input() public maxHeight:number;
+ @Output() public scrollChange:EventEmitter = new EventEmitter();
- ngOnInit() {
+ private _isScrolled:boolean;
+
+ public ngOnInit():void {
this.onWindowScroll();
}
diff --git a/src/app/theme/directives/baScrollPosition/index.ts b/src/app/theme/directives/baScrollPosition/index.ts
new file mode 100644
index 00000000..0047dc1d
--- /dev/null
+++ b/src/app/theme/directives/baScrollPosition/index.ts
@@ -0,0 +1 @@
+export * from './baScrollPosition.directive.ts';
diff --git a/src/app/theme/directives/index.ts b/src/app/theme/directives/index.ts
index eec2a1e2..d7a13ac7 100644
--- a/src/app/theme/directives/index.ts
+++ b/src/app/theme/directives/index.ts
@@ -1,2 +1,2 @@
-export * from './scrollPosition';
+export * from './baScrollPosition';
export * from './baThemeRun';
diff --git a/src/app/theme/directives/scrollPosition/index.ts b/src/app/theme/directives/scrollPosition/index.ts
deleted file mode 100644
index e532f7f7..00000000
--- a/src/app/theme/directives/scrollPosition/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './scrollPosition.directive.ts';