[Erp5-report] r43157 ivan - in /erp5/trunk/bt5/erp5_xhtml_jquery_style: SkinTemplateItem/po...

[nobody at svn.erp5.org]

Author: ivan
Date: Tue Feb  8 10:22:32 2011
New Revision: 43157

URL: http://svn.erp5.org?rev=43157&view=rev
Log:
Do not try to set inner object size if it's not already loaded.

Modified:
    erp5/trunk/bt5/erp5_xhtml_jquery_style/SkinTemplateItem/portal_skins/erp5_xhtml_jquery_style/erp5.js.xml
    erp5/trunk/bt5/erp5_xhtml_jquery_style/bt/revision

Modified: erp5/trunk/bt5/erp5_xhtml_jquery_style/SkinTemplateItem/portal_skins/erp5_xhtml_jquery_style/erp5.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_xhtml_jquery_style/SkinTemplateItem/portal_skins/erp5_xhtml_jquery_style/erp5.js.xml?rev=43157&r1=43156&r2=43157&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_xhtml_jquery_style/SkinTemplateItem/portal_skins/erp5_xhtml_jquery_style/erp5.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_xhtml_jquery_style/SkinTemplateItem/portal_skins/erp5_xhtml_jquery_style/erp5.js.xml [utf8] Tue Feb  8 10:22:32 2011
@@ -221,8 +221,9 @@ var resizeIFrameOnLoad = function() {\n
   var object_list = $("object.auto_height");\n
   for( var i=0; i<object_list.length; i++) {\n
     var object_document = object_list[i];\n
-    var doc = object_document.contentDocument.documentElement;\n
-    object_document.style.height = doc.offsetHeight + \'px\';\n
+    var inner_frame = object_document.contentDocument;\n
+    if (inner_frame){\n
+      object_document.style.height = inner_frame.documentElement.offsetHeight + \'px\';}\n
   }\n
 }\n
 \n

Modified: erp5/trunk/bt5/erp5_xhtml_jquery_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_xhtml_jquery_style/bt/revision?rev=43157&r1=43156&r2=43157&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_xhtml_jquery_style/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_xhtml_jquery_style/bt/revision [utf8] Tue Feb  8 10:22:32 2011
@@ -1 +1 @@
-12
\ No newline at end of file
+14
\ No newline at end of file