Merge branch 'patch-2' of https://github.com/tremby/scrollparent.js into tremby-patch-2

Ola Holmström · Ola Holmström · commit dd25def14fa3 · 2017-04-09T18:38:51.000+02:00
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ npm install scrollparent --save
 ```js
 var Scrollparent = require("scrollparent");
 
-Scrollparent(document.getElementById("content")) // document.body
+Scrollparent(document.getElementById("content")) // HTMLHtmlElement or HTMLBodyElement as appropriate
 ```
 
 ```js
@@ -22,6 +22,20 @@ var Scrollparent = require("scrollparent");
 Scrollparent(document.getElementById("inside-a-scrolling-div")) // HTMLDivElement
 ```
 
+## Note about the root scrolling element
+
+Internally, the root scrolling element is determined in this library
+as the result of
+
+```js
+document.scrollingElement || document.htmlElement
+```
+
+This should give a usable result in most browsers today
+but if you want to ensure full support
+you should use a `document.scrollingElement` polyfill such as
+[this one](https://github.com/mathiasbynens/document.scrollingElement).
+
 ## Contributors
 
 * Ola Holmström (@olahol)
diff --git a/scrollparent.js b/scrollparent.js
@@ -40,7 +40,7 @@
       }
     }
 
-    return document.body;
+    return document.scrollingElement || document.documentElement;
   };
 
   return scrollParent;
diff --git a/test.html b/test.html
@@ -127,8 +127,8 @@
 
 equal(Scrollparent(document.getElementById("test1")).className, "scroll");
 
-equal(Scrollparent(document.getElementById("test2")), document.body);
-equal(Scrollparent(document.getElementById("test3")), document.body);
+equal(Scrollparent(document.getElementById("test2")), document.scrollingElement || document.documentElement);
+equal(Scrollparent(document.getElementById("test3")), document.scrollingElement || document.documentElement);
 
 equal(Scrollparent(document.getElementById("test4")).className, "scroll-y");
 equal(Scrollparent(document.getElementById("test5")).className, "scroll-x");

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`- return document.body;`
	`43`	`+ return document.scrollingElement \|\| document.documentElement;`
`44`	`44`	`};`
`45`	`45`
`46`	`46`	`return scrollParent;`