fix(scrollView): ensure scroll element exists for event listeners

Related #6104
ionic-team · Jun 9, 2016 · 1188730 · 1188730
1 parent f049521
commit 1188730
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/util/scroll-view.ts b/src/util/scroll-view.ts
@@ -132,18 +132,20 @@ export class ScrollView {
     this._cb = onScrollCallback;
     this._pos = [];
 
-    this._el.addEventListener('touchstart', this._start.bind(this));
-    this._el.addEventListener('touchmove', this._move.bind(this));
-    this._el.addEventListener('touchend', this._end.bind(this));
-
-    this._el.parentElement.classList.add('js-scroll');
+    if (this._el) {
+      this._el.addEventListener('touchstart', this._start.bind(this));
+      this._el.addEventListener('touchmove', this._move.bind(this));
+      this._el.addEventListener('touchend', this._end.bind(this));
+      this._el.parentElement.classList.add('js-scroll');
+    }
 
     return () => {
-      this._el.removeEventListener('touchstart', this._start.bind(this));
-      this._el.removeEventListener('touchmove', this._move.bind(this));
-      this._el.removeEventListener('touchend', this._end.bind(this));
-
-      this._el.parentElement.classList.remove('js-scroll');
+      if (this._el) {
+        this._el.removeEventListener('touchstart', this._start.bind(this));
+        this._el.removeEventListener('touchmove', this._move.bind(this));
+        this._el.removeEventListener('touchend', this._end.bind(this));
+        this._el.parentElement.classList.remove('js-scroll');
+      }
     };
   }