Fix for a null pointer in the image viewer.

sedwards2009 · Mar 10, 2016 · 01cdee7 · 01cdee7
1 parent 05cbae8
commit 01cdee7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/domutils.ts b/src/domutils.ts
@@ -193,7 +193,11 @@ export function getShadowRoot(self: HTMLElement): ShadowRoot {
 }
 
 export function getShadowId(el: HTMLElement, id: string): HTMLElement {
-  return <HTMLElement> getShadowRoot(el).querySelector('#' + id);
+  const shadowRoot = getShadowRoot(el);
+  if (shadowRoot === null) {
+    return null;
+  }
+  return <HTMLElement> shadowRoot.querySelector('#' + id);
 }
 
 /**

diff --git a/src/viewers/imageviewer.ts b/src/viewers/imageviewer.ts
@@ -223,7 +223,9 @@ class EtImageViewer extends ViewerElement {
       this._adjustHeight(setterState.height);
 
       const containerDiv = domutils.getShadowId(this, ID_CONTAINER);
-      containerDiv.scrollTop = setterState.yOffset;
+      if (containerDiv !== null) {
+        containerDiv.scrollTop = setterState.yOffset;
+      }
     }
   }