Skip to content

The Unified and Autonomous Development Platform

Automatically padding same leading spaces with last line when hit return in markdown editor

robin shen8b63164a27c8
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java
index 80192be50b..fd8809a9f5 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java
@@ -126,7 +126,7 @@ public class DefaultMarkdownManager implements MarkdownManager {
for (HtmlTransformer transformer : htmlTransformers)
transformer.transform(body);
- return body.html();
+ return body.body().html();
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/doneevents/jquery.doneevents.js b/web/src/main/java/com/gitplex/server/web/assets/js/doneevents/jquery.doneevents.js
index 0104537c34..87043fc1f4 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/js/doneevents/jquery.doneevents.js
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/doneevents/jquery.doneevents.js
@@ -6,14 +6,14 @@
$.fn.doneEvents = function(monitorEvents, callback, timeout) {
if (timeout == undefined)
timeout = 250;
+ var doneTimer;
this.on(monitorEvents, function(e) {
var $this = $(this);
- var doneTimer = $this.data("doneTimer");
if (doneTimer)
clearTimeout(doneTimer);
- $this.data("doneTimer", setTimeout(function() {
+ doneTimer = setTimeout(function() {
callback.call($this[0], e);
- }, timeout));
+ }, timeout);
});
return this;
diff --git a/web/src/main/java/com/gitplex/server/web/behavior/markdown/SourcePositionTrackExtension.java b/web/src/main/java/com/gitplex/server/web/behavior/markdown/SourcePositionTrackExtension.java
index d02c13c876..a6e47bacbc 100644
--- a/web/src/main/java/com/gitplex/server/web/behavior/markdown/SourcePositionTrackExtension.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/markdown/SourcePositionTrackExtension.java
@@ -32,8 +32,27 @@ public class SourcePositionTrackExtension implements HtmlRenderer.HtmlRendererEx
@Override
public void setAttributes(Node node, AttributablePart part, Attributes attributes) {
if (node instanceof Block) {
- attributes.addValue("data-" + DATA_START_ATTRIBUTE, String.valueOf(node.getStartOffset()));
- attributes.addValue("data-" + DATA_END_ATTRIBUTE, String.valueOf(node.getEndOffset()));
+ int startOffset = node.getStartOffset();
+ int endOffset = node.getEndOffset();
+ Node document = node.getDocument();
+ int leadingWhitespaces = 0;
+ for (int i=startOffset; i<endOffset; i++) {
+ if (Character.isWhitespace(document.getChars().charAt(i))) {
+ leadingWhitespaces++;
+ } else {
+ break;
+ }
+ }
+ int trailingWhitespaces = 0;
+ for (int i=endOffset-1; i>=startOffset; i--) {
+ if (Character.isWhitespace(document.getChars().charAt(i))) {
+ trailingWhitespaces++;
+ } else {
+ break;
+ }
+ }
+ attributes.addValue("data-" + DATA_START_ATTRIBUTE, String.valueOf(startOffset+leadingWhitespaces));
+ attributes.addValue("data-" + DATA_END_ATTRIBUTE, String.valueOf(endOffset-trailingWhitespaces));
}
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css
index 103a8951b1..922aa3deca 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css
@@ -17,6 +17,7 @@
width: 100%;
resizabe: vertical;
border-radius: 0;
+ border: 1px solid #BBB;
overflow: auto;
}
.markdown-editor>.body>.preview {
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 0fca7e6803..6210246cc8 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
@@ -69,18 +69,57 @@ gitplex.server.markdown = {
$input.on("autosize:resized", function() {
$preview.outerHeight($input.outerHeight());
});
-
+
$input.doneEvents("input", function() {
if ($preview.is(":visible")) {
callback("render", $input.val());
}
}, 500);
- $input.doneEvents("keydown click focus", function() {
- if ($preview.is(":visible"))
+ $input.doneEvents("keydown", function(e) {
+ if (e.keyCode>=33 && e.keyCode<=40 && $preview.is(":visible")) {
+ // Only sync preview scroll when we moved cursor
+ gitplex.server.markdown.syncPreviewScroll(containerId);
+ }
+ }, 500);
+
+ $input.doneEvents("click focus", function(e) {
+ if ($preview.is(":visible")) {
gitplex.server.markdown.syncPreviewScroll(containerId);
+ }
}, 500);
+ /*
+ * Padding same leading spaces as last line when add a new line. This is useful when
+ * add several list items
+ */
+ $input.on("keydown", function(e) {
+ if (e.keyCode == 13) {
+ e.preventDefault();
+ var input = $input.val();
+ var caret = $input.caret();
+ var inputBeforeCaret = input.substring(0, caret);
+ var inputAfterCaret = input.substring(caret);
+ var lastLineBreak = inputBeforeCaret.lastIndexOf('\n');
+ var spaces = "";
+ for (var i=lastLineBreak+1; i<inputBeforeCaret.length; i++) {
+ if (inputBeforeCaret[i] == ' ') {
+ spaces += " ";
+ } else {
+ break;
+ }
+ }
+ if (lastLineBreak + spaces.length + 1 == inputBeforeCaret.length) {
+ $input.val(inputBeforeCaret + "\n" + inputAfterCaret);
+ $input.caret(caret+1);
+ } else {
+ $input.val(inputBeforeCaret + "\n" + spaces + inputAfterCaret);
+ $input.caret(caret + 1 + spaces.length);
+ }
+ $input.trigger("input", e);
+ }
+ });
+
$markdownEditor.on("autofit", function(e, width, height) {
height -= $head.outerHeight();
if ($body.hasClass("compact")) {
@@ -173,6 +212,7 @@ gitplex.server.markdown = {
} else {
scrollTop = 0;
}
+
$preview.scrollTop(scrollTop);
},
onWindowLoad: function(containerId) {