rebase

mui · Feb 8, 2016 · a9091a4 · a9091a4
1 parent 0a5b594
commit a9091a4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/popover/popover.jsx b/src/popover/popover.jsx
@@ -243,8 +243,8 @@ const Popover = React.createClass({
     const a = {
       top: rect.top,
       left: rect.left,
-      width: el.offsetWidth,
-      height: el.offsetHeight,
+      width: rect.width,
+      height: rect.height,
     };
 
     a.right = rect.right || a.left + a.width;

diff --git a/src/render-to-layer.jsx b/src/render-to-layer.jsx
@@ -131,6 +131,7 @@ const RenderToLayer = React.createClass({
           this._layer.addEventListener('touchstart', this.onClickAway);
           this._layer.addEventListener('click', this.onClickAway);
           this._layer.style.position = 'absolute';
+          this._layer.style.background = 'rgba(0,0,0,0.3)';
           this._layer.style.zIndex = this.state.muiTheme.zIndex.layer;
         } else {
           setTimeout(() => {
@@ -139,11 +140,14 @@ const RenderToLayer = React.createClass({
           }, 0);
         }
       }
-
-      this._layer.style.top = document.body.scrollTop + 'px';
-      this._layer.style.height = document.body.clientHeight + 'px';
-      this._layer.style.left = document.body.scrollLeft + 'px';
-      this._layer.style.width = document.body.clientWidth + 'px';
+      const {documentElement, body} = document;
+      const top = window.pageYOffset || documentElement.scrollTop || body.scrollTop || 0;
+      const left = window.pageXOffset || documentElement.scrollLeft || body.scrollLeft || 0;
+
+      this._layer.style.top = `${top}px`;
+      this._layer.style.height = `${body.clientHeight}px`;
+      this._layer.style.left = `${left}px`;
+      this._layer.style.width = `${body.clientWidth}px`;
       // By calling this method in componentDidMount() and
       // componentDidUpdate(), you're effectively creating a "wormhole" that
       // funnels React's hierarchical updates through to a DOM node on an