The Unified and Autonomous Development Platform
feat: Enhance side info pane functionality with cookie support for visibility state
Robin Sheneb58f1cd1fc4
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.javaindex 047316cd7a..f0437b7ba1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.java@@ -29,8 +29,8 @@ public abstract class SideInfoPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- target.appendJavaScript(String.format(""- + "onedev.server.sideInfo.close($('#%s'));",+ target.appendJavaScript(String.format(+ "onedev.server.sideInfo.close($('#%s'));",SideInfoPanel.this.getMarkupId()));}@@ -46,9 +46,8 @@ public abstract class SideInfoPanel extends Panel {super.onEvent(event);if (event.getPayload() instanceof SideInfoOpened) {SideInfoOpened sideInfoOpened = (SideInfoOpened) event.getPayload();- sideInfoOpened.getHandler().appendJavaScript(String.format(""- + "$('#%s').removeClass('closed'); "- + "setTimeout(function(){$(window).resize();}, 350);", // Wait for animation to stop+ sideInfoOpened.getHandler().appendJavaScript(String.format(+ "onedev.server.sideInfo.open($('#%s'));",getMarkupId()));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.css b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.cssindex 35fd5d717c..52f32b6618 100644--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.css+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.css@@ -31,6 +31,9 @@ a.side-info {display: inline-flex;align-items: center;}+.side-info-visible a.side-info {+ display: none;+}/* Collapsed pinned pane on wide viewports (non-overlay layouts) */@media(min-width: 991px) {@@ -96,6 +99,3 @@ a.side-info {.hide-side-info div.side-info>.body {overflow: auto;}-.hide-side-info a.side-info {- display: inline-flex;-}diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.js b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.jsindex 0eb7748b00..f45696ebf8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.js+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.js@@ -1,20 +1,39 @@onedev.server.sideInfo = {+ cookieKey: "sideInfo.visible",+isOverlayMode: function($container) {return window.matchMedia("(max-width: 990px)").matches|| $container.closest(".hide-side-info").length != 0;},+ syncTrigger: function($container) {+ $("body").toggleClass("side-info-visible", !$container.hasClass("closed"));+ },+close: function($container) {$container.addClass("closed");+ onedev.server.sideInfo.syncTrigger($container);+ if (!onedev.server.sideInfo.isOverlayMode($container))+ Cookies.set(onedev.server.sideInfo.cookieKey, false, {expires: Infinity});+ setTimeout(function(){$(window).resize();}, 350);+ },++ open: function($container) {+ $container.removeClass("closed");+ onedev.server.sideInfo.syncTrigger($container);+ if (!onedev.server.sideInfo.isOverlayMode($container))+ Cookies.set(onedev.server.sideInfo.cookieKey, true, {expires: Infinity});setTimeout(function(){$(window).resize();}, 350);},onDomReady: function(containerId) {var $container = $("#" + containerId);- // Wide pinned layouts start open; overlay layouts stay closed until opened- if (!onedev.server.sideInfo.isOverlayMode($container))+ // Wide pinned layouts restore from cookie (default open); overlay stays closed until opened+ if (!onedev.server.sideInfo.isOverlayMode($container)+ && Cookies.get(onedev.server.sideInfo.cookieKey) != "false")$container.removeClass("closed");+ onedev.server.sideInfo.syncTrigger($container);$(document).on("mouseup touchstart", function(e) {if (!onedev.server.sideInfo.isOverlayMode($container))@@ -35,7 +54,8 @@ onedev.server.sideInfo = {}});$(document).on("keydown", function(e) {- if (e.keyCode == 27 && $(e.target).closest(".flatpickr-calendar").length == 0+ if (onedev.server.sideInfo.isOverlayMode($container)+ && e.keyCode == 27 && $(e.target).closest(".flatpickr-calendar").length == 0&& $container.find(".dropdown-open").length == 0&& $(".select2-drop:visible").length == 0&& $(".flatpickr-calendar.open").length == 0diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.cssindex 6499fe8c89..18124b0102 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css@@ -68,9 +68,9 @@ ul>li>a.code-comments.new .icon {}@media(min-width: 992px) {- html:not(.PullRequestChangesPage) .pull-request-detail>.card-body>.main>.primary>.summary .more-info,- html:not(.PullRequestChangesPage) .pull-request-detail>.card-body>.main>.primary>.summary .more-info:hover,- html:not(.PullRequestChangesPage) .pull-request-detail>.card-body>.main>.primary>.summary .more-info:focus {+ html:not(.PullRequestChangesPage) body.side-info-visible .pull-request-detail>.card-body>.main>.primary>.summary .more-info,+ html:not(.PullRequestChangesPage) body.side-info-visible .pull-request-detail>.card-body>.main>.primary>.summary .more-info:hover,+ html:not(.PullRequestChangesPage) body.side-info-visible .pull-request-detail>.card-body>.main>.primary>.summary .more-info:focus {color: inherit !important;cursor: inherit !important;}