commit 86605da37a2d521e2f8dfd031347441fc548955a
| author | 斟酌 鵬兄 <tgckpg@gmail.com> |
|---|
| date | 2015-09-30T16:44:02Z |
|---|
| subject | Chrome fix |
|---|
commit 86605da37a2d521e2f8dfd031347441fc548955a
Author: 斟酌 鵬兄 <tgckpg@gmail.com>
Date: 2015-09-30T16:44:02Z
Chrome fix
---
botanjs/src/Components/MessageBox.css | 1 +
botanjs/src/Components/MessageBox.js | 17 +++++++++++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/botanjs/src/Components/MessageBox.css b/botanjs/src/Components/MessageBox.css
index b0702ae..8ce1ac2 100644
--- a/botanjs/src/Components/MessageBox.css
+++ b/botanjs/src/Components/MessageBox.css
@@ -48,6 +48,7 @@
/* This is to hide the scrollbar */
padding-right: 50%;
margin-right: -50%;
+ overflow-x: hidden;
overflow-y: scroll;
}
diff --git a/botanjs/src/Components/MessageBox.js b/botanjs/src/Components/MessageBox.js
index 1600e2a..c3a30a9 100644
--- a/botanjs/src/Components/MessageBox.js
+++ b/botanjs/src/Components/MessageBox.js
@@ -101,6 +101,16 @@
m_style.minHeight = m_style.opacity = m_style.height = 0;
// The interval in firefox seems independent to etablishing element style
// using heightTriggers-hack instead
+ var by = function( el )
+ {
+ var tRect = el.getBoundingClientRect();
+ return tRect.y || tRect.top;
+ };
+ var bh = function( el )
+ {
+ var tRect = el.getBoundingClientRect();
+ return tRect.height;
+ };
Trigger.height(
this.mbox, 0
, function()
@@ -115,10 +125,13 @@
m_style.marginTop = ( -0.5 * mHeight ) + "px";
m_style.opacity = 1;
- if( mHeight < ( bBox.getBoundingClientRect().y - bBox.previousSibling.getBoundingClientRect().y + bBoxHeight ) )
+ if( Math.floor( mHeight ) < Math.floor( by( bBox ) - by( bBox.parentNode ) + bBoxHeight ) )
{
m_style.height = "100%";
- this.innerBox.style.maxHeight = ( innerHeight - bBoxHeight ) + "px"
+ var resultH = innerHeight - bBoxHeight;
+ var maxResultH = mHeight - bBoxHeight - by( this.innerBox ) + by( this.mbox );
+ this.innerBox.style.maxHeight = ( resultH < maxResultH ? resultH : maxResultH ) + "px";
+ bBox.style.marginTop = "-1em";
}
}.bind( this )