Merge pull request react-bootstrap#463 from martijnvermaat/use-ownerd…

…ocument Use .ownerDocument instead of root document
viktorrusakov · Mar 31, 2015 · 694b701 · 694b701
2 parents 560b0e8 + ee0382e
commit 694b701
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/src/AffixMixin.js b/src/AffixMixin.js
@@ -104,7 +104,7 @@ const AffixMixin = {
     this._onWindowScrollListener =
       EventListener.listen(window, 'scroll', this.checkPosition);
     this._onDocumentClickListener =
-      EventListener.listen(document, 'click', this.checkPositionWithEventLoop);
+      EventListener.listen(React.findDOMNode(this).ownerDocument, 'click', this.checkPositionWithEventLoop);
   },
 
   componentWillUnmount() {

diff --git a/src/DropdownStateMixin.js b/src/DropdownStateMixin.js
@@ -56,10 +56,12 @@ const DropdownStateMixin = {
   },
 
   bindRootCloseHandlers() {
+    let doc = React.findDOMNode(this).ownerDocument;
+
     this._onDocumentClickListener =
-      EventListener.listen(document, 'click', this.handleDocumentClick);
+      EventListener.listen(doc, 'click', this.handleDocumentClick);
     this._onDocumentKeyupListener =
-      EventListener.listen(document, 'keyup', this.handleDocumentKeyUp);
+      EventListener.listen(doc, 'keyup', this.handleDocumentKeyUp);
   },
 
   unbindRootCloseHandlers() {

diff --git a/src/FadeMixin.js b/src/FadeMixin.js
@@ -57,7 +57,7 @@ export default {
 
   componentWillUnmount: function () {
     let els = getElementsAndSelf(React.findDOMNode(this), ['fade']),
-        container = (this.props.container && React.findDOMNode(this.props.container)) || document.body;
+        container = (this.props.container && React.findDOMNode(this.props.container)) || React.findDOMNode(this).ownerDocument.body;
 
     if (els.length) {
       this._fadeOutEl = document.createElement('div');

diff --git a/src/Modal.js b/src/Modal.js
@@ -128,9 +128,9 @@ const Modal = React.createClass({
 
   componentDidMount() {
     this._onDocumentKeyupListener =
-      EventListener.listen(document, 'keyup', this.handleDocumentKeyUp);
+      EventListener.listen(React.findDOMNode(this).ownerDocument, 'keyup', this.handleDocumentKeyUp);
 
-    let container = (this.props.container && React.findDOMNode(this.props.container)) || document.body;
+    let container = (this.props.container && React.findDOMNode(this.props.container)) || React.findDOMNode(this).ownerDocument.body;
     container.className += container.className.length ? ' modal-open' : 'modal-open';
 
     if (this.props.backdrop) {
@@ -146,7 +146,7 @@ const Modal = React.createClass({
 
   componentWillUnmount() {
     this._onDocumentKeyupListener.remove();
-    let container = (this.props.container && React.findDOMNode(this.props.container)) || document.body;
+    let container = (this.props.container && React.findDOMNode(this.props.container)) || React.findDOMNode(this).ownerDocument.body;
     container.className = container.className.replace(/ ?modal-open/, '');
   },
 

diff --git a/src/OverlayMixin.js b/src/OverlayMixin.js
@@ -63,6 +63,6 @@ export default {
   },
 
   getContainerDOMNode() {
-    return React.findDOMNode(this.props.container || document.body);
+    return React.findDOMNode(this.props.container || React.findDOMNode(this).ownerDocument.body);
   }
 };
diff --git a/src/utils/domUtils.js b/src/utils/domUtils.js
@@ -21,7 +21,7 @@ function getOffset(DOMNode) {
     return window.jQuery(DOMNode).offset();
   }
 
-  let docElem = document.documentElement;
+  let docElem = DOMNode.ownerDocument.documentElement;
   let box = { top: 0, left: 0 };
 
   // If we don't have gBCR, just use 0,0 rather than error
@@ -89,7 +89,7 @@ function getPosition(elem, offsetParent) {
  * @returns {HTMLElement}
  */
 function offsetParentFunc(elem) {
-  let docElem = document.documentElement;
+  let docElem = elem.ownerDocument.documentElement;
   let offsetParent = elem.offsetParent || docElem;
 
   while ( offsetParent && ( offsetParent.nodeName !== 'HTML' &&