Commit 064dd7aa authored by Phil Hughes's avatar Phil Hughes

Merge branch 'winh-sidebar-todo' into 'master'

Copy sidebar todo component from EE

Closes gitlab-ee#9954

See merge request gitlab-org/gitlab-ce!26915
parents e81b4f90 52515dda
...@@ -50,6 +50,9 @@ export default { ...@@ -50,6 +50,9 @@ export default {
buttonLabel() { buttonLabel() {
return this.isTodo ? MARK_TEXT : TODO_TEXT; return this.isTodo ? MARK_TEXT : TODO_TEXT;
}, },
buttonTooltip() {
return !this.collapsed ? undefined : this.buttonLabel;
},
collapsedButtonIconClasses() { collapsedButtonIconClasses() {
return this.isTodo ? 'todo-undone' : ''; return this.isTodo ? 'todo-undone' : '';
}, },
...@@ -69,7 +72,7 @@ export default { ...@@ -69,7 +72,7 @@ export default {
<button <button
v-tooltip v-tooltip
:class="buttonClasses" :class="buttonClasses"
:title="buttonLabel" :title="buttonTooltip"
:aria-label="buttonLabel" :aria-label="buttonLabel"
:data-issuable-id="issuableId" :data-issuable-id="issuableId"
:data-issuable-type="issuableType" :data-issuable-type="issuableType"
......
...@@ -116,7 +116,7 @@ describe('SidebarTodo', () => { ...@@ -116,7 +116,7 @@ describe('SidebarTodo', () => {
const dataAttributes = { const dataAttributes = {
issuableId: '1', issuableId: '1',
issuableType: 'epic', issuableType: 'epic',
originalTitle: 'Mark todo as done', originalTitle: '',
placement: 'left', placement: 'left',
container: 'body', container: 'body',
boundary: 'viewport', boundary: 'viewport',
...@@ -130,6 +130,10 @@ describe('SidebarTodo', () => { ...@@ -130,6 +130,10 @@ describe('SidebarTodo', () => {
}); });
}); });
it('check button label computed property', () => {
expect(vm.buttonLabel).toEqual('Mark todo as done');
});
it('renders button label element when `collapsed` prop is `false`', () => { it('renders button label element when `collapsed` prop is `false`', () => {
const buttonLabelEl = vm.$el.querySelector('span.issuable-todo-inner'); const buttonLabelEl = vm.$el.querySelector('span.issuable-todo-inner');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment