Commit 61af7f37 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
(cherry picked from commit 24a171a4)
parent d78f98f7
...@@ -338,6 +338,7 @@ ...@@ -338,6 +338,7 @@
\n \n
function switchToFullScreen(cm) {\n function switchToFullScreen(cm) {\n
element = $(\'#merge\')[0];\n element = $(\'#merge\')[0];\n
$("#history_select_container").hide()\n
$(cm.getWrapperElement()).css(\'height\', \'100%\');\n $(cm.getWrapperElement()).css(\'height\', \'100%\');\n
if((document.fullScreenElement &&\n if((document.fullScreenElement &&\n
document.fullScreenElement !== null) ||\n document.fullScreenElement !== null) ||\n
...@@ -360,6 +361,7 @@ ...@@ -360,6 +361,7 @@
function maximize() {\n function maximize() {\n
document.documentElement.style.overflow = "hidden";\n document.documentElement.style.overflow = "hidden";\n
$("#merge").addClass(\'maximize\');\n $("#merge").addClass(\'maximize\');\n
$("#history_select_container").hide()\n
\n \n
if(merge_mode_elem) {\n if(merge_mode_elem) {\n
$("#view").height("100%");\n $("#view").height("100%");\n
...@@ -396,6 +398,7 @@ ...@@ -396,6 +398,7 @@
\n \n
document.documentElement.style.overflow = "";\n document.documentElement.style.overflow = "";\n
$("#merge").removeClass(\'maximize\');\n $("#merge").removeClass(\'maximize\');\n
$("#history_select_container").show()\n
\n \n
if(merge_mode_elem) {\n if(merge_mode_elem) {\n
$(\'.CodeMirror-merge\').height(cm_merge_height);\n $(\'.CodeMirror-merge\').height(cm_merge_height);\n
......
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