Merge pull request #18 from k3nsei/develop

Release v.1.2.0-rc.3
k3nsei · Mar 30, 2017 · 9a35131 · 9a35131
2 parents 01bb988 + 821f6ab
commit 9a35131
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 15 deletions.
diff --git a/dist/in-viewport.module.d.ts b/dist/in-viewport.module.d.ts
@@ -1,4 +1,7 @@
 import { ModuleWithProviders } from "@angular/core";
+import { InViewportService } from "./in-viewport.service";
 export declare class InViewportModule {
+    private inViewportService;
     static forRoot(): ModuleWithProviders;
+    constructor(inViewportService: InViewportService);
 }
diff --git a/dist/in-viewport.module.js b/dist/in-viewport.module.js
diff --git a/dist/in-viewport.module.js.map b/dist/in-viewport.module.js.map
diff --git a/dist/in-viewport.service.d.ts b/dist/in-viewport.service.d.ts
@@ -12,4 +12,5 @@ export declare class InViewportService {
     protected findRegistryEntry(rootElement: Element): InViewportServiceRegistryObject;
     addTarget(target: Element, rootElement?: Element): void;
     removeTarget(target: Element, rootElement?: Element): void;
+    protected getRootElement(element: any): any;
 }
diff --git a/dist/in-viewport.service.js b/dist/in-viewport.service.js
diff --git a/dist/in-viewport.service.js.map b/dist/in-viewport.service.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-in-viewport",
-  "version": "1.2.0-rc.1",
+  "version": "1.2.0-rc.3",
   "description": "Allows us to check if an element is within the browsers visual viewport",
   "license": "MIT",
   "authors": [

diff --git a/src/in-viewport.module.ts b/src/in-viewport.module.ts
@@ -20,4 +20,6 @@ export class InViewportModule {
       ]
     };
   }
+
+  constructor(private inViewportService: InViewportService) {}
 }
diff --git a/src/in-viewport.service.ts b/src/in-viewport.service.ts
@@ -21,21 +21,19 @@ export class InViewportService {
   }
 
   protected findRegistryEntry(rootElement: Element) {
-    return this.registry.find((item) => item.rootElement === rootElement);
+    return this.registry.find((item) => item.rootElement === this.getRootElement(rootElement));
   }
 
   public addTarget(target: Element, rootElement?: Element): void {
     let registryEntry = this.findRegistryEntry(rootElement);
     if (!registryEntry) {
       const registryEntryObserverOptions: any = {
+        root: this.getRootElement(rootElement),
         threshold: Array(101).fill(void 0).map((item, i) => (i / 100))
       };
-      if (rootElement) {
-        registryEntryObserverOptions.root = rootElement;
-      }
       registryEntry = {
         targets: [target],
-        rootElement,
+        rootElement: this.getRootElement(rootElement),
         observer: new IntersectionObserver(
           (entries: IntersectionObserverEntry[]) => this.onChanges(entries),
           registryEntryObserverOptions
@@ -64,4 +62,8 @@ export class InViewportService {
       }
     }
   }
+
+  protected getRootElement(element: any) {
+    return (element && element.nodeType === 1) ? element : null;
+  }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,6 @@ export class InViewportModule { @@
           ]
         };
       }
+      constructor(private inViewportService: InViewportService) {}
     }