fixed double scroll

improved variable & prop names

2 files changed, 11 insertions, 11 deletions

diff --git a/app/assets/javascripts/ide/components/file_templates/bar.vue b/app/assets/javascripts/ide/components/file_templates/bar.vue
index db1a4138d05..23be5f45f16 100644
--- a/app/assets/javascripts/ide/components/file_templates/bar.vue
+++ b/app/assets/javascripts/ide/components/file_templates/bar.vue
@@ -27,14 +27,14 @@ export default {
       'undoFileTemplate',
     ]),
     setInitialType() {
-      const type = this.templateTypes.find(t => t.name === this.activeFile.name);
+      const initialTemplateType = this.templateTypes.find(t => t.name === this.activeFile.name);
 
-      if (type) {
-        this.setSelectedTemplateType(type);
+      if (initialTemplateType) {
+        this.setSelectedTemplateType(initialTemplateType);
       }
     },
-    selectTemplateType(type) {
-      this.setSelectedTemplateType(type);
+    selectTemplateType(templateType) {
+      this.setSelectedTemplateType(templateType);
     },
     selectTemplate(template) {
       this.fetchTemplate(template);
@@ -60,7 +60,7 @@ export default {
     <dropdown
       v-if="showTemplatesDropdown"
       :label="__('Choose a template...')"
-      :async="true"
+      :is-async-data="true"
       :searchable="true"
       :title="__('File templates')"
       class="mr-2"
diff --git a/app/assets/javascripts/ide/components/file_templates/dropdown.vue b/app/assets/javascripts/ide/components/file_templates/dropdown.vue
index 11074c0c6de..13059937f85 100644
--- a/app/assets/javascripts/ide/components/file_templates/dropdown.vue
+++ b/app/assets/javascripts/ide/components/file_templates/dropdown.vue
@@ -24,7 +24,7 @@ export default {
       required: false,
       default: null,
     },
-    async: {
+    isAsyncData: {
       type: Boolean,
       required: false,
       default: false,
@@ -43,14 +43,14 @@ export default {
   computed: {
     ...mapState('fileTemplates', ['templates', 'isLoading']),
     outputData() {
-      return (this.async ? this.templates : this.data).filter(t => {
+      return (this.isAsyncData ? this.templates : this.data).filter(t => {
         if (!this.searchable) return true;
 
         return t.name.toLowerCase().indexOf(this.search.toLowerCase()) >= 0;
       });
     },
     showLoading() {
-      return this.async ? this.isLoading : false;
+      return this.isAsyncData ? this.isLoading : false;
     },
   },
   mounted() {
@@ -62,7 +62,7 @@ export default {
   methods: {
     ...mapActions('fileTemplates', ['fetchTemplateTypes']),
     fetchTemplatesIfAsync() {
-      if (this.async) {
+      if (this.isAsyncData) {
         this.fetchTemplateTypes();
       }
     },
@@ -79,7 +79,7 @@ export default {
       :toggle-text="label"
       data-display="static"
     />
-    <div class="dropdown-menu">
+    <div class="dropdown-menu pb-0">
       <div
         v-if="title"
         class="dropdown-title ml-0 mr-0"