You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/11/28 12:18:26 UTC

svn commit: r721433 - /myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Window.js

Author: matzew
Date: Fri Nov 28 03:18:18 2008
New Revision: 721433

URL: http://svn.apache.org/viewvc?rev=721433&view=rev
Log:
TRINIDAD-1324 - Incorrect sizing of dialog when using frameset

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Window.js

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Window.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Window.js?rev=721433&r1=721432&r2=721433&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Window.js (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Window.js Fri Nov 28 03:18:18 2008
@@ -626,8 +626,11 @@
       newWidth += body.offsetWidth - body.clientWidth + 16;
       // add in the margins (MS bogusly uses Strings for these)
 
-      newHeight += parseInt(body.topMargin) + parseInt(body.bottomMargin);
-      newWidth  += parseInt(body.leftMargin) + parseInt(body.rightMargin);
+      if(body.tagName=='BODY')
+      {
+        newHeight += parseInt(body.topMargin) + parseInt(body.bottomMargin);
+        newWidth  += parseInt(body.leftMargin) + parseInt(body.rightMargin);
+      }
     }
     //
     // allow the size to be a little bigger than currently necessary.