Review changes

4 files changed, 22 insertions, 24 deletions

diff --git a/app/assets/javascripts/diff.js b/app/assets/javascripts/diff.js
index c12dc7bdc2c..baeec130579 100644
--- a/app/assets/javascripts/diff.js
+++ b/app/assets/javascripts/diff.js
@@ -18,7 +18,7 @@ class Diff {
     });
 
     const tab = document.getElementById('diffs');
-    if (tab && tab.dataset.isLocked === 'false') FilesCommentButton.init($diffFile);
+    if (tab && !Object.hasOwnProperty.call(tab.dataset, 'isLocked')) FilesCommentButton.init($diffFile);
 
     $diffFile.each((index, file) => new gl.ImageFile(file));
 
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>
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index c2904ce2273..d1cfc75743e 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -122,14 +122,14 @@
   line-height: 1.5;
   padding: 16px;
 
-  p {
+  .text {
     color: $text-color;
   }
 
   .sidebar-item-warning-message-actions {
     display: flex;
 
-    button {
+    .btn {
       flex-grow: 1;
     }
   }