Skip to content

The Unified and Autonomous Development Platform

Fix the issue that scroll bar of code block in markdown somtimes can not be shown

robin shen009a4c3a4097
diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/highlight.css b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/highlight.css
index 73b2d317f1..3b72636bf6 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/highlight.css
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/highlight.css
@@ -10,3 +10,10 @@ pre.highlight>code>.CodeMirror {
pre.highlight>code>.CodeMirror .CodeMirror-cursor {
border-left: none;
}
+
+pre.highlight>code>.CodeMirror .CodeMirror-simplescroll-horizontal {
+ height: 6px;
+}
+pre.highlight>code>.CodeMirror .CodeMirror-simplescroll-vertical {
+ width: 6px;
+}
diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/highlight.js b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/highlight.js
index 8f161bd04c..399680dd88 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/highlight.js
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/highlight.js
@@ -9,6 +9,7 @@ gitplex.server.highlight = function($container) {
value: text,
highlightIdentifiers: {delay: 500},
theme: "eclipse",
+ scrollbarStyle: "simple",
matchBrackets: true
});
var modeHint = $this.attr("class");
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
index 2dc443b89f..a162eb4479 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
@@ -801,6 +801,12 @@ gitplex.server.markdown = {
$rendered.find("a").click(function() {
gitplex.server.viewState.getFromViewAndSetToHistory();
});
+
+ $(window).resize(function() {
+ $rendered.find(".CodeMirror").each(function() {
+ $(this)[0].CodeMirror.refresh();
+ });
+ });
},
onViewerDomReady: function(containerId, taskCallback, taskSourcePositionDataAttribute) {
var $container = $("#" + containerId);