From 226ea6ef16fc7e4300fce38b2355dc1f5f5cfda0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Wed, 1 Jun 2022 14:25:59 +0800 Subject: [PATCH 1/2] * Finish task #55844. --- module/doc/control.php | 8 +------- module/doc/css/objectlibs.css | 2 ++ module/doc/view/content.html.php | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/module/doc/control.php b/module/doc/control.php index 47642c5548..ebcef2d830 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -527,11 +527,7 @@ class doc extends control if(!(defined('RUN_MODE') && RUN_MODE == 'api')) $this->locate($browseLink); } - if($doc->contentType == 'markdown') - { - $doc->content = commonModel::processMarkdown($doc->content); - $doc->digest = commonModel::processMarkdown($doc->digest); - } + if($doc->contentType == 'markdown') $doc->digest = commonModel::processMarkdown($doc->digest); /* Check priv when lib is product or project. */ $lib = $this->doc->getLibByID($doc->lib); @@ -1001,8 +997,6 @@ class doc extends control if($doc->contentType == 'markdown') { - $doc->content = commonModel::processMarkdown($doc->content); - $doc->digest = commonModel::processMarkdown($doc->digest); } } diff --git a/module/doc/css/objectlibs.css b/module/doc/css/objectlibs.css index 01c2431ed2..0215993c68 100644 --- a/module/doc/css/objectlibs.css +++ b/module/doc/css/objectlibs.css @@ -18,6 +18,8 @@ #content .title {max-width: 54%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} #content .detail-content {padding-left: 10px;} #mainContent .scrollbar-hover {max-height: 2000px; overflow: scroll;} +#content .editor-preview {background: #fff} +#content .CodeMirror{border: none} #sidebar {width: 275px;} #sidebar>.cell {width: 100%;} #sidebar>.sidebar-toggle {left: 3px; right: auto;} diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php index d1ecb68883..c627cecee1 100644 --- a/module/doc/view/content.html.php +++ b/module/doc/view/content.html.php @@ -100,6 +100,10 @@ echo ""; } } + elseif($doc->contentType == 'markdown') + { + echo ""; + } else { echo $doc->content; @@ -283,3 +287,16 @@ +contentType == 'markdown'):?> + + +content);?> + + From fba70b09d54ade058caedb16ea0999f7c4ec01f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Wed, 1 Jun 2022 14:29:08 +0800 Subject: [PATCH 2/2] * Remove unused code. --- module/doc/control.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/module/doc/control.php b/module/doc/control.php index ebcef2d830..208ab5dd89 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -527,8 +527,6 @@ class doc extends control if(!(defined('RUN_MODE') && RUN_MODE == 'api')) $this->locate($browseLink); } - if($doc->contentType == 'markdown') $doc->digest = commonModel::processMarkdown($doc->digest); - /* Check priv when lib is product or project. */ $lib = $this->doc->getLibByID($doc->lib); $type = $lib->type; @@ -994,10 +992,6 @@ class doc extends control $doc->keywords = str_replace(",", ',', $doc->keywords); $doc->keywords = explode(',', $doc->keywords); } - - if($doc->contentType == 'markdown') - { - } } if(isset($doc) and ($doc->type == 'text' || $doc->type == 'article'))