Fix popup dialog

2 files changed, 13 insertions, 25 deletions

diff --git a/app/assets/javascripts/repo/index.js b/app/assets/javascripts/repo/index.js
index a929f021b1f..f2e86384fb5 100644
--- a/app/assets/javascripts/repo/index.js
+++ b/app/assets/javascripts/repo/index.js
@@ -22,20 +22,21 @@ function addEventsForNonVueEls() {
   };
 }
 
-function setInitialStore(data) {
+function setInitialStore(dataset) {
   Store.service = Service;
-  Store.service.url = data.url;
-  Store.service.refsUrl = data.refsUrl;
-  Store.projectId = data.projectId;
-  Store.projectName = data.projectName;
-  Store.projectUrl = data.projectUrl;
-  Store.canCommit = data.canCommit;
-  Store.onTopOfBranch = data.onTopOfBranch;
-  Store.customBranchURL = decodeURIComponent(data.blobUrl);
+  Store.service.url = dataset.url;
+  Store.service.refsUrl = dataset.refsUrl;
+  Store.projectId = dataset.projectId;
+  Store.projectName = dataset.projectName;
+  Store.projectUrl = dataset.projectUrl;
+  Store.canCommit = dataset.canCommit;
+  Store.onTopOfBranch = dataset.onTopOfBranch;
+  Store.customBranchURL = decodeURIComponent(dataset.blobUrl);
   Store.currentBranch = $('button.dropdown-menu-toggle').attr('data-ref');
 
   Store.checkIsCommitable();
-  Store.setBranchHash();
+  Service.branchSingle()
+    .then(Store.setBranchHash);
 }
 
 function initRepo(el) {
diff --git a/app/assets/javascripts/vue_shared/components/popup_dialog.vue b/app/assets/javascripts/vue_shared/components/popup_dialog.vue
index 8028dd52d2b..5d61c86488f 100644
--- a/app/assets/javascripts/vue_shared/components/popup_dialog.vue
+++ b/app/assets/javascripts/vue_shared/components/popup_dialog.vue
@@ -16,11 +16,6 @@ export default {
       required: false,
       default: 'primary',
     },
-    closeKind: {
-      type: String,
-      required: false,
-      default: 'default',
-    },
     closeButtonLabel: {
       type: String,
       required: false,
@@ -34,14 +29,7 @@ export default {
 
   computed: {
     btnKindClass() {
-      return {
-        [`btn-${this.kind}`]: true,
-      };
-    },
-    btnCancelKindClass() {
-      return {
-        [`btn-${this.closeKind}`]: true,
-      };
+      return `btn-${this.kind}`;
     },
   },
 
@@ -78,8 +66,7 @@ export default {
       <div class="modal-footer">
         <button
           type="button"
-          class="btn close-button"
-          :class="btnCancelKindClass"
+          class="btn btn-default close-button"
           @click="emitSubmit(false)">
             {{closeButtonLabel}}
         </button>