diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 15:08:40 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 15:08:40 +0300 |
commit | be3e24ea3c9f497efde85900df298ce9bc42fce8 (patch) | |
tree | fd0de9443253a1b21ca9a2741dc34ba3aef795be /app/assets/javascripts/notes | |
parent | 001243986195143c395a9811d8254bbf1b9ebfa1 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
3 files changed, 21 insertions, 8 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_filter_note.vue b/app/assets/javascripts/notes/components/discussion_filter_note.vue index 889731df180..8dc4b43d69a 100644 --- a/app/assets/javascripts/notes/components/discussion_filter_note.vue +++ b/app/assets/javascripts/notes/components/discussion_filter_note.vue @@ -38,12 +38,12 @@ export default { <icon name="comment" /> </div> <div class="timeline-content"> - <div v-html="timelineContent"></div> + <div ref="timelineContent" v-html="timelineContent"></div> <div class="discussion-filter-actions mt-2"> - <gl-button variant="default" @click="selectFilter(0)"> + <gl-button ref="showAllActivity" variant="default" @click="selectFilter(0)"> {{ __('Show all activity') }} </gl-button> - <gl-button variant="default" @click="selectFilter(1)"> + <gl-button ref="showComments" variant="default" @click="selectFilter(1)"> {{ __('Show comments only') }} </gl-button> </div> diff --git a/app/assets/javascripts/notes/components/note_attachment.vue b/app/assets/javascripts/notes/components/note_attachment.vue index b6d8c831e2e..72f9a4c7e74 100644 --- a/app/assets/javascripts/notes/components/note_attachment.vue +++ b/app/assets/javascripts/notes/components/note_attachment.vue @@ -12,11 +12,23 @@ export default { <template> <div class="note-attachment"> - <a v-if="attachment.image" :href="attachment.url" target="_blank" rel="noopener noreferrer"> + <a + v-if="attachment.image" + ref="attachmentImage" + :href="attachment.url" + target="_blank" + rel="noopener noreferrer" + > <img :src="attachment.url" class="note-image-attach" /> </a> <div class="attachment"> - <a v-if="attachment.url" :href="attachment.url" target="_blank" rel="noopener noreferrer"> + <a + v-if="attachment.url" + ref="attachmentUrl" + :href="attachment.url" + target="_blank" + rel="noopener noreferrer" + > <i class="fa fa-paperclip" aria-hidden="true"> </i> {{ attachment.filename }} </a> </div> diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue index e4f09492d9c..16351baedb7 100644 --- a/app/assets/javascripts/notes/components/note_header.vue +++ b/app/assets/javascripts/notes/components/note_header.vue @@ -63,13 +63,13 @@ export default { <template> <div class="note-header-info"> - <div v-if="includeToggle" class="discussion-actions"> + <div v-if="includeToggle" ref="discussionActions" class="discussion-actions"> <button class="note-action-button discussion-toggle-button js-vue-toggle-button" type="button" @click="handleToggle" > - <i :class="toggleChevronClass" class="fa" aria-hidden="true"></i> + <i ref="chevronIcon" :class="toggleChevronClass" class="fa" aria-hidden="true"></i> {{ __('Toggle thread') }} </button> </div> @@ -90,10 +90,11 @@ export default { <span class="note-headline-light note-headline-meta"> <span class="system-note-message"> <slot></slot> </span> <template v-if="createdAt"> - <span class="system-note-separator"> + <span ref="actionText" class="system-note-separator"> <template v-if="actionText">{{ actionText }}</template> </span> <a + ref="noteTimestamp" :href="noteTimestampLink" class="note-timestamp system-note-separator" @click="updateTargetNoteHash" |