Merge branch 'dm-fix-jump-button' into 'master'
Fix title of discussion jump button at top of page See merge request !11768
This commit is contained in:
commit
db48f5ce66
|
@ -16,6 +16,13 @@ const JumpToDiscussion = Vue.extend({
|
|||
};
|
||||
},
|
||||
computed: {
|
||||
buttonText: function () {
|
||||
if (this.discussionId) {
|
||||
return 'Jump to next unresolved discussion';
|
||||
} else {
|
||||
return 'Jump to first unresolved discussion';
|
||||
}
|
||||
},
|
||||
allResolved: function () {
|
||||
return this.unresolvedDiscussionCount === 0;
|
||||
},
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
%jump-to-discussion{ "inline-template" => true, ":discussion-id" => "'#{discussion.try(:id)}'" }
|
||||
.btn-group{ role: "group", "v-show" => "!allResolved", "v-if" => "showButton" }
|
||||
%button.btn.btn-default.discussion-next-btn.has-tooltip{ "@click" => "jumpToNextUnresolvedDiscussion",
|
||||
title: "Jump to next unresolved discussion",
|
||||
"aria-label" => "Jump to next unresolved discussion",
|
||||
":title" => "buttonText",
|
||||
":aria-label" => "buttonText",
|
||||
data: { container: "body" } }
|
||||
= custom_icon("next_discussion")
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Fix title of discussion jump button at top of page
|
||||
merge_request:
|
||||
author:
|
Loading…
Reference in New Issue