Skip to content

The Unified and Autonomous Development Platform

Adjust width of script support automatically

robin shenbed7d4694b74
diff --git a/core/src/main/java/io/onedev/server/web/editable/script/script-support.css b/core/src/main/java/io/onedev/server/web/editable/script/script-support.css
index 3a5929f937..9e36d5c702 100644
--- a/core/src/main/java/io/onedev/server/web/editable/script/script-support.css
+++ b/core/src/main/java/io/onedev/server/web/editable/script/script-support.css
@@ -7,7 +7,7 @@
border-color: #a94442;
}
.script-support .CodeMirror {
- height: auto;
+ height: auto;
}
.script-support .CodeMirror-scroll {
min-height: 120px;
diff --git a/core/src/main/java/io/onedev/server/web/editable/script/script-support.js b/core/src/main/java/io/onedev/server/web/editable/script/script-support.js
index 0a86b5df59..6d8f54c252 100644
--- a/core/src/main/java/io/onedev/server/web/editable/script/script-support.js
+++ b/core/src/main/java/io/onedev/server/web/editable/script/script-support.js
@@ -20,8 +20,22 @@ onedev.server.scriptSupport = {
cm.on("change", function() {
cm.save();
onedev.server.form.markDirty($input.closest("form"));
- });
- },
+ });
+ onedev.server.scriptSupport.trackWidth(inputId);
+ },
+ trackWidth: function(inputId) {
+ var $cm = $("#" + inputId).next();
+ var cm = $cm[0].CodeMirror;
+ function setWidth() {
+ var $cm = $("#"+inputId).next();
+ $cm.hide(); // hide temporarily in order to get original width
+ cm.setSize($cm.parent().width(), null);
+ $cm.show();
+ cm.refresh();
+ }
+ setWidth();
+ $(window).resize(setWidth);
+ },
onViewerDomReady: function(inputId, modeName) {
var cm = CodeMirror.fromTextArea(document.getElementById(inputId), {
readOnly: true,
@@ -36,7 +50,10 @@ onedev.server.scriptSupport = {
matchBrackets: true,
gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
highlightIdentifiers: {delay: 500}
- });
- onedev.server.codemirror.setModeByName(cm, modeName);
+ });
+
+ onedev.server.codemirror.setModeByName(cm, modeName);
+
+ onedev.server.scriptSupport.trackWidth(inputId);
}
}
\ No newline at end of file