Check for null and undefined in getScrollParent

Closes #91
shipshapecode · Jun 9, 2015 · 893b9ce · 893b9ce
1 parent 4d68702
commit 893b9ce
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "tether",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "homepage": "https://github.hubspot.com/tether",
   "authors": [
     "Zack Bloom <[email protected]>",

diff --git a/component.json b/component.json
@@ -1,7 +1,7 @@
 {
   "name": "tether",
   "repo": "HubSpot/tether",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A client-side library to make absolutely positioned elements attach to elements in the page efficiently.",
   "authors": [
     "Zack Bloom <[email protected]>",

diff --git a/dist/js/tether.js b/dist/js/tether.js
@@ -1,4 +1,4 @@
-/*! tether 1.0.1 */
+/*! tether 1.0.2 */
 
 (function(root, factory) {
   if (typeof define === 'function' && define.amd) {
@@ -37,7 +37,7 @@ function getScrollParent(el) {
       style = getComputedStyle(parent);
     } catch (err) {}
 
-    if (typeof style === 'undefined') {
+    if (typeof style === 'undefined' || style === null) {
       return parent;
     }
 

diff --git a/dist/js/tether.min.js b/dist/js/tether.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tether",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A client-side library to make absolutely positioned elements attach to elements in the page efficiently.",
   "authors": [
     "Zack Bloom <[email protected]>",

diff --git a/src/js/utils.js b/src/js/utils.js
@@ -17,7 +17,7 @@ function getScrollParent(el) {
       style = getComputedStyle(parent);
     } catch (err) {}
 
-    if (typeof style === 'undefined') {
+    if (typeof style === 'undefined' || style === null) {
       return parent;
     }