From dfd963af7c0a89d7655dadcc72a16d6cbdf14657 Mon Sep 17 00:00:00 2001
From: chaideqing <chaideqing@easycorp.ltd>
Date: Wed, 27 Dec 2023 11:03:48 +0800
Subject: [PATCH] * Fix bug #42422.

---
 module/doc/css/view.css          | 3 +--
 module/doc/js/view.js            | 4 ++--
 module/doc/view/content.html.php | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/module/doc/css/view.css b/module/doc/css/view.css
index ec32c34aa3..7efd45fa51 100644
--- a/module/doc/css/view.css
+++ b/module/doc/css/view.css
@@ -1,4 +1,3 @@
-.h-full-adjust {overflow-y: auto; height: calc(100vh - 125px);}
 .main-col .block-files .panel-heading {padding-right: 20px;}
 .main-col .block-files .panel-heading .panel-title {height: 35px; line-height: 30px;}
 
@@ -55,7 +54,6 @@
 .flex-auto {flex: auto;}
 .flex-full > .panel {box-shadow: none;}
 .float-r {float: right;}
-.h-full {height: 100%;}
 .w-full {width: 100%;}
 .overflow-x-auto {overflow-x: auto;}
 .overflow-auto {overflow: auto;}
@@ -122,3 +120,4 @@
 .history-btn:focus {background-color: rgba(255,255,255,.8)}
 
 #actionbox {margin-left: 30px;}
+#diffContain .CodeMirror.cm-s-paper.CodeMirror-wrap {overflow-y: hidden; height: calc(100vh - 230px);}
diff --git a/module/doc/js/view.js b/module/doc/js/view.js
index 0a4a83bc3c..65ade788fc 100644
--- a/module/doc/js/view.js
+++ b/module/doc/js/view.js
@@ -1,7 +1,5 @@
 $(function()
 {
-    if($.cookie('isFullScreen') == 1) fullScreen();
-
     $('.menu-actions > a').click(function()
     {
         $(this).parent().hasClass('open') ? $(this).css('background', 'none') : $(this).css('background', '#f1f1f1');
@@ -82,6 +80,7 @@ function fullScreen()
             $('#content .file-image .right-icon').addClass('hidden');
             $('#content .detail').eq(1).addClass('hidden');
             $.cookie('isFullScreen', 1);
+            $('#diffContain .CodeMirror.cm-s-paper.CodeMirror-wrap').css('height', 'calc(100vh - 120px)');
         };
 
         var whenFailEnterFullscreen = function(error)
@@ -125,6 +124,7 @@ function exitFullScreen()
     $('#content .detail').eq(1).removeClass('hidden');
     $('.main-col iframe').css('min-height', '380px');
     $.cookie('isFullScreen', 0);
+    $('#diffContain .CodeMirror.cm-s-paper.CodeMirror-wrap').css('height', 'calc(100vh - 230px)');
 }
 
 document.addEventListener('fullscreenchange', function (e)
diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php
index ed5fb65155..60037efb0f 100644
--- a/module/doc/view/content.html.php
+++ b/module/doc/view/content.html.php
@@ -1,7 +1,7 @@
 <?php js::set('confirmDelete', $lang->doc->confirmDelete);?>
 <?php js::set('latestVersion', $doc->version);?>
 <?php $sessionString = session_name() . '=' . session_id();?>
-<div style="height:100%" id="h-full">
+<div>
   <div class="main-col col-8 flex-content">
     <div class="cell" id="content">
       <div class="detail no-padding">