Merge branch 'master' into Astro

This commit is contained in:
斟酌 鵬兄 2015-09-28 07:41:19 +08:00
commit be4d5c6ce2

View File

@ -115,7 +115,7 @@
m_style.marginTop = ( -0.5 * mHeight ) + "px";
m_style.opacity = 1;
if( mHeight < ( bBox.getBoundingClientRect().y - bBox.parentNode.getBoundingClientRect().y + bBoxHeight ) )
if( mHeight < ( bBox.getBoundingClientRect().y - bBox.previousSibling.getBoundingClientRect().y + bBoxHeight ) )
{
m_style.height = "100%";
this.innerBox.style.maxHeight = ( innerHeight - bBoxHeight ) + "px"