Commit b40e0ef3 authored by Jérome Perrin's avatar Jérome Perrin

codemirror: hide the drop down to select history when maximized

The real motivation was to make sure that search match is displayed when searching with Ctrl+F / Ctrl+G

Conflicts:
	bt5/erp5_code_mirror/SkinTemplateItem/portal_skins/erp5_code_mirror/code_mirror_support.xml
parent 37dae6d4
...@@ -344,6 +344,7 @@ ...@@ -344,6 +344,7 @@
function switchToFullScreen(cm) { function switchToFullScreen(cm) {
element = $('#merge')[0]; element = $('#merge')[0];
$("#history_select_container").hide();
$(cm.getWrapperElement()).css('height', '100%'); $(cm.getWrapperElement()).css('height', '100%');
if((document.fullScreenElement && if((document.fullScreenElement &&
document.fullScreenElement !== null) || document.fullScreenElement !== null) ||
...@@ -366,6 +367,7 @@ ...@@ -366,6 +367,7 @@
function maximize() { function maximize() {
document.documentElement.style.overflow = "hidden"; document.documentElement.style.overflow = "hidden";
$("#merge").addClass('maximize'); $("#merge").addClass('maximize');
$("#history_select_container").hide();
if(merge_mode_elem) { if(merge_mode_elem) {
$("#view").height("100%"); $("#view").height("100%");
...@@ -402,6 +404,7 @@ ...@@ -402,6 +404,7 @@
document.documentElement.style.overflow = ""; document.documentElement.style.overflow = "";
$("#merge").removeClass('maximize'); $("#merge").removeClass('maximize');
$("#history_select_container").show();
if(merge_mode_elem) { if(merge_mode_elem) {
$('.CodeMirror-merge').height(cm_merge_height); $('.CodeMirror-merge').height(cm_merge_height);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment