diff options
Diffstat (limited to 'app/assets/javascripts/sidebar/components/todo_toggle')
-rw-r--r-- | app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue | 23 | ||||
-rw-r--r-- | app/assets/javascripts/sidebar/components/todo_toggle/todo_button.vue | 2 |
2 files changed, 23 insertions, 2 deletions
diff --git a/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue b/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue index 1099dcb832f..f2257adb79c 100644 --- a/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue +++ b/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue @@ -114,6 +114,9 @@ export default { tootltipTitle() { return todoLabel(this.hasTodo); }, + isNotificationsTodosButtons() { + return this.glFeatures.notificationsTodosButtons && this.glFeatures.movedMrSidebar; + }, }, methods: { toggleTodo() { @@ -183,8 +186,26 @@ export default { </script> <template> - <div data-testid="sidebar-todo"> + <div data-testid="sidebar-todo" :class="{ 'inline-block': !isMergeRequest }"> + <todo-button + v-if="isNotificationsTodosButtons" + v-gl-tooltip.hover.top + :title="tootltipTitle" + :issuable-type="issuableType" + :issuable-id="issuableId" + :is-todo="hasTodo" + :disabled="isLoading" + class="hide-collapsed btn-icon" + @click.stop.prevent="toggleTodo" + > + <gl-icon + v-if="isNotificationsTodosButtons" + :class="{ 'todo-undone gl-fill-blue-500': hasTodo }" + :name="collapsedButtonIcon" + /> + </todo-button> <todo-button + v-else :issuable-type="issuableType" :issuable-id="issuableId" :is-todo="hasTodo" diff --git a/app/assets/javascripts/sidebar/components/todo_toggle/todo_button.vue b/app/assets/javascripts/sidebar/components/todo_toggle/todo_button.vue index b49b8fc389b..2aa79b45093 100644 --- a/app/assets/javascripts/sidebar/components/todo_toggle/todo_button.vue +++ b/app/assets/javascripts/sidebar/components/todo_toggle/todo_button.vue @@ -39,6 +39,6 @@ export default { <template> <gl-button v-bind="$attrs" :aria-label="buttonLabel" @click="onToggle($event)"> - {{ buttonLabel }} + <slot>{{ buttonLabel }}</slot> </gl-button> </template> |