Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-09-15 12:19:43 +0300
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-09-15 12:19:43 +0300
commit6d59795ebbe51c99317ead0be62591a5f0926c92 (patch)
treee05db8dc216ef3ee8ab18a7f83dd781c54e3177e /app/assets/javascripts/sidebar/components/lock
parente0e153d2d73199a16e7e7dbc1b34cfeabbc26410 (diff)
Review changes
Diffstat (limited to 'app/assets/javascripts/sidebar/components/lock')
-rw-r--r--app/assets/javascripts/sidebar/components/lock/edit_form.vue36
-rw-r--r--app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue4
2 files changed, 19 insertions, 21 deletions
diff --git a/app/assets/javascripts/sidebar/components/lock/edit_form.vue b/app/assets/javascripts/sidebar/components/lock/edit_form.vue
index 616abec4d5e..b79d357d4bb 100644
--- a/app/assets/javascripts/sidebar/components/lock/edit_form.vue
+++ b/app/assets/javascripts/sidebar/components/lock/edit_form.vue
@@ -38,25 +38,23 @@ export default {
<template>
<div class="dropdown open">
<div class="dropdown-menu sidebar-item-warning-message">
- <div>
- <p v-if="isLocked">
- {{ __(`Unlock this ${issuableDisplayName(issuableType)}?`) }}
- <strong>{{ __('Everyone') }}</strong>
- {{ __('will be able to comment.') }}
- </p>
-
- <p v-else>
- {{ __(`Lock this ${issuableDisplayName(issuableType)}? Only`) }}
- <strong>{{ __('project members') }}</strong>
- {{ __('will be able to comment.') }}
- </p>
-
- <edit-form-buttons
- :is-locked="isLocked"
- :toggle-form="toggleForm"
- :update-locked-attribute="updateLockedAttribute"
- />
- </div>
+ <p class="text" v-if="isLocked">
+ {{ __(`Unlock this ${issuableDisplayName(issuableType)}?`) }}
+ <strong>{{ __('Everyone') }}</strong>
+ {{ __('will be able to comment.') }}
+ </p>
+
+ <p class="text" v-else>
+ {{ __(`Lock this ${issuableDisplayName(issuableType)}? Only`) }}
+ <strong>{{ __('project members') }}</strong>
+ {{ __('will be able to comment.') }}
+ </p>
+
+ <edit-form-buttons
+ :is-locked="isLocked"
+ :toggle-form="toggleForm"
+ :update-locked-attribute="updateLockedAttribute"
+ />
</div>
</div>
</template>
diff --git a/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue b/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue
index 7d883704142..c3a553a7605 100644
--- a/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue
+++ b/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue
@@ -22,7 +22,7 @@ export default {
return this.isLocked ? this.__('Unlock') : this.__('Lock');
},
- updateLockedBool() {
+ toggleLock() {
return !this.isLocked;
},
},
@@ -42,7 +42,7 @@ export default {
<button
type="button"
class="btn btn-close"
- @click.prevent="updateLockedAttribute(updateLockedBool)"
+ @click.prevent="updateLockedAttribute(toggleLock)"
>
{{ buttonText }}
</button>