From 1cb1fb8a2e86cc66a3f40f24d6f831eec90daba5 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 10 Dec 2020 17:19:18 +0100 Subject: [PATCH] Remove JS globals related to timetracking and due date (#13921) Refactor to avoid these globals. Should work exactly as before. --- integrations/timetracking_test.go | 8 +-- .../repo/issue/view_content/sidebar.tmpl | 18 +++---- web_src/js/index.js | 53 ++++++++++--------- 3 files changed, 42 insertions(+), 37 deletions(-) diff --git a/integrations/timetracking_test.go b/integrations/timetracking_test.go index cd3002e1ac..7cf5f9bc8f 100644 --- a/integrations/timetracking_test.go +++ b/integrations/timetracking_test.go @@ -40,8 +40,8 @@ func testViewTimetrackingControls(t *testing.T, session *TestSession, user, repo htmlDoc := NewHTMLParser(t, resp.Body) - htmlDoc.AssertElement(t, ".timetrack .start-add .start", canTrackTime) - htmlDoc.AssertElement(t, ".timetrack .start-add .add-time", canTrackTime) + htmlDoc.AssertElement(t, ".timetrack .issue-start-time", canTrackTime) + htmlDoc.AssertElement(t, ".timetrack .issue-add-time", canTrackTime) req = NewRequestWithValues(t, "POST", path.Join(user, repo, "issues", issue, "times", "stopwatch", "toggle"), map[string]string{ "_csrf": htmlDoc.GetCSRF(), @@ -56,8 +56,8 @@ func testViewTimetrackingControls(t *testing.T, session *TestSession, user, repo events := htmlDoc.doc.Find(".event > span.text") assert.Contains(t, events.Last().Text(), "started working") - htmlDoc.AssertElement(t, ".timetrack .stop-cancel .stop", true) - htmlDoc.AssertElement(t, ".timetrack .stop-cancel .cancel", true) + htmlDoc.AssertElement(t, ".timetrack .issue-stop-time", true) + htmlDoc.AssertElement(t, ".timetrack .issue-cancel-time", true) // Sleep for 1 second to not get wrong order for stopping timer time.Sleep(time.Second) diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index a8f0ed5ab4..c8cc454928 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -336,9 +336,9 @@ {{$.CsrfTokenHtml}} {{if $.IsStopwatchRunning}} -
- - +
+ +
{{else}} {{if .HasUserStopwatch}} @@ -346,8 +346,8 @@ {{.i18n.Tr "repo.issues.tracking_already_started" .OtherStopwatchURL | Safe}}
{{end}} -
- +
+ - +
{{end}}
@@ -407,8 +407,8 @@ {{end}} {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
- {{$.i18n.Tr "repo.issues.due_date_form_edit"}} - - {{$.i18n.Tr "repo.issues.due_date_form_remove"}} + {{$.i18n.Tr "repo.issues.due_date_form_edit"}} - + {{$.i18n.Tr "repo.issues.due_date_form_remove"}} {{end}}

{{else}} @@ -417,7 +417,7 @@ {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}