Merge pull request #12 from nicky-lenaers/feature-testing

Feature Demo Setup

CHANGELOG.md

@@ -0,0 +1,114 @@
+<a name="0.2.1"></a>
+## 0.2.1 (2017-07-21)
+
+* Support for *ngIf ([c8567dc](https://github.com/nicky-lenaers/ngx-scroll-to/commit/c8567dc)), closes [#6](https://github.com/nicky-lenaers/ngx-scroll-to/issues/6)
+
+
+
+<a name="0.2.0"></a>
+# 0.2.0 (2017-07-21)
+
+* =Release 0.2.0 ([52ccdb7](https://github.com/nicky-lenaers/ngx-scroll-to/commit/52ccdb7))
+* Add Publish Script ([f755650](https://github.com/nicky-lenaers/ngx-scroll-to/commit/f755650))
+* Change Command for Publish Version ([deea855](https://github.com/nicky-lenaers/ngx-scroll-to/commit/deea855))
+* Fix Commit Message ([89d9669](https://github.com/nicky-lenaers/ngx-scroll-to/commit/89d9669))
+* Release 0.2.0 ([873baf5](https://github.com/nicky-lenaers/ngx-scroll-to/commit/873baf5))
+* Remove shell script ([362174a](https://github.com/nicky-lenaers/ngx-scroll-to/commit/362174a))
+* Reverse Script Order ([a34949b](https://github.com/nicky-lenaers/ngx-scroll-to/commit/a34949b))
+* Revert Version Update ([93490d1](https://github.com/nicky-lenaers/ngx-scroll-to/commit/93490d1))
+* Support for nested scrolling ([da68855](https://github.com/nicky-lenaers/ngx-scroll-to/commit/da68855)), closes [#2](https://github.com/nicky-lenaers/ngx-scroll-to/issues/2)
+* Update Packages ([9e3f592](https://github.com/nicky-lenaers/ngx-scroll-to/commit/9e3f592))
+* Update README ([54791de](https://github.com/nicky-lenaers/ngx-scroll-to/commit/54791de))
+* Update README ([5fc2e33](https://github.com/nicky-lenaers/ngx-scroll-to/commit/5fc2e33))
+* Update README ([e7a94c1](https://github.com/nicky-lenaers/ngx-scroll-to/commit/e7a94c1))
+* Update README ([8763ab2](https://github.com/nicky-lenaers/ngx-scroll-to/commit/8763ab2))
+* Update README ([72d0ce5](https://github.com/nicky-lenaers/ngx-scroll-to/commit/72d0ce5))
+* Update README ([f79b975](https://github.com/nicky-lenaers/ngx-scroll-to/commit/f79b975))
+
+
+
+<a name="0.1.7"></a>
+## 0.1.7 (2017-07-20)
+
+* 0.1.7 ([57ab364](https://github.com/nicky-lenaers/ngx-scroll-to/commit/57ab364))
+* Update README ([cd9e75f](https://github.com/nicky-lenaers/ngx-scroll-to/commit/cd9e75f))
+
+
+
+<a name="0.1.6"></a>
+## 0.1.6 (2017-07-20)
+
+* 0.1.6 ([78007b2](https://github.com/nicky-lenaers/ngx-scroll-to/commit/78007b2))
+* Update README ([54b6361](https://github.com/nicky-lenaers/ngx-scroll-to/commit/54b6361))
+
+
+
+<a name="0.1.5"></a>
+## 0.1.5 (2017-07-20)
+
+* 0.1.5 ([2184b68](https://github.com/nicky-lenaers/ngx-scroll-to/commit/2184b68))
+* Update Description ([3591eee](https://github.com/nicky-lenaers/ngx-scroll-to/commit/3591eee))
+* Update README ([c433029](https://github.com/nicky-lenaers/ngx-scroll-to/commit/c433029))
+
+
+
+<a name="0.1.4"></a>
+## 0.1.4 (2017-07-20)
+
+* 0.1.4 ([a5afa36](https://github.com/nicky-lenaers/ngx-scroll-to/commit/a5afa36))
+* Update Dependencies ([f199092](https://github.com/nicky-lenaers/ngx-scroll-to/commit/f199092))
+* Update README ([ed1438c](https://github.com/nicky-lenaers/ngx-scroll-to/commit/ed1438c))
+
+
+
+<a name="0.1.3"></a>
+## 0.1.3 (2017-07-20)
+
+* 0.1.3 ([47dc5c5](https://github.com/nicky-lenaers/ngx-scroll-to/commit/47dc5c5))
+* Added GitHub Release Script ([21e488a](https://github.com/nicky-lenaers/ngx-scroll-to/commit/21e488a))
+* Typo ([d5f14ae](https://github.com/nicky-lenaers/ngx-scroll-to/commit/d5f14ae))
+* Update README ([31a87cd](https://github.com/nicky-lenaers/ngx-scroll-to/commit/31a87cd))
+* Update README ([130b961](https://github.com/nicky-lenaers/ngx-scroll-to/commit/130b961))
+
+
+
+<a name="0.1.2"></a>
+## 0.1.2 (2017-07-20)
+
+* 0.1.2 ([5bafd90](https://github.com/nicky-lenaers/ngx-scroll-to/commit/5bafd90))
+* Update README ([3263e59](https://github.com/nicky-lenaers/ngx-scroll-to/commit/3263e59))
+* Update Version ([3bf4438](https://github.com/nicky-lenaers/ngx-scroll-to/commit/3bf4438))
+
+
+
+<a name="0.1.1"></a>
+## 0.1.1 (2017-07-20)
+
+* 0.1.1 ([667b923](https://github.com/nicky-lenaers/ngx-scroll-to/commit/667b923))
+* Export Interfaces ([67bc0a6](https://github.com/nicky-lenaers/ngx-scroll-to/commit/67bc0a6))
+* Update README ([b866300](https://github.com/nicky-lenaers/ngx-scroll-to/commit/b866300))
+* Update Version ([419b331](https://github.com/nicky-lenaers/ngx-scroll-to/commit/419b331))
+
+
+
+<a name="0.1.0"></a>
+# 0.1.0 (2017-07-20)
+
+* 0.1.0 ([4d8a5e2](https://github.com/nicky-lenaers/ngx-scroll-to/commit/4d8a5e2))
+* Added Types for Event ([6e9adcc](https://github.com/nicky-lenaers/ngx-scroll-to/commit/6e9adcc))
+* Update README ([5c948f9](https://github.com/nicky-lenaers/ngx-scroll-to/commit/5c948f9))
+* Update Version ([6679ef8](https://github.com/nicky-lenaers/ngx-scroll-to/commit/6679ef8))
+
+
+
+<a name="0.0.2"></a>
+## 0.0.2 (2017-07-20)
+
+* 0.0.2 ([7a3a6c2](https://github.com/nicky-lenaers/ngx-scroll-to/commit/7a3a6c2))
+* Initial commit ([743a391](https://github.com/nicky-lenaers/ngx-scroll-to/commit/743a391))
+* Proper Angular 4 Peer Dependency ([6af5014](https://github.com/nicky-lenaers/ngx-scroll-to/commit/6af5014))
+* Source Files ([15aa04c](https://github.com/nicky-lenaers/ngx-scroll-to/commit/15aa04c))
+* Update Version ([9aa506e](https://github.com/nicky-lenaers/ngx-scroll-to/commit/9aa506e))
+
+
+

README.md

@@ -192,4 +192,4 @@ This value allows you to control dynamic offsets based on the width of the devic
 [opt-dep-status-badge]: https://img.shields.io/david/optional/nicky-lenaers/ngx-scroll-to.svg?style=flat-square
 [opt-dep-status-badge-url]: https://david-dm.org/nicky-lenaers/ngx-scroll-to?type=optional
 [license-badge]: https://img.shields.io/npm/l/@nicky-lenaers/ngx-scroll-to.svg?style=flat-square
-[license-badge-url]: https://github.com/nicky-lenaers/ngx-scroll-to/blob/master/LICENSE
+[license-badge-url]: https://github.com/nicky-lenaers/ngx-scroll-to/blob/master/LICENSE

demo/app/app.component.html

@@ -0,0 +1,2 @@
+<h1>App Works!</h1>
+<h2>This demo is being worked on as we speak and will be available soon.</h2>

demo/app/app.component.scss

@@ -0,0 +1,3 @@
+:host {
+
+}

demo/app/app.component.ts

@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+@Component({
+    selector: 'my-app',
+	templateUrl: './app.component.html',
+	styleUrls: ['./app.component.scss']
+})
+export class AppComponent {
+
+	constructor() { }
+}

demo/app/app.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { AppComponent } from './app.component';
+import { ScrollToModule } from '../../src/scroll-to.module';
+
+@NgModule({
+	imports: [
+		ScrollToModule.forRoot(),
+		BrowserModule
+	],
+	declarations: [
+		AppComponent
+	],
+	bootstrap: [
+		AppComponent
+	]
+})
+export class AppModule { }

demo/index.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="ie=edge">
+	<title>Demo</title>
+</head>
+<body>
+	<my-app>
+		loading...
+	</my-app>
+</body>
+</html>

demo/main.ts

@@ -0,0 +1,6 @@
+import 'core-js';
+import 'zone.js/dist/zone';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { AppModule } from './app/app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);

demo/tsconfig.demo.json

@@ -0,0 +1,6 @@
+{
+	"extends": "../tsconfig.json",
+	"angularCompilerOptions": {
+		"entryModule": "./app/app.module#AppModule"
+	}
+}

package.json

@@ -1,19 +1,22 @@
 {
   "name": "@nicky-lenaers/ngx-scroll-to",
-  "version": "0.1.7",
+  "version": "0.2.1",
   "description": "Angular X Scroll To",
   "main": "dist/index.js",
   "scripts": {
-    "clean": "rimraf .tmp && rimraf dist",
-    "copy": "copyfiles -u 1 ./src/package.json dist && copyfiles README.md dist",
-    "transpile": "ngc",
-    "package": "rollup -c rollup.config.ts",
-    "minify": "uglifyjs dist/bundles/ngx-scroll-to.umd.js --screw-ie8 --compress --mangle --comments --output dist/bundles/ngx-scroll-to.umd.min.js",
+    "prebuild:demo": "npm run clean",
+    "build:demo": "webpack --progress --watch",
+    "serve": "webpack-dev-server",
     "build": "npm run clean && npm run transpile && npm run package && npm run minify && npm run copy",
     "prepublish": "npm run build",
     "publish": "cd ./dist && npm publish --access=public",
+    "copy": "copyfiles -u 1 ./src/package.json dist && copyfiles README.md dist",
+    "transpile": "ngc -p ./src/tsconfig.ngc.json",
+    "package": "rollup -c rollup.config.ts",
+    "minify": "uglifyjs dist/bundles/ngx-scroll-to.umd.js --screw-ie8 --compress --mangle --comments --output dist/bundles/ngx-scroll-to.umd.min.js",
     "changelog": "conventional-changelog -i CHANGELOG.md -s -r 0",
-    "test": "echo \"No test command\""
+    "test": "echo \"No test command\"",
+    "clean": "rimraf .tmp && rimraf dist"
   },
   "repository": {
     "type": "git",
@@ -52,13 +55,24 @@
   "devDependencies": {
     "@angular/compiler": "^4.0.0",
     "@angular/compiler-cli": "^4.0.0",
+    "@angular/platform-browser-dynamic": "^4.3.1",
+    "@ngtools/webpack": "^1.5.2",
     "@types/node": "^8.0.14",
+    "@types/webpack": "^3.0.4",
+    "@types/webpack-dev-server": "^2.4.0",
     "conventional-changelog-cli": "^1.3.2",
     "copyfiles": "^1.2.0",
+    "html-webpack-plugin": "^2.29.0",
+    "node-sass": "^4.5.3",
+    "raw-loader": "^0.5.1",
     "renamer": "^0.6.1",
     "rimraf": "^2.6.1",
     "rollup": "^0.45.2",
+    "sass-loader": "^6.0.6",
+    "ts-node": "^3.2.1",
     "typescript": "^2.3.4",
-    "uglify-js": "^3.0.16"
+    "uglify-js": "^3.0.16",
+    "webpack": "^3.3.0",
+    "webpack-dev-server": "^2.5.1"
   }
 }

scripts/prepublish.sh

@@ -46,6 +46,7 @@ eval "git tag ${PACKAGE_VERSION}"
 
 # Push
 git push
+git push --tags
 
 # Get Repo Name
 REPO=$(git config --local remote.origin.url|sed -n 's#.*/\([^.]*\)\.git#\1#p')

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nicky-lenaers/ngx-scroll-to",
-  "version": "0.1.7",
+  "version": "0.2.1",
   "description": "A simple Angular 4+ plugin enabling you to scroll to any element on your page and enhance scroll-based features in your app.",
   "main": "bundles/ngx-scroll-to.umd.min.js",
   "module": "index.js",

src/scroll-to.service.ts

@@ -70,6 +70,9 @@ export class ScrollToService {
 			// Skip Absolute Positioning
 			if (style.position === 'absolute') continue;
 
+			// Skip Hidden Overflow
+			if (style.overflow === 'hidden' || style.overflowY === 'hidden') continue;
+
 			// Return Body
 			if (parent.tagName === 'BODY') return parent;
 

src/statics/scroll-to-animation.ts

@@ -6,7 +6,7 @@ import { ScrollToAnimationOptions } from '../models/scroll-to-options.model';
 export class ScrollAnimation {
 
 	private _tick: number;
-	private _interval: NodeJS.Timer;
+	private _interval: any;
 	private _time_lapsed: number;
 	private _percentage: number;
 	private _position: number;

src/tsconfig.ngc.json

@@ -0,0 +1,43 @@
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "declaration": true,
+        "stripInternal": true,
+        "experimentalDecorators": true,
+        "strictNullChecks": false,
+        "noImplicitAny": true,
+        "module": "es2015",
+        "moduleResolution": "node",
+        "paths": {
+            "@angular/core": [
+                "node_modules/@angular/core"
+            ],
+            "@angular/common": [
+                "node_modules/@angular/common"
+            ],
+            "@angular/platform-browser": [
+                "node_modules/@angular/platform-browser"
+            ],
+            "rxjs/*": [
+                "node_modules/rxjs/*"
+            ]
+        },
+        "rootDir": "../src",
+        "outDir": "../dist",
+        "sourceMap": true,
+        "inlineSources": true,
+        "target": "es5",
+        "skipLibCheck": true,
+        "lib": [
+            "es2015",
+            "dom"
+        ]
+    },
+    "files": [
+        "../src/index.ts"
+    ],
+    "angularCompilerOptions": {
+        "genDir": "../.tmp",
+        "strictMetadataEmit": true
+    }
+}

tsconfig.json

@@ -1,43 +1,16 @@
 {
-    "compilerOptions": {
-        "baseUrl": ".",
-        "declaration": true,
-        "stripInternal": true,
-        "experimentalDecorators": true,
-        "strictNullChecks": false,
-        "noImplicitAny": true,
-        "module": "es2015",
-        "moduleResolution": "node",
-        "paths": {
-            "@angular/core": [
-                "node_modules/@angular/core"
-            ],
-            "@angular/common": [
-                "node_modules/@angular/common"
-            ],
-            "@angular/platform-browser": [
-                "node_modules/@angular/platform-browser"
-            ],
-            "rxjs/*": [
-                "node_modules/rxjs/*"
-            ]
-        },
-        "rootDir": "src",
-        "outDir": "dist",
-        "sourceMap": true,
-        "inlineSources": true,
-        "target": "es5",
-        "skipLibCheck": true,
-        "lib": [
-            "es2015",
-            "dom"
-        ]
-    },
-    "files": [
-        "./src/index.ts"
-    ],
-    "angularCompilerOptions": {
-        "genDir": ".tmp",
-        "strictMetadataEmit": true
-    }
+	"compilerOptions": {
+		"moduleResolution": "node",
+		"target": "es5",
+		"noImplicitAny": false,
+		"sourceMap": false,
+		"experimentalDecorators": true,
+		"emitDecoratorMetadata": true,
+		"lib": [
+			"es2016",
+			"dom"
+		],
+    "skipLibCheck": true,
+    "noStrictGenericChecks": true
+	}
 }