diff --git a/bt5/erp5_ace_editor/SkinTemplateItem/portal_skins/erp5_ace_editor/ace_editor_support.xml b/bt5/erp5_ace_editor/SkinTemplateItem/portal_skins/erp5_ace_editor/ace_editor_support.xml index 232514b896043c3a949a2eb11ce5c92d27952164..06f512898845489a1fa3ae7e7d6c1e25dba2f76a 100644 --- a/bt5/erp5_ace_editor/SkinTemplateItem/portal_skins/erp5_ace_editor/ace_editor_support.xml +++ b/bt5/erp5_ace_editor/SkinTemplateItem/portal_skins/erp5_ace_editor/ace_editor_support.xml @@ -162,12 +162,12 @@ }\n \n function setContainerDivSize(event) {\n - width = $(window).innerWidth() - ace_editor_container_div.offset().left * 2 - 1;\n + width = $(window).width() - ace_editor_container_div.offset().left * 2 - 1;\n if(width < 200)\n width = 200;\n ace_editor_container_div.width(width);\n \n - height = $(window).innerHeight() - ace_editor_container_div.offset().top * 2 - 1;\n + height = $(window).height() - ace_editor_container_div.offset().top * 2 - 1;\n if(height < 400)\n height = 400;\n ace_editor_container_div.height(height);\n @@ -196,8 +196,8 @@ \n ace_editor_container_div.prependTo(body_element);\n ace_editor_container_div.addClass(\'maximize\');\n - ace_editor_container_div.width($(window).innerWidth());\n - ace_editor_container_div.height($(window).innerHeight());\n + ace_editor_container_div.width($(window).width());\n + ace_editor_container_div.height($(window).height());\n \n body_element.prepend(ace_editor_maximize_mode_message);\n ace_editor_maximize_mode_message.css(\'opacity\', 1.0);\n diff --git a/bt5/erp5_ace_editor/bt/change_log b/bt5/erp5_ace_editor/bt/change_log index d22eb6a9db20f59e7b583b21ee33168abaa9c404..ceed6d9926ae90ed7470c062b864414fbba68033 100644 --- a/bt5/erp5_ace_editor/bt/change_log +++ b/bt5/erp5_ace_editor/bt/change_log @@ -1,3 +1,6 @@ +2013-07-09 arnaud.fontaine +* ZODB Components: inner{Weight,Width} is not applicable to window document (from jQuery API). + 2013-07-09 arnaud.fontaine * ZODB Components: Update ace_editor to 1.1.01. diff --git a/bt5/erp5_ace_editor/bt/revision b/bt5/erp5_ace_editor/bt/revision index c7930257dfef505fd996e1d6f22f2f35149990d0..301160a93062df23030a69f4b5e4d9bf71866ee9 100644 --- a/bt5/erp5_ace_editor/bt/revision +++ b/bt5/erp5_ace_editor/bt/revision @@ -1 +1 @@ -7 \ No newline at end of file +8 \ No newline at end of file