From 04e045814587af6286c7cd355aaadf35a56539a5 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <hrsi88@gmail.com>
Date: Tue, 10 Jan 2023 06:50:52 +0000
Subject: [PATCH] Don't display stop watch top bar icon when disabled and
 hidden when click other place (#22374)

Backport #22374

Fix #22286

When timetracking is disabled, the stop watch top bar icon should be hidden.
When the stop watch recording popup, it should be allowed to hide with some operation. Now click any place on this page will hide the popup window.
---
 templates/base/head_navbar.tmpl  | 2 ++
 web_src/js/features/stopwatch.js | 1 +
 2 files changed, 3 insertions(+)

diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
index 12837ebefedfc..c84e30ab2d80a 100644
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -77,6 +77,7 @@
 		</div>
 	{{else if .IsSigned}}
 		<div class="right stackable menu">
+			{{if EnableTimetracking}}
 			<a class="active-stopwatch-trigger item ui label {{if not .ActiveStopwatch}}hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}">
 				<span class="text">
 					<span class="fitted item">
@@ -115,6 +116,7 @@
 					</form>
 				</div>
 			</div>
+			{{end}}
 
 			<a href="{{AppSubUrl}}/notifications" class="item tooltip not-mobile" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}">
 				<span class="text">
diff --git a/web_src/js/features/stopwatch.js b/web_src/js/features/stopwatch.js
index b9042fae4cc98..33915a1d83713 100644
--- a/web_src/js/features/stopwatch.js
+++ b/web_src/js/features/stopwatch.js
@@ -24,6 +24,7 @@ export function initStopwatch() {
     trigger: 'click',
     maxWidth: 'none',
     interactive: true,
+    hideOnClick: true,
   });
 
   // global stop watch (in the head_navbar), it should always work in any case either the EventSource or the PeriodicPoller is used.