Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't display stop watch top bar icon when disabled and hidden when click other place #22374

Merged
merged 4 commits into from
Jan 10, 2023
+3 −0
Merged

Don't display stop watch top bar icon when disabled and hidden when click other place #22374

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1745a8e
don't display stop watch top bar icon when disabled and hidden when c…
lunny Jan 9, 2023
673ede1
Don't change the framework layer but only stopwatch
lunny Jan 9, 2023
9d3b443
Merge branch 'main' into lunny/improve_stop_watch
lunny Jan 9, 2023
03de6f5
Merge branch 'main' into lunny/improve_stop_watch
lunny Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions templates/base/head_navbar.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down
1 change: 1 addition & 0 deletions web_src/js/features/stopwatch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down