Skip to content

The Unified and Autonomous Development Platform

Able to toggle comment by clicking the comment indicator

robin shenb45fe26ff47c
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 3877e496bf..792f9e2d38 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
@@ -354,13 +354,18 @@ public class TextDiffPanel extends Panel implements SourceAware {
getMarkupId(), getJson(mark));
target.appendJavaScript(script);
break;
- case "openComment":
+ case "toggleComment":
Long commentId = params.getParameterValue("param1").toLong();
CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(commentId);
- commentSupport.onOpenComment(target, comment);
- script = String.format("gitplex.server.textDiff.onOpenComment($('#%s'), %s);",
- getMarkupId(), getJsonOfComment(comment));
- target.appendJavaScript(script);
+ CodeComment prevComment = commentSupport.getOpenComment();
+ commentSupport.onToggleComment(target, comment);
+ if (!comment.equals(prevComment)) {
+ script = String.format("gitplex.server.textDiff.onOpenComment($('#%s'), %s);",
+ getMarkupId(), getJsonOfComment(comment));
+ target.appendJavaScript(script);
+ } else {
+ onCommentClosed(target, comment);
+ }
break;
}
}
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 94cf5f776e..1714179606 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
@@ -800,7 +800,7 @@ gitplex.server.textDiff = {
return;
}
var comment = comments[$(this).index()];
- callback("openComment", comment.id);
+ callback("toggleComment", comment.id);
});
});
gitplex.server.textDiff.highlightCommentTrigger($container);
@@ -820,7 +820,7 @@ gitplex.server.textDiff = {
&& !confirm("There are unsaved changes, discard and continue?")) {
return;
}
- callback("openComment", comment.id);
+ callback("toggleComment", comment.id);
});
}
$lineNumTd.children(".comment-indicator").remove();
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java
index 0095a04da7..7912c11991 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java
@@ -21,7 +21,7 @@ public interface BlobCommentSupport extends Serializable {
@Nullable CodeComment getOpenComment();
- void onOpenComment(AjaxRequestTarget target, CodeComment comment);
+ void onToggleComment(AjaxRequestTarget target, CodeComment comment);
void onAddComment(AjaxRequestTarget target, MarkPos markPos);
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
index 5a28f278e3..0a6b01a27b 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -807,8 +807,8 @@ public class RevisionDiffPanel extends Panel {
}
@Override
- public void onOpenComment(AjaxRequestTarget target, CodeComment comment) {
- RevisionDiffPanel.this.onOpenComment(target, comment);
+ public void onToggleComment(AjaxRequestTarget target, CodeComment comment) {
+ RevisionDiffPanel.this.onToggleComment(target, comment);
}
@Override
@@ -1005,50 +1005,54 @@ public class RevisionDiffPanel extends Panel {
return compareContext;
}
- private void onOpenComment(AjaxRequestTarget target, CodeComment comment) {
- CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, comment.getId()) {
+ private void onToggleComment(AjaxRequestTarget target, CodeComment comment) {
+ if (!comment.equals(getOpenComment())) {
+ CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, comment.getId()) {
- @Override
- protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
- RevisionDiffPanel.this.onCommentDeleted(target, comment);
- }
+ @Override
+ protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
+ RevisionDiffPanel.this.onCommentDeleted(target, comment);
+ }
- @Override
- protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
- target.add(commentContainer.get("head"));
- }
+ @Override
+ protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
+ target.add(commentContainer.get("head"));
+ }
- @Override
- protected PullRequest getPullRequest() {
- return requestModel.getObject();
- }
+ @Override
+ protected PullRequest getPullRequest() {
+ return requestModel.getObject();
+ }
- @Override
- protected CompareContext getCompareContext() {
- return RevisionDiffPanel.this.getCompareContext(comment.getMarkPos().getCommit());
- }
+ @Override
+ protected CompareContext getCompareContext() {
+ return RevisionDiffPanel.this.getCompareContext(comment.getMarkPos().getCommit());
+ }
- };
-
- commentContainer.replace(commentPanel);
- commentContainer.setVisible(true);
- target.add(commentContainer);
-
- CodeComment prevComment = RevisionDiffPanel.this.getOpenComment();
- if (prevComment != null) {
- SourceAware sourceAware = getSourceAware(prevComment.getMarkPos().getPath());
- if (sourceAware != null)
- sourceAware.onCommentClosed(target, prevComment);
- }
-
- MarkPos prevMark = RevisionDiffPanel.this.getMark();
- if (prevMark != null) {
- SourceAware sourceAware = getSourceAware(prevMark.getPath());
- if (sourceAware != null)
- sourceAware.mark(target, null);
+ };
+
+ commentContainer.replace(commentPanel);
+ commentContainer.setVisible(true);
+ target.add(commentContainer);
+
+ CodeComment prevComment = RevisionDiffPanel.this.getOpenComment();
+ if (prevComment != null) {
+ SourceAware sourceAware = getSourceAware(prevComment.getMarkPos().getPath());
+ if (sourceAware != null)
+ sourceAware.onCommentClosed(target, prevComment);
+ }
+
+ MarkPos prevMark = RevisionDiffPanel.this.getMark();
+ if (prevMark != null) {
+ SourceAware sourceAware = getSourceAware(prevMark.getPath());
+ if (sourceAware != null)
+ sourceAware.mark(target, null);
+ }
+ commentSupport.onCommentOpened(target, comment);
+ } else {
+ clearComment(target);
+ commentSupport.onCommentOpened(target, null);
}
-
- ((CommentSupport)commentSupport).onCommentOpened(target, comment);
target.appendJavaScript("gitplex.server.revisionDiff.reposition();");
}
@@ -1197,7 +1201,7 @@ public class RevisionDiffPanel extends Panel {
SourceAware sourceAware = getSourceAware(comment.getMarkPos().getPath());
if (sourceAware != null)
sourceAware.onCommentClosed(target, comment);
- ((CommentSupport)commentSupport).onCommentOpened(target, null);
+ commentSupport.onCommentOpened(target, null);
}
target.appendJavaScript("gitplex.server.revisionDiff.reposition();");
}
@@ -1266,15 +1270,13 @@ public class RevisionDiffPanel extends Panel {
@Nullable
private CodeComment getOpenComment() {
- if (commentSupport instanceof CommentSupport) {
- CodeComment comment = ((CommentSupport)commentSupport).getOpenComment();
- if (comment != null) {
- String commit = comment.getMarkPos().getCommit();
- String oldCommitHash = getOldCommitId().name();
- String newCommitHash = getNewCommitId().name();
- if (commit.equals(oldCommitHash) || commit.equals(newCommitHash))
- return comment;
- }
+ CodeComment comment = ((CommentSupport)commentSupport).getOpenComment();
+ if (comment != null) {
+ String commit = comment.getMarkPos().getCommit();
+ String oldCommitHash = getOldCommitId().name();
+ String newCommitHash = getNewCommitId().name();
+ if (commit.equals(oldCommitHash) || commit.equals(newCommitHash))
+ return comment;
}
return null;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
index bf2bcc9135..8bb04aa44b 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
@@ -343,10 +343,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe
@Override
public void onClick(AjaxRequestTarget target) {
- clearComment(target);
- if (context.getOpenComment() != null)
- context.onCommentOpened(target, null);
- target.appendJavaScript("gitplex.server.sourceView.onCloseComment();");
+ closeComment(target);
}
});
@@ -548,38 +545,42 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe
context.onAddComment(target, mark);
target.appendJavaScript(String.format("gitplex.server.sourceView.onAddComment(%s);", getJson(mark)));
break;
- case "openComment":
+ case "toggleComment":
Long commentId = params.getParameterValue("param1").toLong();
- CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, commentId) {
+ CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(commentId);
+ if (!comment.equals(context.getOpenComment())) {
+ CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, commentId) {
- @Override
- protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
- SourceViewPanel.this.onCommentDeleted(target, comment);
- }
+ @Override
+ protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
+ SourceViewPanel.this.onCommentDeleted(target, comment);
+ }
- @Override
- protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
- target.add(commentContainer.get("head"));
- }
+ @Override
+ protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
+ target.add(commentContainer.get("head"));
+ }
- @Override
- protected PullRequest getPullRequest() {
- return context.getPullRequest();
- }
+ @Override
+ protected PullRequest getPullRequest() {
+ return context.getPullRequest();
+ }
- @Override
- protected CompareContext getCompareContext() {
- return SourceViewPanel.this.getCompareContext();
- }
+ @Override
+ protected CompareContext getCompareContext() {
+ return SourceViewPanel.this.getCompareContext();
+ }
- };
- commentContainer.replace(commentPanel);
- commentContainer.setVisible(true);
- target.add(commentContainer);
- CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(commentId);
- script = String.format("gitplex.server.sourceView.onOpenComment(%s);", getJsonOfComment(comment));
- target.appendJavaScript(script);
- context.onCommentOpened(target, comment);
+ };
+ commentContainer.replace(commentPanel);
+ commentContainer.setVisible(true);
+ target.add(commentContainer);
+ script = String.format("gitplex.server.sourceView.onOpenComment(%s);", getJsonOfComment(comment));
+ target.appendJavaScript(script);
+ context.onCommentOpened(target, comment);
+ } else {
+ closeComment(target);
+ }
break;
case "outlineSearch":
new ModalPanel(target) {
@@ -1034,6 +1035,13 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe
return tree;
}
+ private void closeComment(AjaxRequestTarget target) {
+ clearComment(target);
+ if (context.getOpenComment() != null)
+ context.onCommentOpened(target, null);
+ target.appendJavaScript("gitplex.server.sourceView.onCloseComment();");
+ }
+
private Component newOutlineSearchPanel(String id, ModalPanel modal) {
Fragment fragment = new Fragment(id, "outlineSearchFrag", SourceViewPanel.this);
fragment.add(new AjaxLink<Void>("close") {
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/source-view.js b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/source-view.js
index 9377e8e691..822bc05acb 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/source-view.js
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/source-view.js
@@ -302,7 +302,7 @@ gitplex.server.sourceView = {
return;
}
var comment = comments[$(this).index()];
- callback("openComment", comment.id);
+ callback("toggleComment", comment.id);
});
});
gitplex.server.sourceView.highlightCommentTrigger();
@@ -322,7 +322,7 @@ gitplex.server.sourceView = {
&& !confirm("There are unsaved changes, discard and continue?")) {
return;
}
- callback("openComment", comment.id);
+ callback("toggleComment", comment.id);
});
}
cm.setGutterMarker(parseInt(line), "CodeMirror-comments", $gutter[0]);