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 21650913b12a9ae7f760b4edd41044ee9c226407..b8c95bc50a7b6c9818cb395ba96997b5dfa1c647 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 @@ -89,7 +89,7 @@ top: 0 !important;\n left: 0 !important;\n z-index: 4242 !important;\n - overflow: auto !important;\n + overflow: hidden !important;\n }\n \n input.ace_editor_action_button {\n @@ -124,7 +124,7 @@ style="display: none;"></textarea>\n \n <div tal:attributes="id string:${container_div_id}"\n - style="width: 200px; height: 400px;\n + style="width: 200px; height: 400px; overflow: hidden !important;\n border: 1px solid #97B0D1; background-color: white !important;">\n <div style="position: relative !important; width: 100%; height: 100%;"\n tal:content="content"\n @@ -178,6 +178,7 @@ \n function unmaximize(event) {\n if(event.keyCode == 27) {\n + $(\'body\').css(\'overflow\', \'visible\');\n ace_editor_container_div.removeClass(\'maximize\');\n ace_editor_container_div.prependTo(ace_editor_container_div_parent_before_maximized);\n setContainerDivSize(event);\n @@ -185,20 +186,21 @@ }\n \n function maximize() {\n + body_element = $(\'body\');\n + body_element.css(\'overflow\', \'hidden\');\n +\n ace_editor_container_div_parent_before_maximized = ace_editor_container_div.parent();\n \n + ace_editor_container_div.prependTo(body_element);\n ace_editor_container_div.addClass(\'maximize\');\n - ace_editor_container_div.width($(window).width());\n - ace_editor_container_div.height($(window).height());\n -\n - body_element = $(\'body\');\n + ace_editor_container_div.width($(window).innerWidth());\n + ace_editor_container_div.height($(window).innerHeight());\n \n body_element.prepend(ace_editor_maximize_mode_message);\n ace_editor_maximize_mode_message.css(\'opacity\', 1.0);\n ace_editor_maximize_mode_message.animate({opacity: 0.25}, 1500,\n function() { $(this).remove(); });\n \n - ace_editor_container_div.prependTo(body_element);\n $(document).keyup(unmaximize);\n ace_editor.resize();\n }\n diff --git a/bt5/erp5_ace_editor/bt/change_log b/bt5/erp5_ace_editor/bt/change_log index c3a1d098df5908671553e334794316a96643a671..6613ab37c33b36e06f4845a8eac5ca8fa3db2603 100644 --- a/bt5/erp5_ace_editor/bt/change_log +++ b/bt5/erp5_ace_editor/bt/change_log @@ -1,3 +1,6 @@ +2012-02-11 arnaud.fontaine +* Do not show overflow on maximized mode as scrollbars are handled by Ace itself. + 2012-02-11 arnaud.fontaine * Add full-screen class meaningful when this will be accepted by W3C. diff --git a/bt5/erp5_ace_editor/bt/revision b/bt5/erp5_ace_editor/bt/revision index e440e5c842586965a7fb77deda2eca68612b1f53..bf0d87ab1b2b0ec1a11a3973d2845b42413d9767 100644 --- a/bt5/erp5_ace_editor/bt/revision +++ b/bt5/erp5_ace_editor/bt/revision @@ -1 +1 @@ -3 \ No newline at end of file +4 \ No newline at end of file