Skip to content

The Unified and Autonomous Development Platform

Refactored codemirror text mark/scroll

robin shencfef108df527
diff --git a/web/src/main/java/com/gitplex/server/web/UrlMapper.java b/web/src/main/java/com/gitplex/server/web/UrlMapper.java
index 8ce4c019f0..e7d20cfc0a 100644
--- a/web/src/main/java/com/gitplex/server/web/UrlMapper.java
+++ b/web/src/main/java/com/gitplex/server/web/UrlMapper.java
@@ -1,6 +1,8 @@
package com.gitplex.server.web;
+import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
import org.apache.wicket.core.request.handler.IPageClassRequestHandler;
+import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
@@ -175,7 +177,8 @@ public class UrlMapper extends CompoundRequestMapper {
*/
@Override
public Url mapHandler(IRequestHandler requestHandler) {
- if (requestHandler instanceof IPageClassRequestHandler) {
+ if (requestHandler instanceof BookmarkablePageRequestHandler
+ || requestHandler instanceof RenderPageRequestHandler) {
IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler;
if (pageClassRequestHandler.getPageClass() == DepotBlobPage.class
&& pageClassRequestHandler.getPageParameters().get("revision").toString() == null) {
diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js
index e517a1a20a..bdc805c71c 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js
@@ -8,26 +8,23 @@ gitplex.server.codemirror = {
clearSelection: function(cm) {
cm.setCursor(cm.getCursor("from"));
},
- mark: function(cm, mark, scroll) {
+ mark: function(cm, mark) {
gitplex.server.codemirror.clearMark(cm);
cm.markText(
{line: mark.beginLine, ch: mark.beginChar},
{line: mark.endLine, ch: mark.endChar},
{className: "CodeMirror-mark"});
- if (scroll) {
- // use a timer to scroll after possible view port resize
- setTimeout(function() {
- var top = cm.charCoords({line: mark.beginLine, ch: 0}, "local").top;
- var bottom = cm.charCoords({line: mark.endLine, ch: 0}, "local").bottom;
-
- var markHeight = bottom - top;
- var clientHeight = cm.getScrollInfo().clientHeight;
- if (clientHeight <= markHeight) {
- cm.scrollTo(null, top - 50);
- } else {
- cm.scrollTo(null, (top+bottom-clientHeight)/2);
- }
- }, 0);
+ },
+ scrollTo: function(cm, mark) {
+ var top = cm.charCoords({line: mark.beginLine, ch: 0}, "local").top;
+ var bottom = cm.charCoords({line: mark.endLine, ch: 0}, "local").bottom;
+
+ var markHeight = bottom - top;
+ var clientHeight = cm.getScrollInfo().clientHeight;
+ if (clientHeight <= markHeight) {
+ cm.scrollTo(null, top - 50);
+ } else {
+ cm.scrollTo(null, (top+bottom-clientHeight)/2);
}
},
setMode: function(cm, filePath) {
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 a6f72d16ce..4cb81e62db 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
@@ -303,6 +303,7 @@ public abstract class CodeCommentPanel extends Panel {
Fragment activityContainer = new Fragment(componentId, "viewFrag", this, Model.of(identity));
activityContainer.setOutputMarkupId(true);
activityContainer.setMarkupId(activity.getAnchor());
+ activityContainer.add(AttributeAppender.append("name", activity.getAnchor()));
activityContainer.add(new AvatarLink("userAvatar", activity.getUser()));
activityContainer.add(new AccountLink("userName", activity.getUser()));
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
index 0f78d4711b..a4f461a3b2 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
@@ -1169,7 +1169,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
script = String.format(""
+ "var $container = $('#%s');"
+ "var mark = %s;"
- + "gitplex.server.textDiff.scroll($container, mark);"
+ + "gitplex.server.textDiff.scrollTo($container, mark);"
+ "gitplex.server.textDiff.mark($container, mark);",
getMarkupId(), getJson(mark));
} else {
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.js b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.js
index 385c02b1db..ba86791c3f 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.js
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.js
@@ -443,7 +443,7 @@ gitplex.server.textDiff = {
onWindowLoad: function(containerId, ajax, mark) {
var $container = $("#" + containerId);
if (!ajax && mark && !gitplex.server.history.isVisited()) {
- gitplex.server.textDiff.scroll($container, mark);
+ gitplex.server.textDiff.scrollTo($container, mark);
}
},
initBlameTooltip: function(containerId, $hashLink) {
@@ -589,7 +589,7 @@ gitplex.server.textDiff = {
oldOrNew: oldOrNew
};
},
- scroll: function($container, mark) {
+ scrollTo: function($container, mark) {
var markInfo = gitplex.server.textDiff.getMarkInfo($container, mark);
var $startTd = markInfo.startTd;
var $endTd = markInfo.endTd;
@@ -890,7 +890,7 @@ gitplex.server.textDiff = {
$container.data("mark", comment.mark);
gitplex.server.textDiff.highlightCommentTrigger($container);
gitplex.server.textDiff.mark($container, comment.mark);
- gitplex.server.textDiff.scroll($container, comment.mark);
+ gitplex.server.textDiff.scrollTo($container, comment.mark);
},
onCloseComment: function($container) {
$container.removeData("openComment");
@@ -908,7 +908,7 @@ gitplex.server.textDiff = {
setTimeout(function() {
gitplex.server.textDiff.highlightCommentTrigger($container);
gitplex.server.textDiff.mark($container, mark);
- gitplex.server.textDiff.scroll($container, mark);
+ gitplex.server.textDiff.scrollTo($container, mark);
}, 100);
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java b/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java
index d7d984fb6b..be9ff0419b 100644
--- a/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java
@@ -69,7 +69,22 @@ public abstract class BasePage extends WebPage {
if (!isPermitted())
unauthorized();
- add(new Label("pageTitle", getPageTitle()));
+ add(new Label("pageTitle", getPageTitle()) {
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ /*
+ * Render page resources in first child to make sure every other resources appears after it,
+ * including onDomReady and onWindowLoad call
+ */
+ response.render(JavaScriptHeaderItem.forReference(new BaseResourceReference()));
+ response.render(OnDomReadyHeaderItem.forScript("gitplex.server.onDomReady();"));
+ response.render(OnLoadHeaderItem.forScript("gitplex.server.onWindowLoad();"));
+ }
+
+ });
add(new WebMarkupContainer("pageRefresh") {
@@ -196,14 +211,6 @@ public abstract class BasePage extends WebPage {
super.onAfterRender();
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new BaseResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript("gitplex.server.onDomReady();"));
- response.render(OnLoadHeaderItem.forScript("gitplex.server.onWindowLoad();"));
- }
-
public Collection<WebSocketRegion> getWebSocketRegions() {
return new ArrayList<>();
}
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 999a361a4a..02b960f71e 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
@@ -386,6 +386,9 @@ gitplex.server = {
else
return undefined;
},
+ getFromCarryOver: function() {
+ return gitplex.server.viewState.carryOver;
+ },
setToHistory: function(viewState) {
var state = history.state;
if (!state)
@@ -409,8 +412,9 @@ gitplex.server = {
gitplex.server.viewState.setToView(viewState);
},
getFromCarryOverAndSetToView: function() {
- if (gitplex.server.viewState.carryOver)
- gitplex.server.viewState.setToView(gitplex.server.viewState.carryOver)
+ var viewState = gitplex.server.viewState.getFromCarryOver();
+ if (viewState)
+ gitplex.server.viewState.setToView(viewState);
}
},
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
index 3e9e0694cd..2e1b35d7c4 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
@@ -127,8 +127,6 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
public DepotBlobPage(final PageParameters params) {
super(params);
- System.out.println(RequestCycle.get().getRequest().getUrl());
-
if (getDepot().getDefaultBranch() == null)
throw new RestartResponseException(NoBranchesPage.class, paramsOf(getDepot()));
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditPanel.java
index 061d62dd42..e569e4d95e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditPanel.java
@@ -8,6 +8,7 @@ import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
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.unbescape.javascript.JavaScriptEscape;
@@ -137,15 +138,21 @@ public class SourceEditPanel extends BlobEditPanel implements MarkSupport {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(JavaScriptHeaderItem.forReference(new SourceEditResourceReference()));
- String script = String.format("gitplex.server.sourceEdit.init('%s', '%s', %s, '%s', %s, '%s', %b);",
+
+ String jsonOfMark = context.getMark()!=null?getJson(context.getMark()):"undefined";
+ String script = String.format("gitplex.server.sourceEdit.onDomReady('%s', '%s', %s, '%s', %s, '%s', %b);",
sourceFormComponent.getMarkupId(),
JavaScriptEscape.escapeJavaScript(context.getNewPath()),
- context.getMark()!=null?getJson(context.getMark()):"undefined",
+ jsonOfMark,
sourceFormat.getIndentType(),
sourceFormat.getTabSize(),
sourceFormat.getLineWrapMode(),
context.getMode() == Mode.EDIT);
response.render(OnDomReadyHeaderItem.forScript(script));
+
+ script = String.format("gitplex.server.sourceEdit.onWindowLoad('%s', %s);",
+ sourceFormComponent.getMarkupId(), jsonOfMark);
+ response.render(OnLoadHeaderItem.forScript(script));
}
private String getJson(TextRange mark) {
@@ -158,8 +165,14 @@ public class SourceEditPanel extends BlobEditPanel implements MarkSupport {
@Override
public void mark(AjaxRequestTarget target, TextRange mark) {
- String script = String.format("gitplex.server.sourceEdit.mark('%s', %s);",
- sourceFormComponent.getMarkupId(), getJson(mark));
+ String script;
+ if (mark != null) {
+ script = String.format("gitplex.server.sourceEdit.mark('%s', %s);",
+ sourceFormComponent.getMarkupId(), getJson(mark));
+ } else {
+ script = String.format("gitplex.server.sourceEdit.mark('%s', undefined);",
+ sourceFormComponent.getMarkupId());
+ }
target.appendJavaScript(script);
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
index 8d06ce4501..7e3c795815 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
@@ -27,6 +27,7 @@ import org.apache.wicket.markup.ComponentTag;
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.Form;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -216,16 +217,6 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
target.appendJavaScript("gitplex.server.sourceView.onToggleOutline();");
}
- private void mark(AjaxRequestTarget target, @Nullable TextRange mark, boolean scroll) {
- String script;
- if (mark != null) {
- script = String.format("gitplex.server.sourceView.mark(%s, %s);", getJson(mark), scroll);
- } else {
- script = String.format("gitplex.server.sourceView.mark(undefined, false);");
- }
- target.appendJavaScript(script);
- }
-
private String getJson(TextRange mark) {
try {
return GitPlex.getInstance(ObjectMapper.class).writeValueAsString(mark);
@@ -295,7 +286,7 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
} else {
mark = (TextRange) commentContainer.getDefaultModelObject();
}
- mark(target, mark, true);
+ mark(target, mark);
context.onMark(target, mark);
target.appendJavaScript(String.format("$('#%s').blur();", getMarkupId()));
}
@@ -485,7 +476,7 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
@Override
public void onClick(AjaxRequestTarget target) {
clearComment(target);
- target.appendJavaScript("gitplex.server.sourceView.mark(undefined, false);");
+ target.appendJavaScript("gitplex.server.sourceView.mark(undefined);");
target.appendJavaScript("gitplex.server.sourceView.onLayoutChange();");
context.onMark(target, null);
}
@@ -854,15 +845,18 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
+
+ String jsonOfMark = context.getMark()!=null?getJson(context.getMark()):"undefined";
+
CharSequence callback = ajaxBehavior.getCallbackFunction(
explicit("action"), explicit("param1"), explicit("param2"),
explicit("param3"), explicit("param4"));
- String script = String.format("gitplex.server.sourceView.init('%s', '%s', %s, %s, '%s', '%s', "
+ String script = String.format("gitplex.server.sourceView.onDomReady('%s', '%s', %s, %s, '%s', '%s', "
+ "%s, %s, %s, %s, %s, '%s', %s, '%s');",
JavaScriptEscape.escapeJavaScript(context.getBlobIdent().path),
JavaScriptEscape.escapeJavaScript(blob.getText().getContent()),
context.getOpenComment()!=null?getJsonOfComment(context.getOpenComment()):"undefined",
- context.getMark()!=null?getJson(context.getMark()):"undefined",
+ jsonOfMark,
symbolTooltip.getMarkupId(),
context.getBlobIdent().revision,
jsonOfBlameInfos,
@@ -874,6 +868,9 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
sourceFormat.getTabSize(),
sourceFormat.getLineWrapMode());
response.render(OnDomReadyHeaderItem.forScript(script));
+
+ script = String.format("gitplex.server.sourceView.onWindowLoad(%s);", jsonOfMark);
+ response.render(OnLoadHeaderItem.forScript(script));
}
@Override
@@ -919,7 +916,13 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
@Override
public void mark(AjaxRequestTarget target, TextRange mark) {
- mark(target, mark, true);
+ String script;
+ if (mark != null) {
+ script = String.format("gitplex.server.sourceView.mark(%s);", getJson(mark));
+ } else {
+ script = String.format("gitplex.server.sourceView.mark(undefined);");
+ }
+ target.appendJavaScript(script);
}
}
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 fc935c9804..e56f76b79b 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
@@ -1,6 +1,5 @@
gitplex.server.sourceEdit = {
- init: function(containerId, filePath, mark, indentType,
- tabSize, lineWrapMode, autoFocus) {
+ onDomReady: function(containerId, filePath, mark, indentType, tabSize, lineWrapMode, autoFocus) {
var $container = $("#" + containerId);
var $sourceEdit = $container.children(".source-edit");
var $code = $sourceEdit.children(".code");
@@ -44,9 +43,8 @@ gitplex.server.sourceEdit = {
*/
$sourceEdit.closest("form").find("textarea").addClass("no-dirtytrack");
- if (mark) {
- gitplex.server.codemirror.mark(cm, mark, true);
- }
+ if (mark)
+ gitplex.server.codemirror.mark(cm, mark);
cm.oldDocValue = cm.doc.getValue();
@@ -84,73 +82,85 @@ gitplex.server.sourceEdit = {
hideParentScrollBar();
$sourceEdit.on("show", hideParentScrollBar);
},
+ onWindowLoad: function(containerId, mark) {
+ var cm = gitplex.server.sourceEdit.getCodeMirror(containerId);
+ if (mark && gitplex.server.viewState.getFromHistory() === undefined
+ && gitplex.server.viewState.getFromCarryOver() === undefined) {
+ gitplex.server.codemirror.scrollTo(cm, mark);
+ }
+ },
mark: function(containerId, mark) {
var cm = gitplex.server.sourceEdit.getCodeMirror(containerId);
- if (cm.oldDocValue) {
- var dmp = new diff_match_patch();
- var diffs = dmp.diff_main(cm.oldDocValue, cm.doc.getValue());
-
- var beginLine = mark.beginLine, beginChar = mark.beginChar;
- var endLine = mark.endLine, endChar = mark.endChar;
- var newBeginLine, newBeginChar, newEndLine, newEndChar;
- var oldLine = oldChar = newLine = newChar = 0;
- for (var i=0; i<diffs.length; i++) {
- var diff = diffs[i];
- var chars = diff[1];
- var quit = false;
- for (var j=0; j<chars.length; j++) {
- var char = chars[j];
- if (diff[0] == -1) {
- if (char == '\n') {
- oldLine++;
- oldChar = 0;
- } else {
- oldChar++;
- }
- } else if (diff[0] == 1) {
- if (char == '\n') {
- newLine++;
- newChar = 0;
+ if (mark) {
+ if (cm.oldDocValue) {
+ var dmp = new diff_match_patch();
+ var diffs = dmp.diff_main(cm.oldDocValue, cm.doc.getValue());
+
+ var beginLine = mark.beginLine, beginChar = mark.beginChar;
+ var endLine = mark.endLine, endChar = mark.endChar;
+ var newBeginLine, newBeginChar, newEndLine, newEndChar;
+ var oldLine = oldChar = newLine = newChar = 0;
+ for (var i=0; i<diffs.length; i++) {
+ var diff = diffs[i];
+ var chars = diff[1];
+ var quit = false;
+ for (var j=0; j<chars.length; j++) {
+ var char = chars[j];
+ if (diff[0] == -1) {
+ if (char == '\n') {
+ oldLine++;
+ oldChar = 0;
+ } else {
+ oldChar++;
+ }
+ } else if (diff[0] == 1) {
+ if (char == '\n') {
+ newLine++;
+ newChar = 0;
+ } else {
+ newChar++;
+ }
} else {
- newChar++;
+ if (oldLine == beginLine && oldChar == beginChar) {
+ newBeginLine = newLine;
+ newBeginChar = newChar;
+ }
+ if (char == '\n') {
+ oldLine++;
+ oldChar = 0;
+ newLine++;
+ newChar = 0;
+ } else {
+ oldChar++;
+ newChar++;
+ }
+ if (oldLine == endLine && oldChar == endChar) {
+ newEndLine = newLine;
+ newEndChar = newChar;
+ }
}
- } else {
- if (oldLine == beginLine && oldChar == beginChar) {
- newBeginLine = newLine;
- newBeginChar = newChar;
- }
- if (char == '\n') {
- oldLine++;
- oldChar = 0;
- newLine++;
- newChar = 0;
- } else {
- oldChar++;
- newChar++;
+ if (oldLine>beginLine && newBeginLine==undefined || oldLine>endLine) {
+ quit = true;
+ break;
}
- if (oldLine == endLine && oldChar == endChar) {
- newEndLine = newLine;
- newEndChar = newChar;
- }
}
- if (oldLine>beginLine && newBeginLine==undefined || oldLine>endLine) {
- quit = true;
+ if (quit)
break;
- }
}
- if (quit)
- break;
}
- }
-
- if (newBeginLine!=undefined && newEndLine!=undefined) {
- var newMark = {
- beginLine: newBeginLine,
- beginChar: newBeginChar,
- endLine: newEndLine,
- endChar: newEndChar
- };
- gitplex.server.codemirror.mark(cm, newMark, true);
+
+ if (newBeginLine!=undefined && newEndLine!=undefined) {
+ var newMark = {
+ beginLine: newBeginLine,
+ beginChar: newBeginChar,
+ endLine: newEndLine,
+ endChar: newEndChar
+ };
+ gitplex.server.codemirror.mark(cm, newMark);
+ gitplex.server.codemirror.scrollTo(cm, newMark);
+ }
+ } else {
+ gitplex.server.codemirror.clearMark(cm);
}
},
getCodeMirror: function(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 3dce3a88bc..c51464bfe1 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
@@ -1,5 +1,5 @@
gitplex.server.sourceView = {
- init: function(filePath, fileContent, openComment, mark, symbolTooltipId,
+ onDomReady: function(filePath, fileContent, openComment, mark, symbolTooltipId,
revision, blameInfos, comments, callback, blameMessageCallback,
loggedIn, anchor, tabSize, lineWrapMode) {
@@ -39,44 +39,31 @@ gitplex.server.sourceView = {
$sourceView.data("callback", callback);
$sourceView.data("blameMessageCallback", blameMessageCallback);
- // hide scroll bar of parent scrollable as we will be using
+ // 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, true);
+ gitplex.server.codemirror.mark(cm, mark);
$sourceView.data("mark", mark);
}
if (openComment)
$sourceView.data("openComment", openComment);
- if (anchor) {
- var $anchor = $("#"+anchor);
- if ($anchor.length != 0) {
- setTimeout(function() {
- $anchor.closest(".code-comment").parent().scrollIntoView($anchor);
- }, 0);
- }
- }
-
- // add gutters with a timer to avoid the issue that occasionally
- // gutter becomes much wider than expected
- setTimeout(function() {
- var gutters = cm.getOption("gutters").slice();
- gutters.splice(0, 0, "CodeMirror-comments");
- cm.setOption("gutters", gutters);
- for (var line in comments) {
- if (comments.hasOwnProperty(line)) {
- gitplex.server.sourceView.addCommentGutter(line, comments[line][1]);
- }
- }
+ var gutters = cm.getOption("gutters").slice();
+ gutters.splice(0, 0, "CodeMirror-comments");
+ cm.setOption("gutters", gutters);
+ for (var line in comments) {
+ if (comments.hasOwnProperty(line)) {
+ gitplex.server.sourceView.addCommentGutter(line, comments[line][1]);
+ }
+ }
- if (blameInfos) {
- gitplex.server.sourceView.blame(blameInfos);
- }
- gitplex.server.sourceView.highlightCommentTrigger();
- }, 10);
+ if (blameInfos) {
+ gitplex.server.sourceView.blame(blameInfos);
+ }
+ gitplex.server.sourceView.highlightCommentTrigger();
$code.selectionPopover("init", function() {
if (cm.hasFocus()) {
@@ -173,6 +160,13 @@ gitplex.server.sourceView = {
});
}
},
+ onWindowLoad: function(mark) {
+ if (mark && gitplex.server.viewState.getFromHistory() === undefined
+ && gitplex.server.viewState.getFromCarryOver() === undefined) {
+ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;
+ gitplex.server.codemirror.scrollTo(cm, mark);
+ }
+ },
initComment: function() {
var $sourceView = $(".source-view");
var $code = $sourceView.children(".code");
@@ -234,7 +228,7 @@ gitplex.server.sourceView = {
var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;
var mark = $sourceView.data("mark");
if (mark) {
- gitplex.server.codemirror.mark(cm, mark, false);
+ gitplex.server.codemirror.mark(cm, mark);
} else {
gitplex.server.codemirror.clearMark(cm);
}
@@ -274,7 +268,7 @@ gitplex.server.sourceView = {
$(".comment-popover[data-line='" + line + "'] a").each(function() {
$(this).mouseover(function() {
var comment = comments[$(this).index()];
- gitplex.server.codemirror.mark(cm, comment.mark, false);
+ gitplex.server.codemirror.mark(cm, comment.mark);
});
$(this).mouseout(function() {
gitplex.server.sourceView.restoreMark();
@@ -295,7 +289,7 @@ gitplex.server.sourceView = {
$gutter.append("<a class='comment-trigger' title='Click to show comment of marked text'><i class='fa fa-commenting'></i></a>");
var $indicator = $gutter.children("a");
$indicator.mouseover(function() {
- gitplex.server.codemirror.mark(cm, comment.mark, false);
+ gitplex.server.codemirror.mark(cm, comment.mark);
});
$indicator.mouseout(function() {
gitplex.server.sourceView.restoreMark();
@@ -381,7 +375,7 @@ gitplex.server.sourceView = {
gitplex.server.sourceView.highlightCommentTrigger();
gitplex.server.sourceView.onLayoutChange();
- gitplex.server.sourceView.mark(undefined, false);
+ gitplex.server.sourceView.mark(undefined);
},
onLayoutChange: function() {
$sourceView = $('.source-view');
@@ -398,9 +392,8 @@ gitplex.server.sourceView = {
gitplex.server.codemirror.clearSelection(cm);
gitplex.server.sourceView.onLayoutChange();
- // mark and scroll after changing layout to make sure scroll
- // works correctly
- gitplex.server.codemirror.mark(cm, mark, true);
+ // Mark again to make sure marked text still exists in viewport after layout change
+ gitplex.server.sourceView.mark(cm, mark);
gitplex.server.sourceView.highlightCommentTrigger();
},
@@ -412,16 +405,15 @@ gitplex.server.sourceView = {
gitplex.server.sourceView.highlightCommentTrigger();
gitplex.server.sourceView.onLayoutChange();
- // mark and scroll after changing layout to make sure scroll
- // works correctly
- gitplex.server.sourceView.mark(comment.mark, true);
+ // Mark again to make sure marked text still exists in viewport after layout change
+ gitplex.server.sourceView.mark(comment.mark);
},
onCloseComment: function() {
var $sourceView = $(".source-view");
$sourceView.removeData("openComment");
gitplex.server.sourceView.highlightCommentTrigger();
gitplex.server.sourceView.onLayoutChange();
- gitplex.server.sourceView.mark(undefined, false);
+ gitplex.server.sourceView.mark(undefined);
},
onToggleOutline: function() {
gitplex.server.sourceView.exitFullScreen();
@@ -469,11 +461,12 @@ gitplex.server.sourceView = {
}
}
},
- mark: function(mark, scroll) {
+ mark: function(mark) {
var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;
if (mark) {
$(".source-view").data("mark", mark);
- gitplex.server.codemirror.mark(cm, mark, scroll);
+ gitplex.server.codemirror.mark(cm, mark);
+ gitplex.server.codemirror.scrollTo(cm, mark);
} else {
$(".source-view").removeData("mark");
gitplex.server.codemirror.clearMark(cm);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/MarkSupport.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/MarkSupport.java
index a6f1351bee..002a440af9 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/MarkSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/MarkSupport.java
@@ -1,9 +1,11 @@
package com.gitplex.server.web.page.depot.blob.render.view;
+import javax.annotation.Nullable;
+
import org.apache.wicket.ajax.AjaxRequestTarget;
import com.gitplex.server.model.support.TextRange;
public interface MarkSupport {
- void mark(AjaxRequestTarget target, TextRange mark);
+ void mark(AjaxRequestTarget target, @Nullable TextRange mark);
}