The Unified and Autonomous Development Platform
Set initial comment and outline width at server side for better visual experience
Robin Shend3c627eaa319
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 9258629865..12eb7b1baa 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@@ -125,6 +125,10 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searprivate static final String COOKIE_OUTLINE = "sourceView.outline";+ private static final String COOKIE_OUTLINE_WIDTH = "sourceView.outline.width";++ private static final String COOKIE_COMMENT_WIDTH = "sourceView.comment.width";+private static final String BODY_ID = "body";private final List<Symbol> symbols = new ArrayList<>();@@ -286,6 +290,17 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear}};++ int commentWidth;+ WebRequest request = (WebRequest) RequestCycle.get().getRequest();+ Cookie cookie = request.getCookie(COOKIE_COMMENT_WIDTH);+ if (cookie != null)+ commentWidth = Integer.parseInt(cookie.getValue());+ else+ commentWidth = 300;++ commentContainer.add(AttributeAppender.append("style", "width:" + commentWidth + "px"));+if (context.getOpenComment() != null) {for (List<CodeCommentInfo> listOfCommentInfos: annotationInfoModel.getObject().getComments().values()) {for (CodeCommentInfo commentInfo: listOfCommentInfos) {@@ -630,6 +645,15 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear}};++ int outlineWidth;+ cookie = request.getCookie(COOKIE_OUTLINE_WIDTH);+ if (cookie != null)+ outlineWidth = Integer.parseInt(cookie.getValue());+ else+ outlineWidth = 300;++ outline.add(AttributeAppender.append("style", "width:" + outlineWidth + "px"));outline.add(new AjaxLink<Void>("close") {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.jsindex 2ab70e277e..57213c2fad 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js@@ -157,12 +157,7 @@ onedev.server.sourceView = {initComment: function() {var $sourceView = $(".source-view");var $code = $sourceView.children(".code");- var commentWidthCookieKey = "sourceView.comment.width";var $comment = $sourceView.children(".comment");- var commentWidth = Cookies.get(commentWidthCookieKey);- if (!commentWidth)- commentWidth = $sourceView.outerWidth()/3;- $comment.outerWidth(commentWidth);var $commentResizeHandle = $comment.children(".ui-resizable-handle");$comment.resizable({autoHide: false,@@ -175,7 +170,7 @@ onedev.server.sourceView = {},stop: function(e, ui) {$(this).resizable({maxWidth: undefined});- Cookies.set(commentWidthCookieKey, ui.size.width, {expires: Infinity});+ Cookies.set("sourceView.comment.width", ui.size.width, {expires: Infinity});}});},@@ -188,12 +183,7 @@ onedev.server.sourceView = {initOutline: function() {var $sourceView = $(".source-view");var $code = $sourceView.children(".code");- var outlineWidthCookieKey = "sourceView.outline.width";var $outline = $sourceView.children(".outline");- var outlineWidth = Cookies.get(outlineWidthCookieKey);- if (!outlineWidth)- outlineWidth = 300;- $outline.outerWidth(outlineWidth);var $outlineResizeHandle = $outline.children(".ui-resizable-handle");$outline.resizable({autoHide: false,@@ -206,7 +196,7 @@ onedev.server.sourceView = {},stop: function(e, ui) {$(this).resizable({maxWidth: undefined});- Cookies.set(outlineWidthCookieKey, ui.size.width, {expires: Infinity});+ Cookies.set("sourceView.outline.width", ui.size.width, {expires: Infinity});}});},