Merge pull request #892 from radiolips/bugfix/891

Don't access `scrollEl` until it's been checked for `null`. Fixes #891.
gridstack · May 22, 2018 · d46ba76 · d46ba76
2 parents c25773a + 8cefcb0
commit d46ba76
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/dist/gridstack.all.js b/dist/gridstack.all.js
diff --git a/dist/gridstack.js b/dist/gridstack.js
@@ -1,5 +1,5 @@
 /**
- * gridstack.js 0.4.0
+ * gridstack.js 1.0.0-dev
  * http://troolee.github.io/gridstack.js/
  * (c) 2014-2018 Pavel Reznikov, Dylan Weiss
  * gridstack.js may be freely distributed under the MIT license.
@@ -150,8 +150,8 @@
                 var offsetDiffDown = rect.bottom - innerHeightOrClientHeight;
                 var offsetDiffUp = rect.top;
                 var scrollEl = Utils.getScrollParent(el);
-                var prevScroll = scrollEl.scrollTop;
                 if (scrollEl != null) {
+                    var prevScroll = scrollEl.scrollTop;
                     if (rect.top < 0 && distance < 0) {
                         // moving up
                         if (el.offsetHeight > innerHeightOrClientHeight) {
@@ -1171,6 +1171,8 @@
                         self._updateContainerHeight();
 
                         node._temporaryRemoved = true;
+                    } else {
+                        return;
                     }
                 } else {
                     self._clearRemovingTimeout(el);

diff --git a/dist/gridstack.min.js b/dist/gridstack.min.js
diff --git a/dist/gridstack.min.map b/dist/gridstack.min.map
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -21,6 +21,7 @@ Change log
 
 ## v0.1.0 (development)
 
+- don't throw error if no bounding scroll element is found ([#891](https://github.com/troolee/gridstack.js/issues/891)).
 - don't push locked widgets even if they are at the top of the grid ([#882](https://github.com/troolee/gridstack.js/issues/882)).
 
 ## v0.4.0

diff --git a/src/gridstack.js b/src/gridstack.js
@@ -150,8 +150,8 @@
                 var offsetDiffDown = rect.bottom - innerHeightOrClientHeight;
                 var offsetDiffUp = rect.top;
                 var scrollEl = Utils.getScrollParent(el);
-                var prevScroll = scrollEl.scrollTop;
                 if (scrollEl != null) {
+                    var prevScroll = scrollEl.scrollTop;
                     if (rect.top < 0 && distance < 0) {
                         // moving up
                         if (el.offsetHeight > innerHeightOrClientHeight) {