Skip to content

The Unified and Autonomous Development Platform

Markdown split mode to synchronize scroll of edit and preview

robin shenc696ea95be76
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 2295c537cb..80192be50b 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
@@ -110,6 +110,7 @@ public class DefaultMarkdownManager implements MarkdownManager {
public String render(String markdown, boolean postProcess) {
Node document = parser.parse(markdown);
String html = htmlRenderer.render(document);
+
if (postProcess)
html = postProcess(html);
return html;
diff --git a/web/src/main/java/com/gitplex/server/web/WebModule.java b/web/src/main/java/com/gitplex/server/web/WebModule.java
index e99a8d7208..ac150e9919 100644
--- a/web/src/main/java/com/gitplex/server/web/WebModule.java
+++ b/web/src/main/java/com/gitplex/server/web/WebModule.java
@@ -24,7 +24,7 @@ import com.gitplex.server.util.markdown.HtmlTransformer;
import com.gitplex.server.util.validation.AccountNameReservation;
import com.gitplex.server.util.validation.DepotNameReservation;
import com.gitplex.server.util.validation.TeamNameReservation;
-import com.gitplex.server.web.behavior.markdown.ResponsiveTaskBehavior;
+import com.gitplex.server.web.behavior.markdown.SourcePositionTrackExtension;
import com.gitplex.server.web.behavior.markdown.emoji.EmojiExtension;
import com.gitplex.server.web.component.comment.MentionTransformer;
import com.gitplex.server.web.component.comment.PullRequestTransformer;
@@ -86,7 +86,7 @@ public class WebModule extends AbstractPluginModule {
contributeFromPackage(BlobRendererContribution.class, BlobRendererContribution.class);
contribute(Extension.class, new EmojiExtension());
- contribute(Extension.class, ResponsiveTaskBehavior.newMarkdownExtension());
+ contribute(Extension.class, new SourcePositionTrackExtension());
contribute(HtmlTransformer.class, new MentionTransformer());
contribute(HtmlTransformer.class, new PullRequestTransformer());
diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/autosize/AutoSizeResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/autosize/AutoSizeResourceReference.java
index 72af3bb979..0974524b03 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/js/autosize/AutoSizeResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/autosize/AutoSizeResourceReference.java
@@ -13,7 +13,7 @@ public class AutoSizeResourceReference extends JavaScriptResourceReference {
private static final long serialVersionUID = 1L;
public AutoSizeResourceReference() {
- super(AutoSizeResourceReference.class, "autosize-patched.js");
+ super(AutoSizeResourceReference.class, "autosize.js");
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/autosize/autosize-patched.js b/web/src/main/java/com/gitplex/server/web/assets/js/autosize/autosize.js
similarity index 52%
rename from web/src/main/java/com/gitplex/server/web/assets/js/autosize/autosize-patched.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/autosize/autosize.js
index 0990b0bdfb..998d641812 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/js/autosize/autosize-patched.js
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/autosize/autosize.js
@@ -1,5 +1,5 @@
/*!
- Autosize 3.0.13
+ Autosize 3.0.20
license: MIT
http://www.jacklmoore.com/autosize
*/
@@ -18,40 +18,57 @@
})(this, function (exports, module) {
'use strict';
- var set = typeof Set === 'function' ? new Set() : (function () {
- var list = [];
+ var map = typeof Map === "function" ? new Map() : (function () {
+ var keys = [];
+ var values = [];
return {
has: function has(key) {
- return Boolean(list.indexOf(key) > -1);
+ return keys.indexOf(key) > -1;
},
- add: function add(key) {
- list.push(key);
+ get: function get(key) {
+ return values[keys.indexOf(key)];
+ },
+ set: function set(key, value) {
+ if (keys.indexOf(key) === -1) {
+ keys.push(key);
+ values.push(value);
+ }
},
'delete': function _delete(key) {
- list.splice(list.indexOf(key), 1);
- } };
+ var index = keys.indexOf(key);
+ if (index > -1) {
+ keys.splice(index, 1);
+ values.splice(index, 1);
+ }
+ }
+ };
})();
- function assign(ta) {
- var _ref = arguments[1] === undefined ? {} : arguments[1];
-
- var _ref$setOverflowX = _ref.setOverflowX;
- var setOverflowX = _ref$setOverflowX === undefined ? true : _ref$setOverflowX;
- var _ref$setOverflowY = _ref.setOverflowY;
- var setOverflowY = _ref$setOverflowY === undefined ? true : _ref$setOverflowY;
+ var createEvent = function createEvent(name) {
+ return new Event(name, { bubbles: true });
+ };
+ try {
+ new Event('test');
+ } catch (e) {
+ // IE does not support `new Event()`
+ createEvent = function (name) {
+ var evt = document.createEvent('Event');
+ evt.initEvent(name, true, false);
+ return evt;
+ };
+ }
- if (!ta || !ta.nodeName || ta.nodeName !== 'TEXTAREA' || set.has(ta)) return;
+ function assign(ta) {
+ if (!ta || !ta.nodeName || ta.nodeName !== 'TEXTAREA' || map.has(ta)) return;
var heightOffset = null;
- var overflowY = null;
var clientWidth = ta.clientWidth;
+ var cachedHeight = null;
function init() {
var style = window.getComputedStyle(ta, null);
- overflowY = style.overflowY;
-
if (style.resize === 'vertical') {
ta.style.resize = 'none';
} else if (style.resize === 'both') {
@@ -85,20 +102,29 @@
ta.style.width = width;
}
- overflowY = value;
+ ta.style.overflowY = value;
+ }
+
+ function getParentOverflows(el) {
+ var arr = [];
- if (setOverflowY) {
- ta.style.overflowY = value;
+ while (el && el.parentNode && el.parentNode instanceof Element) {
+ if (el.parentNode.scrollTop) {
+ arr.push({
+ node: el.parentNode,
+ scrollTop: el.parentNode.scrollTop
+ });
+ }
+ el = el.parentNode;
}
- resize();
+ return arr;
}
function resize() {
- var htmlTop = window.pageYOffset;
- var bodyTop = document.body.scrollTop;
- var scrollableTop = $(ta).closest(".scrollable").scrollTop();
var originalHeight = ta.style.height;
+ var overflows = getParentOverflows(ta);
+ var docTop = document.documentElement && document.documentElement.scrollTop; // Needed for Mobile IE (ticket #240)
ta.style.height = 'auto';
@@ -116,32 +142,48 @@
clientWidth = ta.clientWidth;
// prevents scroll-position jumping
- document.documentElement.scrollTop = htmlTop;
- document.body.scrollTop = bodyTop;
- $(ta).closest(".scrollable").scrollTop(scrollableTop);
+ overflows.forEach(function (el) {
+ el.node.scrollTop = el.scrollTop;
+ });
+
+ if (docTop) {
+ document.documentElement.scrollTop = docTop;
+ }
}
function update() {
- var startHeight = ta.style.height;
-
resize();
- var style = window.getComputedStyle(ta, null);
+ var styleHeight = Math.round(parseFloat(ta.style.height));
+ var computed = window.getComputedStyle(ta, null);
+ var actualHeight = Math.round(parseFloat(computed.height));
- if (style.height !== ta.style.height) {
- if (overflowY !== 'visible') {
+ // The actual height not matching the style height (set via the resize method) indicates that
+ // the max-height has been exceeded, in which case the overflow should be set to visible.
+ if (actualHeight !== styleHeight) {
+ if (computed.overflowY !== 'visible') {
changeOverflow('visible');
+ resize();
+ actualHeight = Math.round(parseFloat(window.getComputedStyle(ta, null).height));
}
} else {
- if (overflowY !== 'hidden') {
+ // Normally keep overflow set to hidden, to avoid flash of scrollbar as the textarea expands.
+ if (computed.overflowY !== 'hidden') {
changeOverflow('hidden');
+ resize();
+ actualHeight = Math.round(parseFloat(window.getComputedStyle(ta, null).height));
}
}
- if (startHeight !== ta.style.height) {
- var evt = document.createEvent('Event');
- evt.initEvent('autosize:resized', true, false);
- ta.dispatchEvent(evt);
+ if (cachedHeight !== actualHeight) {
+ cachedHeight = actualHeight;
+ var evt = createEvent('autosize:resized');
+ try {
+ ta.dispatchEvent(evt);
+ } catch (err) {
+ // Firefox will throw an error on dispatchEvent for a detached element
+ // https://bugzilla.mozilla.org/show_bug.cgi?id=889376
+ }
}
}
@@ -152,56 +194,60 @@
};
var destroy = (function (style) {
- window.removeEventListener('resize', pageResize);
- ta.removeEventListener('input', update);
- ta.removeEventListener('keyup', update);
- ta.removeEventListener('autosize:destroy', destroy);
- set['delete'](ta);
+ window.removeEventListener('resize', pageResize, false);
+ ta.removeEventListener('input', update, false);
+ ta.removeEventListener('keyup', update, false);
+ ta.removeEventListener('autosize:destroy', destroy, false);
+ ta.removeEventListener('autosize:update', update, false);
Object.keys(style).forEach(function (key) {
ta.style[key] = style[key];
});
+
+ map['delete'](ta);
}).bind(ta, {
height: ta.style.height,
resize: ta.style.resize,
overflowY: ta.style.overflowY,
overflowX: ta.style.overflowX,
- wordWrap: ta.style.wordWrap });
+ wordWrap: ta.style.wordWrap
+ });
- ta.addEventListener('autosize:destroy', destroy);
+ ta.addEventListener('autosize:destroy', destroy, false);
// IE9 does not fire onpropertychange or oninput for deletions,
// so binding to onkeyup to catch most of those events.
// There is no way that I know of to detect something like 'cut' in IE9.
if ('onpropertychange' in ta && 'oninput' in ta) {
- ta.addEventListener('keyup', update);
+ ta.addEventListener('keyup', update, false);
}
- window.addEventListener('resize', pageResize);
- ta.addEventListener('input', update);
- ta.addEventListener('autosize:update', update);
- set.add(ta);
+ window.addEventListener('resize', pageResize, false);
+ ta.addEventListener('input', update, false);
+ ta.addEventListener('autosize:update', update, false);
+ ta.style.overflowX = 'hidden';
+ ta.style.wordWrap = 'break-word';
- if (setOverflowX) {
- ta.style.overflowX = 'hidden';
- ta.style.wordWrap = 'break-word';
- }
+ map.set(ta, {
+ destroy: destroy,
+ update: update
+ });
init();
}
function destroy(ta) {
- if (!(ta && ta.nodeName && ta.nodeName === 'TEXTAREA')) return;
- var evt = document.createEvent('Event');
- evt.initEvent('autosize:destroy', true, false);
- ta.dispatchEvent(evt);
+ var methods = map.get(ta);
+ if (methods) {
+ methods.destroy();
+ }
}
function update(ta) {
- if (!(ta && ta.nodeName && ta.nodeName === 'TEXTAREA')) return;
- var evt = document.createEvent('Event');
- evt.initEvent('autosize:update', true, false);
- ta.dispatchEvent(evt);
+ var methods = map.get(ta);
+ if (methods) {
+ methods.update();
+ }
}
var autosize = null;
diff --git a/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropCssResourceReference.java b/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropCssResourceReference.java
deleted file mode 100644
index 9b76b9bca4..0000000000
--- a/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.gitplex.server.web.behavior.dragdrop;
-
-import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
-
-public class DragDropCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public DragDropCssResourceReference() {
- super(DragDropCssResourceReference.class, "dragdrop.css");
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropResourceReference.java b/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropResourceReference.java
index 214f7eaae0..28b6dfee71 100644
--- a/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropResourceReference.java
@@ -7,6 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import com.gitplex.server.web.assets.js.jqueryui.JQueryUIResourceReference;
+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
public class DragDropResourceReference extends BaseDependentResourceReference {
@@ -21,7 +22,8 @@ public class DragDropResourceReference extends BaseDependentResourceReference {
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
- dependencies.add(CssHeaderItem.forReference(new DragDropCssResourceReference()));
+ dependencies.add(CssHeaderItem.forReference(
+ new BaseDependentCssResourceReference(DragDropResourceReference.class, "dragdrop.css")));
return dependencies;
}
diff --git a/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownInitRenderedBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownInitRenderedBehavior.java
deleted file mode 100644
index 8ae709bb5b..0000000000
--- a/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownInitRenderedBehavior.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.gitplex.server.web.behavior.markdown;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-
-@SuppressWarnings("serial")
-public class MarkdownInitRenderedBehavior extends Behavior {
-
- @Override
- public void renderHead(Component component, IHeaderResponse response) {
- super.renderHead(component, response);
- response.render(JavaScriptHeaderItem.forReference(new MarkdownResourceReference()));
-
- String script = String.format("gitplex.server.markdown.initRendered('%s');", component.getMarkupId());
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
- @Override
- public void bind(Component component) {
- super.bind(component);
- component.setOutputMarkupId(true);
- }
-
-}
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
new file mode 100644
index 0000000000..d02c13c876
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/behavior/markdown/SourcePositionTrackExtension.java
@@ -0,0 +1,45 @@
+package com.gitplex.server.web.behavior.markdown;
+
+import com.vladsch.flexmark.ast.Block;
+import com.vladsch.flexmark.ast.Node;
+import com.vladsch.flexmark.html.AttributeProvider;
+import com.vladsch.flexmark.html.HtmlRenderer;
+import com.vladsch.flexmark.html.HtmlRenderer.Builder;
+import com.vladsch.flexmark.html.IndependentAttributeProviderFactory;
+import com.vladsch.flexmark.html.renderer.AttributablePart;
+import com.vladsch.flexmark.html.renderer.NodeRendererContext;
+import com.vladsch.flexmark.util.html.Attributes;
+import com.vladsch.flexmark.util.options.MutableDataHolder;
+
+public class SourcePositionTrackExtension implements HtmlRenderer.HtmlRendererExtension {
+
+ public static final String DATA_START_ATTRIBUTE = "sourcestart";
+
+ public static final String DATA_END_ATTRIBUTE = "sourceend";
+
+ @Override
+ public void rendererOptions(MutableDataHolder options) {
+ }
+
+ @Override
+ public void extend(Builder rendererBuilder, String rendererType) {
+ rendererBuilder.attributeProviderFactory(new IndependentAttributeProviderFactory() {
+
+ @Override
+ public AttributeProvider create(NodeRendererContext context) {
+ return new AttributeProvider() {
+
+ @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()));
+ }
+ }
+
+ };
+ }
+ });
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/behavior/markdown/markdown.js b/web/src/main/java/com/gitplex/server/web/behavior/markdown/markdown.js
index 9e4052cd30..c1a5c50460 100644
--- a/web/src/main/java/com/gitplex/server/web/behavior/markdown/markdown.js
+++ b/web/src/main/java/com/gitplex/server/web/behavior/markdown/markdown.js
@@ -337,51 +337,6 @@ gitplex.server.markdown = {
$upload.next().click();
}
})
- },
-
- getRendered: function(containerId) {
- var $container = $("#" + containerId);
- if ($container.is("textarea") || $container.is("input")) {
- return $container.nextAll(".md-preview");
- } else {
- return $container.find(".md-preview");
- }
- },
-
- initRendered: function(containerId) {
- var $rendered = gitplex.server.markdown.getRendered(containerId);
-
- gitplex.server.highlight($rendered);
-
- $rendered.find("h1, h2, h3, h4, h5, h6").each(function() {
- var $this = $(this);
- var $anchor = $this.find(">a[name]");
- if ($anchor.length != 0) {
- $this.addClass("permalinked").append($anchor.html());
- $anchor.empty();
- $this.append("<a href='#" + $anchor.attr("name") + "' class='permalink'><i class='fa fa-link'></i></a>");
- } else {
- var anchorName = encodeURIComponent($this.text());
- $this.addClass("permalinked").prepend("<a name='" + anchorName + "'></a>");
- $this.append("<a href='#" + anchorName + "' class='permalink'><i class='fa fa-link'></i></a>");
- }
- });
-
- $rendered.find("a").click(function() {
- gitplex.server.viewState.getFromViewAndSetToHistory();
- });
- },
-
- initResponsiveTask: function(containerId, taskCallback, taskClass,
- taskSourcePositionDataAttribute) {
- var $rendered = gitplex.server.markdown.getRendered(containerId);
-
- var $task = $rendered.find("." + taskClass);
- var $taskCheckbox = $task.children("input");
- $taskCheckbox.removeAttr("disabled").removeAttr("readonly");
- $taskCheckbox.change(function() {
- taskCallback($(this).parent().data(taskSourcePositionDataAttribute), $(this).prop("checked"));
- });
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java
index 72f3562ecc..aef2315a33 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java
@@ -49,10 +49,10 @@ import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.ClassUtils;
import com.gitplex.server.web.behavior.markdown.AttachmentSupport;
-import com.gitplex.server.web.behavior.markdown.ResponsiveTaskBehavior;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.component.link.AccountLink;
-import com.gitplex.server.web.component.markdownviewer.MarkdownViewer;
+import com.gitplex.server.web.component.markdown.MarkdownViewer;
+import com.gitplex.server.web.component.markdown.ResponsiveTaskBehavior;
import com.gitplex.server.web.page.depot.compare.RevisionComparePage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
import com.gitplex.server.web.util.DateUtils;
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.html b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.html
index 604472867a..590bc1fc75 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.html
@@ -51,7 +51,7 @@
<a wicket:id="close" class="pull-left close" title="Hide comment"><i class="fa fa-times"></i></a>
<a wicket:id="toggleResolve" class="pull-right resolve"><i class="fa fa-check-circle"></i></a>
</div>
- <div wicket:id="body" class="body scrollable"></div>
+ <div wicket:id="body" class="body"></div>
</div>
</div>
<ul class="diffs list-unstyled">
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html
new file mode 100644
index 0000000000..13dc3a60a1
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html
@@ -0,0 +1,15 @@
+<wicket:panel>
+ <div class="markdown-editor autofit">
+ <div class="head clearfix">
+ <div class="btn-group pull-right">
+ <a class="edit active btn btn-default btn-xs" title="Edit"><i class="fa fa-font"></i></a>
+ <a class="preview btn btn-default btn-xs" title="Preview"><i class="fa fa-eye"></i></a>
+ <a class="split btn btn-default btn-xs" title="Split view"><i wicket:id="splitIcon" class="fa fa-columns"></i></a>
+ </div>
+ </div>
+ <div wicket:id="body" class="body edit-mode clearfix">
+ <textarea wicket:id="input" class="input"></textarea>
+ <div class="preview markdown-rendered"></div>
+ </div>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java
new file mode 100644
index 0000000000..76ecce9d62
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java
@@ -0,0 +1,120 @@
+package com.gitplex.server.web.component.markdown;
+
+import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.ajax.AjaxChannel;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.head.OnLoadHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.unbescape.javascript.JavaScriptEscape;
+
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.manager.MarkdownManager;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
+
+@SuppressWarnings("serial")
+public class MarkdownEditor extends FormComponentPanel<String> {
+
+ private final boolean compactMode;
+
+ private TextArea<String> input;
+
+ private AbstractPostAjaxBehavior ajaxBehavior;
+
+ /**
+ * @param id
+ * component id of the editor
+ * @param model
+ * markdown model of the editor
+ * @param compactMode
+ * editor in compact mode occupies horizontal space and is suitable
+ * to be used in places such as comment aside the code
+ */
+ public MarkdownEditor(String id, IModel<String> model, boolean compactMode) {
+ super(id, model);
+ this.compactMode = compactMode;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ WebMarkupContainer splitIcon = new WebMarkupContainer("splitIcon");
+ add(splitIcon);
+ if (compactMode)
+ splitIcon.add(AttributeAppender.append("class", "fa-rotate-270"));
+
+ WebMarkupContainer body = new WebMarkupContainer("body");
+ if (compactMode)
+ body.add(AttributeAppender.append("class", "compact"));
+
+ add(body);
+
+ body.add(input = new TextArea<String>("input", Model.of(getModelObject())));
+
+ add(ajaxBehavior = new AbstractPostAjaxBehavior() {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.setChannel(new AjaxChannel("markdown-preview", AjaxChannel.Type.DROP));
+ }
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
+ switch (params.getParameterValue("action").toString()) {
+ case "render":
+ String markdown = params.getParameterValue("param1").toString();
+ String rendered;
+ if (StringUtils.isNotBlank(markdown)) {
+ MarkdownManager markdownManager = GitPlex.getInstance(MarkdownManager.class);
+ rendered = markdownManager.render(markdown, true);
+ } else {
+ rendered = "<div class='message'>Nothing to preview</div>";
+ }
+ String script = String.format("gitplex.server.markdown.onRendered('%s', '%s');",
+ getMarkupId(), JavaScriptEscape.escapeJavaScript(rendered));
+ target.appendJavaScript(script);
+ break;
+ }
+ }
+
+ });
+
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ public void convertInput() {
+ setConvertedInput(input.getConvertedInput());
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(JavaScriptHeaderItem.forReference(new MarkdownResourceReference()));
+
+ String callback = ajaxBehavior.getCallbackFunction(explicit("action"), explicit("param1"), explicit("param2"),
+ explicit("param3"), explicit("param4"), explicit("param5")).toString();
+
+ String script = String.format("gitplex.server.markdown.onDomReady('%s', %s);", getMarkupId(), callback);
+ response.render(OnDomReadyHeaderItem.forScript(script));
+
+ script = String.format("gitplex.server.markdown.onWindowLoad('%s');", getMarkupId());
+ response.render(OnLoadHeaderItem.forScript(script));
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownResourceReference.java
new file mode 100644
index 0000000000..7f979111f4
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownResourceReference.java
@@ -0,0 +1,44 @@
+package com.gitplex.server.web.component.markdown;
+
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+
+import com.gitplex.server.web.assets.js.atwho.AtWhoResourceReference;
+import com.gitplex.server.web.assets.js.caret.CaretResourceReference;
+import com.gitplex.server.web.assets.js.codemirror.CodeMirrorResourceReference;
+import com.gitplex.server.web.assets.js.cookies.CookiesResourceReference;
+import com.gitplex.server.web.assets.js.doneevents.DoneEventsResourceReference;
+import com.gitplex.server.web.assets.js.hotkeys.HotkeysResourceReference;
+import com.gitplex.server.web.assets.js.scrollintoview.ScrollIntoViewResourceReference;
+import com.gitplex.server.web.assets.js.textareacaretposition.TextareaCaretPositionResourceReference;
+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
+import com.gitplex.server.web.page.base.BaseDependentResourceReference;
+
+@SuppressWarnings("serial")
+public class MarkdownResourceReference extends BaseDependentResourceReference {
+
+ public MarkdownResourceReference() {
+ super(MarkdownResourceReference.class, "markdown.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(JavaScriptHeaderItem.forReference(new CaretResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new AtWhoResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new TextareaCaretPositionResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));
+
+ dependencies.add(CssHeaderItem.forReference(
+ new BaseDependentCssResourceReference(MarkdownResourceReference.class, "markdown.css")));
+ return dependencies;
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdownviewer/MarkdownViewer.html b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.html
similarity index 60%
rename from web/src/main/java/com/gitplex/server/web/component/markdownviewer/MarkdownViewer.html
rename to web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.html
index 008110c0f3..b47339d2cf 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdownviewer/MarkdownViewer.html
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.html
@@ -1,8 +1,6 @@
-<html xmlns:wicket>
<wicket:panel>
<div class="markdown-viewer">
<div wicket:id="feedback" class="feedback"></div>
- <div wicket:id="content" class="md-preview"></div>
+ <div wicket:id="content" class="markdown-rendered"></div>
</div>
</wicket:panel>
-</html>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdownviewer/MarkdownViewer.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.java
similarity index 60%
rename from web/src/main/java/com/gitplex/server/web/component/markdownviewer/MarkdownViewer.java
rename to web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.java
index 505641bbf8..62d401577a 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdownviewer/MarkdownViewer.java
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.java
@@ -1,7 +1,10 @@
-package com.gitplex.server.web.component.markdownviewer;
+package com.gitplex.server.web.component.markdown;
import javax.annotation.Nullable;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
@@ -9,8 +12,6 @@ import org.apache.wicket.model.LoadableDetachableModel;
import com.gitplex.launcher.loader.AppLoader;
import com.gitplex.server.manager.MarkdownManager;
-import com.gitplex.server.web.behavior.markdown.MarkdownInitRenderedBehavior;
-import com.gitplex.server.web.behavior.markdown.ResponsiveTaskBehavior;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
@@ -44,13 +45,34 @@ public class MarkdownViewer extends GenericPanel<String> {
return null;
}
}
- }).setEscapeModelStrings(false));
+
+ }) {
- add(new MarkdownInitRenderedBehavior());
- if (responsiveTaskBehavior != null)
- add(responsiveTaskBehavior);
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ if (responsiveTaskBehavior != null)
+ add(responsiveTaskBehavior);
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ String script = String.format("gitplex.server.markdown.initRendered($('#%s'));", getMarkupId(true));
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ }.setEscapeModelStrings(false));
setOutputMarkupId(true);
}
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(JavaScriptHeaderItem.forReference(new MarkdownResourceReference()));
+ }
+
}
diff --git a/web/src/main/java/com/gitplex/server/web/behavior/markdown/ResponsiveTaskBehavior.java b/web/src/main/java/com/gitplex/server/web/component/markdown/ResponsiveTaskBehavior.java
similarity index 59%
rename from web/src/main/java/com/gitplex/server/web/behavior/markdown/ResponsiveTaskBehavior.java
rename to web/src/main/java/com/gitplex/server/web/component/markdown/ResponsiveTaskBehavior.java
index b986e6ba59..ae4ade1bc9 100644
--- a/web/src/main/java/com/gitplex/server/web/behavior/markdown/ResponsiveTaskBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/ResponsiveTaskBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.behavior.markdown;
+package com.gitplex.server.web.component.markdown;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -15,24 +15,13 @@ import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.MarkdownManager;
import com.gitplex.server.util.StringUtils;
import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
-import com.vladsch.flexmark.Extension;
-import com.vladsch.flexmark.ast.Node;
+import com.gitplex.server.web.behavior.markdown.MarkdownResourceReference;
+import com.gitplex.server.web.behavior.markdown.SourcePositionTrackExtension;
import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension;
-import com.vladsch.flexmark.ext.gfm.tasklist.TaskListItem;
-import com.vladsch.flexmark.html.AttributeProvider;
-import com.vladsch.flexmark.html.HtmlRenderer;
-import com.vladsch.flexmark.html.HtmlRenderer.Builder;
-import com.vladsch.flexmark.html.IndependentAttributeProviderFactory;
-import com.vladsch.flexmark.html.renderer.AttributablePart;
-import com.vladsch.flexmark.html.renderer.NodeRendererContext;
-import com.vladsch.flexmark.util.html.Attributes;
-import com.vladsch.flexmark.util.options.MutableDataHolder;
@SuppressWarnings("serial")
public abstract class ResponsiveTaskBehavior extends AbstractPostAjaxBehavior {
- private static final String SOURCE_POSITION_DATA_ATTRIBUTE = "sourceposition";
-
private static final String TASK_CHECKED = "taskchecked";
private long lastContentVersion;
@@ -44,7 +33,7 @@ public abstract class ResponsiveTaskBehavior extends AbstractPostAjaxBehavior {
@Override
protected void respond(AjaxRequestTarget target) {
IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
- int taskPosition = params.getParameterValue(SOURCE_POSITION_DATA_ATTRIBUTE).toInt();
+ int taskPosition = params.getParameterValue(SourcePositionTrackExtension.DATA_START_ATTRIBUTE).toInt();
boolean taskChecked = params.getParameterValue(TASK_CHECKED).toBoolean();
String markdown = getComponent().getDefaultModelObjectAsString();
String beforeTask = markdown.substring(0, taskPosition);
@@ -71,11 +60,13 @@ public abstract class ResponsiveTaskBehavior extends AbstractPostAjaxBehavior {
super.renderHead(component, response);
response.render(JavaScriptHeaderItem.forReference(new MarkdownResourceReference()));
- CharSequence callback = getCallbackFunction(explicit(SOURCE_POSITION_DATA_ATTRIBUTE), explicit(TASK_CHECKED));
+ CharSequence callback = getCallbackFunction(
+ explicit(SourcePositionTrackExtension.DATA_START_ATTRIBUTE),
+ explicit(TASK_CHECKED));
String taskItemClass = GitPlex.getInstance(MarkdownManager.class).getOptions().get(TaskListExtension.ITEM_CLASS);
String script = String.format("gitplex.server.markdown.initResponsiveTask('%s', %s, '%s', '%s');",
- getComponent().getMarkupId(), callback, taskItemClass, SOURCE_POSITION_DATA_ATTRIBUTE);
+ getComponent().getMarkupId(), callback, taskItemClass, SourcePositionTrackExtension.DATA_START_ATTRIBUTE);
response.render(OnDomReadyHeaderItem.forScript(script));
}
@@ -87,35 +78,4 @@ public abstract class ResponsiveTaskBehavior extends AbstractPostAjaxBehavior {
protected abstract long getContentVersion();
- public static Extension newMarkdownExtension() {
-
- return new HtmlRenderer.HtmlRendererExtension() {
-
- @Override
- public void rendererOptions(MutableDataHolder options) {
- }
-
- @Override
- public void extend(Builder rendererBuilder, String rendererType) {
- rendererBuilder.attributeProviderFactory(new IndependentAttributeProviderFactory() {
-
- @Override
- public AttributeProvider create(NodeRendererContext context) {
- return new AttributeProvider() {
-
- @Override
- public void setAttributes(Node node, AttributablePart part, Attributes attributes) {
- if (node instanceof TaskListItem) {
- attributes.addValue("data-" + SOURCE_POSITION_DATA_ATTRIBUTE, String.valueOf(node.getStartOffset()));
- }
- }
-
- };
- }
- });
- }
-
- };
- }
-
}
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
new file mode 100644
index 0000000000..103a8951b1
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css
@@ -0,0 +1,115 @@
+.markdown-editor>.head {
+ padding: 4px 8px;
+}
+.markdown-editor>.body>.preview {
+ border: 1px solid #BBB;
+ padding: 8px;
+ background: white;
+ display: none;
+}
+.markdown-editor>.body>.preview>.markdown-rendered>.message {
+ text-align: center;
+ font-size: 24px;
+ font-style: italic;
+}
+.markdown-editor>.body>.input {
+ float: left;
+ width: 100%;
+ resizabe: vertical;
+ border-radius: 0;
+ overflow: auto;
+}
+.markdown-editor>.body>.preview {
+ float: left;
+ width: 49%;
+ overflow: auto;
+}
+.markdown-editor>.body>.preview .focusing {
+ background: #FCF5DA;
+}
+.markdown-editor>.body.compact>* {
+ float: none;
+ width: 100%;
+}
+
+.markdown-rendered {
+ font-size: 16px;
+ line-height: 1.5;
+}
+.markdown-rendered li {
+ margin-bottom: 6px;
+}
+.markdown-rendered .emoji {
+ width: 20px;
+ height: 20px;
+}
+.markdown-rendered table {
+ width: auto;
+ margin-bottom: 10px;
+}
+.markdown-rendered table th, .markdown-rendered table td {
+ padding: 4px 8px;
+ border: 1px solid #C8C8C8;
+}
+.markdown-rendered table tr:nth-child(even) td {
+ background: #F5F5F5;
+}
+.markdown-rendered h1, .markdown-rendered h2, .markdown-rendered h3,
+.markdown-rendered h4, .markdown-rendered h5, .markdown-rendered h6 {
+ font-weight: bold;
+}
+.markdown-rendered h1 a, .markdown-rendered h2 a, .markdown-rendered h3 a,
+.markdown-rendered h4 a, .markdown-rendered h5 a, .markdown-rendered h6 a {
+ color: #333;
+ text-decoration: none;
+}
+.markdown-rendered blockquote {
+ font-size: 15px;
+ border-left: 4px solid #ddd;
+ color: #777;
+ padding: 0 16px;
+}
+.markdown-rendered code {
+ color: #333;
+ background: rgba(0, 0, 0, 0.04);
+}
+.markdown-rendered img {
+ max-width: 100%;
+}
+.markdown-rendered .task-list-item {
+ list-style: none;
+ margin-left: -21px;
+}
+.markdown-rendered .task-list-item input {
+ margin-right: 8px;
+}
+.markdown-rendered .permalinked a.permalink {
+ display: none;
+}
+.markdown-rendered .permalinked:hover a.permalink {
+ display: inline;
+}
+.markdown-rendered h1.permalinked a.permalink {
+ margin-left: 12px;
+ font-size: 24px;
+}
+.markdown-rendered h2.permalinked a.permalink {
+ margin-left: 10px;
+ font-size: 20px;
+}
+.markdown-rendered h3.permalinked a.permalink {
+ margin-left: 8px;
+ font-size: 16px;
+}
+.markdown-rendered h4.permalinked a.permalink {
+ margin-left: 6px;
+ font-size: 14px;
+}
+.markdown-rendered h5.permalinked a.permalink {
+ margin-left: 4px;
+ font-size: 12px;
+}
+.markdown-rendered h6.permalinked a.permalink {
+ margin-left: 2px;
+ font-size: 10px;
+}
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
new file mode 100644
index 0000000000..0fca7e6803
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
@@ -0,0 +1,259 @@
+gitplex.server.markdown = {
+ getSplitCookieKey: function($body) {
+ if ($body.hasClass("compact"))
+ return "markdownEditor.compactSplitView";
+ else
+ return "markdownEditor.splitView";
+ },
+ onDomReady: function(containerId, callback) {
+ var $container = $("#" + containerId);
+ var $markdownEditor = $container.children(".markdown-editor");
+ var $head = $markdownEditor.children(".head");
+ var $body = $markdownEditor.children(".body");
+ var $editLink = $head.find(".edit");
+ var $previewLink = $head.find(".preview");
+ var $splitLink = $head.find(".split");
+ var $input = $body.children(".input");
+ var $preview = $body.children(".preview");
+
+ $input.caret(0);
+
+ $editLink.click(function() {
+ $preview.hide();
+ $input.show().focus();
+ $editLink.addClass("active");
+ $previewLink.removeClass("active");
+ $splitLink.removeClass("active");
+ $body.removeClass("preview-mode").removeClass("split-mode").addClass("edit-mode");
+ onLayoutChange();
+ Cookies.set(gitplex.server.markdown.getSplitCookieKey($body), false, {expires: Infinity});
+ });
+ $previewLink.click(function() {
+ var caret = $input.caret();
+ if ($input.val().substring(0, caret).trim().length == 0) {
+ /*
+ * If Caret is at the beginning of the input, we should not scroll preview at all
+ * for better user experience
+ */
+ caret = -1;
+ caretOffset = 0;
+ } else {
+ caretOffset = getCaretCoordinates($input[0], caret).top - $input.scrollTop();
+ }
+ $preview.data("caret", caret);
+ $preview.data("caretOffset", caretOffset);
+
+ $preview.html("<div class='message'>Loading...</div>");
+ $preview.show();
+ $input.hide();
+ $editLink.removeClass("active");
+ $previewLink.addClass("active");
+ $splitLink.removeClass("active");
+ $body.removeClass("edit-mode").removeClass("split-mode").addClass("preview-mode");
+ onLayoutChange();
+ callback("render", $input.val());
+ });
+ $splitLink.click(function() {
+ $input.show().focus();
+ $preview.html("<div class='message'>Loading...</div>");
+ $preview.show();
+ $editLink.removeClass("active");
+ $previewLink.removeClass("active");
+ $splitLink.addClass("active");
+ $body.removeClass("edit-mode").removeClass("preview-mode").addClass("split-mode");
+ onLayoutChange();
+ callback("render", $input.val());
+ Cookies.set(gitplex.server.markdown.getSplitCookieKey($body), true, {expires: Infinity});
+ });
+
+ $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"))
+ gitplex.server.markdown.syncPreviewScroll(containerId);
+ }, 500);
+
+ $markdownEditor.on("autofit", function(e, width, height) {
+ height -= $head.outerHeight();
+ if ($body.hasClass("compact")) {
+ $input.outerHeight(height/2);
+ } else {
+ $input.outerHeight(height);
+ }
+ $preview.outerHeight($input.outerHeight());
+ });
+
+ function onLayoutChange() {
+ if (!($body.hasClass("compact"))) {
+ if ($preview.is(":visible") && $input.is(":visible")) {
+ $preview.css("width", "50%");
+ $input.css("width", "50%");
+ } else if ($preview.is(":visible")) {
+ $preview.css("width", "100%");
+ } else {
+ $input.css("width", "100%");
+ }
+ }
+ }
+
+ },
+ /*
+ * Sync preview scroll bar with input scroll bar so that the text at input caret
+ * is always visible in preview window
+ */
+ syncPreviewScroll: function(containerId) {
+ var $preview = $("#" + containerId + ">.markdown-editor>.body>.preview");
+ var $input = $("#" + containerId + ">.markdown-editor>.body>.input");
+ var caret;
+ var caretOffset; // offset in pixel from caret to input top border
+ if ($input.is(":visible")) {
+ caret = $input.caret();
+ if ($input.val().substring(0, caret).trim().length == 0) {
+ /*
+ * If Caret is at the beginning of the input, we should not scroll preview at all
+ * for better user experience
+ */
+ caret = -1;
+ caretOffset = 0;
+ } else {
+ caretOffset = getCaretCoordinates($input[0], caret).top - $input.scrollTop();
+ }
+ } else {
+ caret = $preview.data("caret");
+ caretOffset = $preview.data("caretOffset");
+ }
+ var $blockNearCaret;
+ $preview.find("[data-sourcestart]").each(function() {
+ var sourceStart = parseInt($(this).data("sourcestart"));
+ if (sourceStart <= caret) {
+ $blockNearCaret = $(this);
+ }
+ $(this).removeClass("focusing");
+ });
+
+ if ($blockNearCaret) {
+ /*
+ * Found a block nearby caret. Below logic adjusts the scroll offset to make sure that
+ * the block is visible and try to adjust its position to stay on the same height with
+ * input caret for better user experience
+ */
+ var blockTop = $blockNearCaret.offset().top + $preview.scrollTop() - $preview.offset().top;
+ var blockBottom = blockTop + $blockNearCaret.outerHeight();
+
+ var scrollTop;
+ if (parseInt($blockNearCaret.data("sourceend")) <= caret) {
+ /*
+ * We are behind the block, so we will make sure that bottom of the block is
+ * always visible
+ */
+ scrollTop = blockTop - caretOffset;
+ if (blockBottom - scrollTop > $preview.height()) {
+ scrollTop = blockBottom - $preview.height();
+ }
+ } else {
+ /*
+ * We are at the beginning or in the middle of the block, so make sure that top of
+ * the block is always visible
+ */
+ scrollTop = blockBottom - caretOffset;
+ if (blockTop - scrollTop < 0) {
+ scrollTop = blockTop;
+ }
+ }
+ // Highlight the block so that user can easily find matching block while editing
+ $blockNearCaret.addClass("focusing");
+ } else {
+ scrollTop = 0;
+ }
+ $preview.scrollTop(scrollTop);
+ },
+ onWindowLoad: function(containerId) {
+ var $head = $("#" + containerId + ">.markdown-editor>.head");
+ var $body = $("#" + containerId + ">.markdown-editor>.body");
+ var $preview = $body.children(".preview");
+ var $input = $body.children(".input");
+ $preview.outerHeight($input.outerHeight());
+
+ if (Cookies.get(gitplex.server.markdown.getSplitCookieKey($body)) === "true")
+ $head.find(".split").trigger("click");
+ },
+ onRendered: function(containerId, html) {
+ var $preview = $("#" + containerId + ">.markdown-editor>.body>.preview");
+
+ var existingImages = {};
+ $preview.find("img").each(function() {
+ var key = this.outerHTML;
+ var elements = existingImages[key];
+ if (!elements)
+ elements = [];
+ elements.push(this);
+ existingImages[key] = elements;
+ });
+
+ $preview.html(html);
+ gitplex.server.markdown.initRendered($preview);
+
+ // Avoid loading existing image
+ $preview.find("img").each(function() {
+ var key = this.outerHTML;
+ var elements = existingImages[key];
+ if (elements) {
+ var element = elements.shift();
+ if (element) {
+ $(this).removeAttr("src");
+ $(this).replaceWith(element);
+ }
+ }
+ });
+
+ gitplex.server.markdown.syncPreviewScroll(containerId);
+
+ $preview.find("img").load(function() {
+ gitplex.server.markdown.syncPreviewScroll(containerId);
+ });
+
+ },
+
+ initRendered: function($rendered) {
+ gitplex.server.highlight($rendered);
+
+ $rendered.find("h1, h2, h3, h4, h5, h6").each(function() {
+ var $this = $(this);
+ var $anchor = $this.find(">a[name]");
+ if ($anchor.length != 0) {
+ $this.addClass("permalinked").append($anchor.html());
+ $anchor.empty();
+ $this.append("<a href='#" + $anchor.attr("name") + "' class='permalink'><i class='fa fa-link'></i></a>");
+ } else {
+ var anchorName = encodeURIComponent($this.text());
+ $this.addClass("permalinked").prepend("<a name='" + anchorName + "'></a>");
+ $this.append("<a href='#" + anchorName + "' class='permalink'><i class='fa fa-link'></i></a>");
+ }
+ });
+
+ $rendered.find("a").click(function() {
+ gitplex.server.viewState.getFromViewAndSetToHistory();
+ });
+ },
+
+ initResponsiveTask: function(containerId, taskCallback, taskClass,
+ taskSourcePositionDataAttribute) {
+ var $rendered = $("#" + containerId);
+
+ var $task = $rendered.find("." + taskClass);
+ var $taskCheckbox = $task.children("input");
+ $taskCheckbox.removeAttr("disabled").removeAttr("readonly");
+ $taskCheckbox.change(function() {
+ taskCallback($(this).parent().data(taskSourcePositionDataAttribute), $(this).prop("checked"));
+ });
+ }
+
+}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/editable/string/StringEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/string/StringEditSupport.java
index 64829ef241..621df57bcb 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/string/StringEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/string/StringEditSupport.java
@@ -11,7 +11,7 @@ import com.gitplex.server.util.editable.annotation.Markdown;
import com.gitplex.server.util.editable.annotation.Multiline;
import com.gitplex.server.util.editable.annotation.Password;
import com.gitplex.server.web.component.MultilineLabel;
-import com.gitplex.server.web.component.markdownviewer.MarkdownViewer;
+import com.gitplex.server.web.component.markdown.MarkdownViewer;
import com.gitplex.server.web.editable.BeanContext;
import com.gitplex.server.web.editable.EditSupport;
import com.gitplex.server.web.editable.NotDefinedLabel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.java
index 196c4af988..0cc1259ce5 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.java
@@ -19,7 +19,7 @@ import com.gitplex.server.model.Account;
import com.gitplex.server.model.Team;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
-import com.gitplex.server.web.component.markdownviewer.MarkdownViewer;
+import com.gitplex.server.web.component.markdown.MarkdownViewer;
import com.gitplex.server.web.component.tabbable.PageTab;
import com.gitplex.server.web.component.tabbable.PageTabLink;
import com.gitplex.server.web.component.tabbable.Tabbable;
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/base.css b/web/src/main/java/com/gitplex/server/web/page/base/base.css
index c94abbf98f..ad818a0dc9 100644
--- a/web/src/main/java/com/gitplex/server/web/page/base/base.css
+++ b/web/src/main/java/com/gitplex/server/web/page/base/base.css
@@ -30,10 +30,6 @@ html body {
margin-bottom: 0;
}
-.scrollable {
- overflow: auto;
-}
-
/* FEEDBACK */
#session-feedback {
position:absolute;
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/base.js b/web/src/main/java/com/gitplex/server/web/page/base/base.js
index 2bf4cab530..6c613ef6ca 100644
--- a/web/src/main/java/com/gitplex/server/web/page/base/base.js
+++ b/web/src/main/java/com/gitplex/server/web/page/base/base.js
@@ -209,15 +209,22 @@ gitplex.server = {
}
},
setupAutoSize: function() {
- var selector = "textarea:not(.no-autosize)";
- autosize($(selector));
+ function doAutosize($textarea) {
+ $textarea.each(function() {
+ if ($(this).closest(".no-autosize").length == 0) {
+ autosize($(this));
+ }
+ });
+ }
+
+ doAutosize($("textarea"));
$(document).on("elementReplaced", function(event, componentId) {
var $component = $("#" + componentId);
- var $textarea = $component.find(selector);
- if ($component.is(selector))
+ var $textarea = $component.find("textarea");
+ if ($component.is("textarea"))
$textarea = $textarea.add($component);
- autosize($textarea);
+ doAutosize($textarea);
});
},
setupAjaxLoadingIndicator: function() {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/commit-option.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/commit-option.css
index 8e5cc32936..de2612be5d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/commit-option.css
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/commit-option.css
@@ -1,6 +1,5 @@
.commit-option {
padding: 20px;
- overflow: auto;
}
.commit-option>.head {
font-weight: bold;
@@ -13,4 +12,4 @@
}
.commit-option .text-diff>.head>.actions {
display: none;
-}
\ No newline at end of file
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.html
index 29f0f4878f..2c22827e68 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.html
@@ -6,7 +6,7 @@
<div class="pull-left cancel"><a wicket:id="cancelLink" tabindex="-1">Cancel</a></div>
<div wicket:id="editOptions" class="options pull-right"></div>
</div>
- <div class="body scrollable">
+ <div class="body">
<form wicket:id="content" class="content leave-confirm">
<div wicket:id="editor" class="editor"></div>
<a wicket:id="submit" class="submit">submit</a>
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.java
index 1400d6abd4..1807c8beb3 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.java
@@ -149,7 +149,7 @@ public abstract class BlobEditPanel extends Panel {
response.render(JavaScriptHeaderItem.forReference(new BlobEditResourceReference()));
- String script = String.format("gitplex.server.blobEdit.init('%s');", getMarkupId());
+ String script = String.format("gitplex.server.blobEdit.onDomReady('%s');", getMarkupId());
response.render(OnDomReadyHeaderItem.forScript(script));
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.css
index 611a120911..a00d56b212 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.css
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.css
@@ -29,6 +29,7 @@
}
.blob-edit>.body {
margin-top: 1px;
+ overflow: auto;
}
.blob-edit>.body>.content>.submit,
.blob-edit>.body>.commit-options,
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.js
index 12092adc2c..2419cb7896 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.js
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.js
@@ -1,5 +1,5 @@
gitplex.server.blobEdit = {
- init: function(containerId) {
+ onDomReady: function(containerId) {
var $container = $("#" + containerId);
var $blobEdit = $container.children(".blob-edit");
var $head = $blobEdit.children(".head");
@@ -13,6 +13,9 @@ gitplex.server.blobEdit = {
$body.children(".content").children(".submit").click();
});
+ if ($body.find(".autofit").length != 0)
+ $body.css("overflow", "visible");
+
$blobEdit.on("getViewState", function(e) {
if ($content.is(":visible"))
return {scroll:{left: $body.scrollLeft(), top: $body.scrollTop()}};
@@ -46,13 +49,20 @@ gitplex.server.blobEdit = {
var $body = $blobEdit.children(".body");
$body.children().hide();
+
if ($tab.hasClass("edit")) {
- $body.children(".content").show().find(".autofit:visible").first().triggerHandler("show");
+ $body.children(".content").show();
} else {
- /*
- * Show scroll bar in case it is hidden in edit tab by sub class
- */
+ $body.children(".commit-options").show();
+ }
+ if ($body.find(".autofit").length != 0)
+ $body.css("overflow", "visible");
+ else
$body.css("overflow", "auto");
+
+ if ($tab.hasClass("edit")) {
+ $body.children(".content").show();
+ } else {
$body.children(".commit-options").show();
}
},
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.java
index 620cf64ac2..251baa482c 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.java
@@ -34,7 +34,7 @@ import com.gitplex.server.git.BlobIdent;
import com.gitplex.server.model.Depot;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;
-import com.gitplex.server.web.component.markdownviewer.MarkdownViewer;
+import com.gitplex.server.web.component.markdown.MarkdownViewer;
import com.gitplex.server.web.page.depot.blob.DepotBlobPage;
import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;
import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.java
index 7dcbd672ea..4aa711f4c6 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.java
@@ -23,7 +23,7 @@ public class MarkdownBlobEditPanel extends BlobEditPanel {
@Override
protected FormComponentPanel<byte[]> newContentEditor(String componentId, byte[] initialContent) {
- return new MarkdownFormComponent(componentId, initialContent, context.getMode() == Mode.EDIT);
+ return new MarkdownBlobEditor(componentId, initialContent, context.getMode() == Mode.EDIT);
}
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.html
new file mode 100644
index 0000000000..ce303f69a8
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ <div wicket:id="input" class="no-autosize"></div>
+</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownFormComponent.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.java
similarity index 63%
rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownFormComponent.java
rename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.java
index de8e822212..616f2b6474 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownFormComponent.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.java
@@ -3,20 +3,19 @@ package com.gitplex.server.web.page.depot.blob.render.renderers.markdown;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.form.FormComponentPanel;
-import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.model.Model;
-import com.gitplex.server.web.behavior.markdown.MarkdownBehavior;
+import com.gitplex.server.web.component.markdown.MarkdownEditor;
import com.google.common.base.Charsets;
@SuppressWarnings("serial")
-public class MarkdownFormComponent extends FormComponentPanel<byte[]> {
+class MarkdownBlobEditor extends FormComponentPanel<byte[]> {
private final boolean autoFocus;
- private TextArea<String> input;
+ private MarkdownEditor input;
- public MarkdownFormComponent(String id, byte[] initialContent, boolean autoFocus) {
+ public MarkdownBlobEditor(String id, byte[] initialContent, boolean autoFocus) {
super(id, Model.of(initialContent));
this.autoFocus = autoFocus;
}
@@ -25,10 +24,8 @@ public class MarkdownFormComponent extends FormComponentPanel<byte[]> {
protected void onInitialize() {
super.onInitialize();
- input = new TextArea<String>("input", Model.of(new String(getModelObject(), Charsets.UTF_8)));
-
- input.add(new MarkdownBehavior());
- add(input);
+ add(input = new MarkdownEditor("input", Model.of(new String(getModelObject(), Charsets.UTF_8)), false));
+ input.setOutputMarkupId(true);
}
@Override
@@ -44,7 +41,7 @@ public class MarkdownFormComponent extends FormComponentPanel<byte[]> {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
if (autoFocus) {
- String script = String.format("$('#%s').focus();", input.getMarkupId());
+ String script = String.format("$('#%s textarea').focus();", input.getMarkupId());
response.render(OnDomReadyHeaderItem.forScript(script));
}
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.java
index be6dc99293..f577460e33 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.java
@@ -5,7 +5,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.model.Model;
import com.gitplex.server.git.Blob;
-import com.gitplex.server.web.component.markdownviewer.MarkdownViewer;
+import com.gitplex.server.web.component.markdown.MarkdownViewer;
import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;
import com.gitplex.server.web.page.depot.blob.render.view.BlobViewPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownFormComponent.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownFormComponent.html
deleted file mode 100644
index 0588662f45..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownFormComponent.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<wicket:panel>
- <textarea wicket:id="input" class="input"></textarea>
-</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.css
index 7e5086c98f..7d638d931d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.css
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.css
@@ -5,12 +5,20 @@
margin-right: auto;
}
-.blob-edit .md-editor {
- border: none;
+.blob-edit .markdown-editor>.body.edit-mode>.input,
+.blob-edit .markdown-editor>.body.preview-mode>.preview,
+.blob-edit .markdown-editor>.body.split-mode>.preview {
+ border-bottom: none;
+ border-left: none;
+ border-right: none;
+}
+.blob-edit .markdown-editor>.body.split-mode>.input,
+.blob-edit .markdown-editor>.body>.preview {
+ border-bottom: none;
+ border-left: none;
+}
+.blob-edit .markdown-editor>.body>.input {
+ min-height: none;
+ max-height: none;
+ resize: none;
}
-
-.blob-edit .md-preview {
- overflow: hidden;
- height: auto !important;
- width: auto !important;
-}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html
index b977bcaf43..8e488ae6a4 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html
@@ -10,7 +10,7 @@
<a wicket:id="close" class="pull-left close" title="Hide comment"><i class="fa fa-times"></i></a>
<a wicket:id="toggleResolve" class="pull-right resolve"><i class="fa fa-check-circle"></i></a>
</div>
- <div wicket:id="body" class="body scrollable"></div>
+ <div wicket:id="body" class="body"></div>
</div>
</div>
<div class="code"></div>
@@ -21,7 +21,7 @@
<span class="pull-left">Outline</span>
<a wicket:id="close" class="pull-right close" title="Hide outline"><i class="fa fa-times"></i></a>
</div>
- <div wicket:id="body" class="body scrollable"></div>
+ <div wicket:id="body" class="body"></div>
</div>
</div>
</div>
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java
index 970a4c6404..cc7fe53b76 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java
@@ -28,7 +28,7 @@ public class SourceViewResourceReference extends BaseDependentResourceReference
dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new SelectionPopoverResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));
-
+
dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));
dependencies.add(CssHeaderItem.forReference(
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js
index 0a8af28468..c5fdb63bbc 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js
@@ -39,17 +39,6 @@ gitplex.server.sourceEdit = {
gitplex.server.codemirror.bindKeys(cm);
- function hideParentScrollBar() {
- var $scrollable = $sourceEdit.closest(".scrollable");
- /*
- * Hide scroll bar of parent scrollable as we will be using
- * CodeMirror scroll bar
- */
- $scrollable.css("overflow", "visible");
- }
-
- hideParentScrollBar();
-
cm.on("change", function() {
$sourceEdit.closest("form").addClass("dirty");
});
@@ -71,8 +60,6 @@ gitplex.server.sourceEdit = {
cm.setOption("fullScreen", false);
cm.setSize($sourceEdit.width(), $sourceEdit.height());
});
-
- $sourceEdit.on("show", hideParentScrollBar);
},
onWindowLoad: function(containerId, mark) {
var cm = gitplex.server.sourceEdit.getCodeMirror(containerId);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js
index 204f139c23..835fcd41c3 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js
@@ -28,10 +28,6 @@ gitplex.server.sourceView = {
$sourceView.data("callback", callback);
$sourceView.data("blameMessageCallback", blameMessageCallback);
- // Hide scroll bar of parent scrollable as we will be using
- // CodeMirror scroll bar
- $sourceView.closest(".scrollable").css("overflow", "visible");
-
if (mark) {
gitplex.server.codemirror.mark(cm, mark);
$sourceView.data("mark", mark);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.html
index 1ffd27840d..41010e2200 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.html
@@ -29,7 +29,7 @@
</div>
</div>
</div>
- <div class="body scrollable">
+ <div class="body">
<wicket:child></wicket:child>
</div>
</div>
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.java
index 87fc1aeab1..76ff9336a9 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.java
@@ -194,7 +194,7 @@ public abstract class BlobViewPanel extends Panel {
response.render(JavaScriptHeaderItem.forReference(new BlobViewResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript(String.format("gitplex.server.blobView('%s');", getMarkupId())));
+ response.render(OnDomReadyHeaderItem.forScript(String.format("gitplex.server.blobView.onDomReady('%s');", getMarkupId())));
}
public BlobRenderContext getContext() {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.css
index b7bdf7de59..f42e453ef5 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.css
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.css
@@ -2,6 +2,9 @@
border-bottom: 1px solid #BBB;
padding: 6px 12px;
}
+.blob-view>.body {
+ overflow: auto;
+}
.blob-view>.head>.info {
color: #666;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.js
index edbea34ff1..de051f700b 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.js
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.js
@@ -1,26 +1,32 @@
-gitplex.server.blobView = function(containerId) {
- var $blobView = $("#" + containerId + ">.blob-view");
- var $head = $blobView.find(">.head");
- var $body = $blobView.find(">.body");
+gitplex.server.blobView = {
- $blobView.on("getViewState", function(e) {
- return {scroll:{left: $body.scrollLeft(), top: $body.scrollTop()}};
- });
-
- $blobView.on("setViewState", function(e, viewState) {
- if (viewState.scroll) {
- $body.scrollLeft(viewState.scroll.left);
- $body.scrollTop(viewState.scroll.top);
- }
- });
-
- $blobView.on("autofit", function(e, width, height) {
- $blobView.outerWidth(width);
- $blobView.outerHeight(height);
+ onDomReady: function(containerId) {
+ var $blobView = $("#" + containerId + ">.blob-view");
+ var $head = $blobView.find(">.head");
+ var $body = $blobView.find(">.body");
+
+ if ($body.find(".autofit").length != 0)
+ $body.css("overflow", "visible");
+
+ $blobView.on("getViewState", function(e) {
+ return {scroll:{left: $body.scrollLeft(), top: $body.scrollTop()}};
+ });
+
+ $blobView.on("setViewState", function(e, viewState) {
+ if (viewState.scroll) {
+ $body.scrollLeft(viewState.scroll.left);
+ $body.scrollTop(viewState.scroll.top);
+ }
+ });
- height = $blobView.height()-$head.outerHeight();
- $body.outerWidth(width).outerHeight(height);
- $body.find(".autofit:visible").first().triggerHandler("autofit", [$body.width(), $body.height()]);
- });
-
-};
\ No newline at end of file
+ $blobView.on("autofit", function(e, width, height) {
+ $blobView.outerWidth(width);
+ $blobView.outerHeight(height);
+
+ height = $blobView.height()-$head.outerHeight();
+ $body.outerWidth(width).outerHeight(height);
+ $body.find(".autofit:visible").first().triggerHandler("autofit", [$body.width(), $body.height()]);
+ });
+ }
+
+};
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java
index b7eaa47403..053597b145 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java
@@ -26,7 +26,7 @@ import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
import com.gitplex.server.web.component.depotselector.DepotSelector;
import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
-import com.gitplex.server.web.component.markdownviewer.MarkdownViewer;
+import com.gitplex.server.web.component.markdown.MarkdownViewer;
import com.gitplex.server.web.component.modal.ModalLink;
import com.gitplex.server.web.page.depot.blob.DepotBlobPage;
import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java
index 1ab0f9b39d..ad251ba272 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java
@@ -23,11 +23,11 @@ import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.PullRequestComment;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.behavior.markdown.AttachmentSupport;
-import com.gitplex.server.web.behavior.markdown.ResponsiveTaskBehavior;
import com.gitplex.server.web.component.comment.CommentInput;
import com.gitplex.server.web.component.comment.DepotAttachmentSupport;
import com.gitplex.server.web.component.link.AccountLink;
-import com.gitplex.server.web.component.markdownviewer.MarkdownViewer;
+import com.gitplex.server.web.component.markdown.MarkdownViewer;
+import com.gitplex.server.web.component.markdown.ResponsiveTaskBehavior;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.SinceChangesLink;
import com.gitplex.server.web.util.DateUtils;
import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java
index 907a1590fa..f1fa6a1afe 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java
@@ -22,11 +22,11 @@ import com.gitplex.server.model.PullRequest;
import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.behavior.markdown.AttachmentSupport;
-import com.gitplex.server.web.behavior.markdown.ResponsiveTaskBehavior;
import com.gitplex.server.web.component.comment.CommentInput;
import com.gitplex.server.web.component.comment.DepotAttachmentSupport;
import com.gitplex.server.web.component.link.AccountLink;
-import com.gitplex.server.web.component.markdownviewer.MarkdownViewer;
+import com.gitplex.server.web.component.markdown.MarkdownViewer;
+import com.gitplex.server.web.component.markdown.ResponsiveTaskBehavior;
import com.gitplex.server.web.util.DateUtils;
import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java
index fc5b816550..2afb891afc 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java
@@ -24,12 +24,12 @@ import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.PullRequestStatusChange;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.behavior.markdown.AttachmentSupport;
-import com.gitplex.server.web.behavior.markdown.ResponsiveTaskBehavior;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.component.comment.CommentInput;
import com.gitplex.server.web.component.comment.DepotAttachmentSupport;
import com.gitplex.server.web.component.link.AccountLink;
-import com.gitplex.server.web.component.markdownviewer.MarkdownViewer;
+import com.gitplex.server.web.component.markdown.MarkdownViewer;
+import com.gitplex.server.web.component.markdown.ResponsiveTaskBehavior;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.SinceChangesLink;
import com.gitplex.server.web.util.DateUtils;
import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;