summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/components/editor_mode_dropdown.vue
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-03-23 11:45:43 +0100
committerTim Zallmann <tzallmann@gitlab.com>2018-03-25 19:39:42 +0200
commit3a0dae8da215cd6964007bb41896fbc201a9dd20 (patch)
tree3d786e6820d3e22034f26ef1c46e206854b24e46 /app/assets/javascripts/ide/components/editor_mode_dropdown.vue
parent391732a2c1b04baf565c77f2788a1ec035b1d85e (diff)
downloadgitlab-ce-3a0dae8da215cd6964007bb41896fbc201a9dd20.tar.gz
Basic Setup for MR Showing
Diffstat (limited to 'app/assets/javascripts/ide/components/editor_mode_dropdown.vue')
-rw-r--r--app/assets/javascripts/ide/components/editor_mode_dropdown.vue71
1 files changed, 47 insertions, 24 deletions
diff --git a/app/assets/javascripts/ide/components/editor_mode_dropdown.vue b/app/assets/javascripts/ide/components/editor_mode_dropdown.vue
index 170347881e0..42b00b5d9df 100644
--- a/app/assets/javascripts/ide/components/editor_mode_dropdown.vue
+++ b/app/assets/javascripts/ide/components/editor_mode_dropdown.vue
@@ -1,31 +1,36 @@
<script>
- import Icon from '~/vue_shared/components/icon.vue';
+import Icon from '~/vue_shared/components/icon.vue';
- export default {
- components: {
- Icon,
+export default {
+ components: {
+ Icon,
+ },
+ props: {
+ hasChanges: {
+ type: Boolean,
+ required: false,
+ default: false,
},
- props: {
- hasChanges: {
- type: Boolean,
- required: false,
- default: false,
- },
- viewer: {
- type: String,
- required: true,
- },
- showShadow: {
- type: Boolean,
- required: true,
- },
+ hasMergeRequest: {
+ type: Boolean,
+ required: false,
+ default: false,
},
- methods: {
- changeMode(mode) {
- this.$emit('click', mode);
- },
+ viewer: {
+ type: String,
+ required: true,
},
- };
+ showShadow: {
+ type: Boolean,
+ required: true,
+ },
+ },
+ methods: {
+ changeMode(mode) {
+ this.$emit('click', mode);
+ },
+ },
+};
</script>
<template>
@@ -43,7 +48,10 @@
}"
data-toggle="dropdown"
>
- <template v-if="viewer === 'editor'">
+ <template v-if="viewer === 'mrdiff'">
+ {{ __('Reviewing (merge request)') }}
+ </template>
+ <template v-else-if="viewer === 'editor'">
{{ __('Editing') }}
</template>
<template v-else>
@@ -57,6 +65,21 @@
</button>
<div class="dropdown-menu dropdown-menu-selectable dropdown-open-left">
<ul>
+ <li v-if="hasMergeRequest">
+ <a
+ href="#"
+ @click.prevent="changeMode('mrdiff')"
+ :class="{
+ 'is-active': viewer === 'mrdiff',
+ }"
+ >
+ <strong class="dropdown-menu-inner-title">{{ __('Reviewing (merge request)') }}</strong>
+ <span class="dropdown-menu-inner-content">
+ {{ __('Compare changes of the merge request') }}
+ </span>
+ </a>
+ </li>
+ <li v-if="hasMergeRequest" role="separator" class="divider"></li>
<li>
<a
href="#"