holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Just re-ordering for better readability

Browse Source
This commit is contained in:
Nathan Gray 2013-10-03 12:53:58 +00:00
parent 3d1bdceaac
commit 0c0dc2c943
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
etemplate/js/et2_extension_nextmatch_dynheight.js
View File

@ -100,21 +100,23 @@ var et2_dynheight = Class.extend(
var bh = Math.max(0,bmaxBot - bminTop);
// Calculate the new height of the inner container
var w = this.innerNode.width();
var h = Math.max(this.minHeight, oh + ot - it - bh -
this.innerMargin - this.outerMargin);
this.innerNode.height(h);
// Update the width
// Some checking to make sure it doesn't overflow the width when user
// resizes the window
if(w > this.outerNode.width())
{
w = this.outerNode.width();
}
var w = this.outerNode.width();
if (w > $j(window).width())
{
// 50px border, totally arbitrary, but we just need to make sure it's inside
w = $j(window).width()-50;
}
var h = Math.max(this.minHeight, oh + ot - it - bh -
this.innerMargin - this.outerMargin);
this.innerNode.height(h);
if(w != this.innerNode.outerWidth())
{
this.innerNode.width(w);
}
// Call the callback function
if (typeof _callback != "undefined")