fix(build): fix window not defined on An Universal (#5073)

* fix(build): fix window not defined on An Universal * fix(merge): resolve merge conflicts
valor-software · Mar 4, 2019 · 682d1f2 · 682d1f2
1 parent 604e0f7
commit 682d1f2
Showing 1 changed file with 28 additions and 24 deletions.
diff --git a/src/positioning/positioning.service.ts b/src/positioning/positioning.service.ts
@@ -1,6 +1,8 @@
-import { Injectable, ElementRef, RendererFactory2 } from '@angular/core';
+import { Injectable, ElementRef, RendererFactory2, Inject, PLATFORM_ID } from '@angular/core';
+import { isPlatformBrowser } from '@angular/common';
 
 import { positionElements } from './ng-positioning';
+
 import { fromEvent, merge, of, animationFrameScheduler, Subject } from 'rxjs';
 import { Options } from './models';
 
@@ -43,31 +45,33 @@ export interface PositioningOptions {
 export class PositioningService {
   options: Options;
   private update$$ = new Subject<null>();
-
-  private events$: any = merge(
-    fromEvent(window, 'scroll'),
-    fromEvent(window, 'resize'),
-    of(0, animationFrameScheduler),
-    this.update$$
-  );
-
   private positionElements = new Map();
 
-  constructor(rendererFactory: RendererFactory2) {
-    this.events$
-      .subscribe(() => {
-        this.positionElements
-          .forEach((positionElement: PositioningOptions) => {
-            positionElements(
-              _getHtmlElement(positionElement.target),
-              _getHtmlElement(positionElement.element),
-              positionElement.attachment,
-              positionElement.appendToBody,
-              this.options,
-              rendererFactory.createRenderer(null, null)
-            );
-          });
-      });
+  constructor(
+    rendererFactory: RendererFactory2,
+    @Inject(PLATFORM_ID) platformId: number
+  ) {
+    if (isPlatformBrowser(platformId)) {
+      merge(
+        fromEvent(window, 'scroll'),
+        fromEvent(window, 'resize'),
+        of(0, animationFrameScheduler),
+        this.update$$
+      )
+        .subscribe(() => {
+          this.positionElements
+            .forEach((positionElement: PositioningOptions) => {
+              positionElements(
+                _getHtmlElement(positionElement.target),
+                _getHtmlElement(positionElement.element),
+                positionElement.attachment,
+                positionElement.appendToBody,
+                this.options,
+                rendererFactory.createRenderer(null, null)
+              );
+            });
+        });
+    }
   }
 
   position(options: PositioningOptions): void {