The Unified and Autonomous Development Platform
Set comment width of diff view at server side for better visual effect
Robin Shen4025bd5f8afb
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex b73d3986af..d0bb075cba 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -114,6 +114,8 @@ import io.onedev.server.web.util.SuggestionUtils;public abstract class RevisionDiffPanel extends Panel {private static final String COOKIE_VIEW_MODE = "onedev.server.diff.viewmode";++ private static final String COOKIE_COMMENT_WIDTH = "revisionDiff.comment.width";private static final String BODY_ID = "body";@@ -1180,6 +1182,16 @@ public abstract class RevisionDiffPanel extends Panel {};commentContainer.setOutputMarkupPlaceholderTag(true);+ float commentWidth;+ WebRequest request = (WebRequest) RequestCycle.get().getRequest();+ Cookie cookie = request.getCookie(COOKIE_COMMENT_WIDTH);+ if (cookie != null)+ commentWidth = Float.parseFloat(cookie.getValue());+ else+ commentWidth = 300;++ commentContainer.add(AttributeAppender.append("style", "width:" + commentWidth + "px"));+WebMarkupContainer head = new WebMarkupContainer("head");commentContainer.add(head);diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.jsindex 00244abbf8..ef8f2d5f5e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js@@ -20,18 +20,13 @@ onedev.server.revisionDiff = {var $comment = $(".revision-diff>.body>.detail>.comment");if ($comment.is(":visible")) {- var commentWidthCookieKey = "revisionDiff.comment.width";- var commentWidth = Cookies.get(commentWidthCookieKey);- if (!commentWidth)- commentWidth = $(".revision-diff").outerWidth()/3;- $comment.outerWidth(commentWidth);var $commentResizeHandle = $comment.children(".ui-resizable-handle");$comment.resizable({autoHide: false,handles: {"e": $commentResizeHandle},minWidth: 200,stop: function(e, ui) {- Cookies.set(commentWidthCookieKey, ui.size.width, {expires: Infinity});+ Cookies.set("revisionDiff.comment.width", ui.size.width, {expires: Infinity});}});}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex 12eb7b1baa..a3bc92dd98 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -291,11 +291,11 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear};- int commentWidth;+ float commentWidth;WebRequest request = (WebRequest) RequestCycle.get().getRequest();Cookie cookie = request.getCookie(COOKIE_COMMENT_WIDTH);if (cookie != null)- commentWidth = Integer.parseInt(cookie.getValue());+ commentWidth = Float.parseFloat(cookie.getValue());elsecommentWidth = 300;@@ -646,10 +646,10 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear};- int outlineWidth;+ float outlineWidth;cookie = request.getCookie(COOKIE_OUTLINE_WIDTH);if (cookie != null)- outlineWidth = Integer.parseInt(cookie.getValue());+ outlineWidth = Float.parseFloat(cookie.getValue());elseoutlineWidth = 300;