mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 00:54:50 +01:00
Just re-ordering for better readability
This commit is contained in:
parent
3d1bdceaac
commit
0c0dc2c943
@ -100,22 +100,24 @@ 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")
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user