Code and dependency cleanup, fixes tsc errors #32

Author: Nolanus

ng2-page-scroll.ts

@@ -1,6 +1,7 @@
 export * from './src/ng2-page-scroll.directive';
 export * from './src/ng2-page-scroll.service';
-export * from './src/ng2-page-scroll-instance';
 export * from './src/ng2-page-scroll-config';
+export * from './src/ng2-page-scroll-instance';
+export * from './src/ng2-page-scroll-util.service';
 
 export {Ng2PageScrollModule} from './src/ng2-page-scroll.module';

package.json

@@ -55,7 +55,7 @@
     "@angular/platform-browser-dynamic": "2.0.0-rc.5",
     "@angular/router": "3.0.0-rc.1",
     "codelyzer": "^0.0.28",
-    "jasmine": "^2.4.1",
+    "jasmine": "^2.5.1",
     "protractor": "~4.0.4",
     "rxjs": "5.0.0-beta.6",
     "systemjs-builder": "^0.15.0",

src/ng2-page-scroll-instance.ts

@@ -203,12 +203,9 @@ export class PageScrollInstance {
      * @returns {HTMLElement}
      */
     public extractScrollTargetPosition(): {top: number, left: number} {
-        // FIXME This propably does not return the correct values of the element is inside another
-        // div and should be "inline/nested scrolled"
-
         let scrollTargetElement: HTMLElement;
         if (typeof this._scrollTarget === 'string') {
-            scrollTargetElement = this.document.getElementById(this._scrollTarget.substr(1));
+            scrollTargetElement = this.document.getElementById((<string>this._scrollTarget).substr(1));
         } else {
             scrollTargetElement = <HTMLElement>this._scrollTarget;
         }
@@ -228,17 +225,7 @@ export class PageScrollInstance {
      * @returns {number}
      */
     public getCurrentOffset(): number {
-
-        return this._offset; /* + this._scrollTopSources.reduce((previousOffset: number, scrollingView) => {
-
-                let scrollingViewTop = PageScrollUtilService.extractElementPosition(this.document, scrollingView).top;
-
-                if (previousOffset !== 0 && previousOffset !== scrollingViewTop) {
-                    console.warn('Using multiple scrollViews, but having different offsetTop values!');
-                    console.warn('Will silently ignore it and override previous top distance value');
-                }
-                return scrollingViewTop;
-            }, 0);*/
+        return this._offset;
     }
 
     /**

src/ng2-page-scroll-util.service.ts

@@ -18,9 +18,11 @@ export class PageScrollUtilService {
         let body = document.body;
         let docEl = document.documentElement;
 
-        let window = document.defaultView || {pageYOffset: undefined, pageXOffset: undefined};
-        let scrollTop = window.pageYOffset || docEl.scrollTop || body.scrollTop;
-        let scrollLeft = window.pageXOffset || docEl.scrollLeft || body.scrollLeft;
+        let windowPageYOffset: number = document.defaultView && document.defaultView.pageYOffset || undefined;
+        let windowPageXOffset: number = document.defaultView && document.defaultView.pageXOffset || undefined;
+
+        let scrollTop = windowPageYOffset || docEl.scrollTop || body.scrollTop;
+        let scrollLeft = windowPageXOffset || docEl.scrollLeft || body.scrollLeft;
 
         let clientTop = docEl.clientTop || body.clientTop || 0;
         let clientLeft = docEl.clientLeft || body.clientLeft || 0;

src/ng2-page-scroll.service.ts

@@ -79,7 +79,6 @@ export class PageScrollService {
         let pageScrollOffset = pageScrollInstance.getCurrentOffset();
 
         // Calculate the target position that the scroll animation should go to
-        // FIXME: Target scrolltop needs to be relative to the parent, not to the document root
         pageScrollInstance.targetScrollTop = Math.round(pageScrollInstance.extractScrollTargetPosition().top - pageScrollOffset);
 
         // Calculate the distance we need to go in total

test/e2e/home.spec.ts

@@ -6,19 +6,19 @@ describe('Dashboard page', () => {
         browser.get('/');
     });
 
-    function getScrollPos(): any {
+    function getScrollPos(): Promise<number> {
         return browser.driver.executeScript('return window.pageYOffset;');
     }
 
     it('should scroll to first heading', () => {
         let firstHeading: any = element(by.css('#anchor1'));
         let firstHeadingLink: any = element(by.css('a[href="#anchor1"]'));
         firstHeading.getLocation().then((headingLocation: any) => {
-            getScrollPos().then((initialPos) => {
+            getScrollPos().then((initialPos: number) => {
                 expect(initialPos).toEqual(0);
                 firstHeadingLink.click().then(() => {
                     browser.sleep(1250).then(() => {
-                        getScrollPos().then((pos) => {
+                        getScrollPos().then((pos: number) => {
                             expect(Math.round(pos)).toBe(Math.round(headingLocation.y));
                         });
                     });

tsconfig.json

@@ -9,7 +9,7 @@
     "removeComments": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "noImplicitAny": false,
+    "noImplicitAny": true,
     "noImplicitReturns": true,
     "listFiles": false,
     "noLib": false

typings.json

@@ -1,12 +1,5 @@
 {
-  "dependencies": {},
-  "devDependencies": {},
   "globalDependencies": {
-    "core-js": "registry:dt/core-js#0.0.0+20160725163759",
-    "zone.js": "registry:dt/zone.js#0.0.0+20160316155526"
-  },
-  "globalDevDependencies": {
-    "jasmine": "registry:dt/jasmine#2.2.0+20160621224255",
-    "node": "registry:dt/node#6.0.0+20160831021119"
+    "core-js": "registry:dt/core-js#0.0.0+20160725163759"
   }
 }