Merge pull request #36 from yahoo/checkcomponent

check component before detect viewport
yahoo · Jul 30, 2015 · 5b40e59 · 5b40e59
2 parents 3a5d9fe + ca8e414
commit 5b40e59
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/mixins/I13nMixin.js b/src/mixins/I13nMixin.js
@@ -119,6 +119,7 @@ var I13nMixin = {
         if (!this._getReactI13n()) {
             return;
         }
+        clearTimeout(pageInitViewportDetectionTimeout);
         this._createI13nNode();
         this._i13nNode.setReactComponent(this);
     },
@@ -306,7 +307,10 @@ var I13nMixin = {
         self._detectViewport(function detectCallback () {
             if (self._i13nNode.isInViewport()) {
                 self._i13nNode.getChildrenNodes().forEach(function detectChildrenViewport (childNode) {
-                    childNode.getReactComponent()._recursiveDetectViewport();
+                    var reactComponent = childNode.getReactComponent();
+                    if (reactComponent) {
+                        reactComponent._recursiveDetectViewport();
+                    }
                 });
             }
         });