diff options
author | Phil Hughes <me@iamphill.com> | 2018-08-28 10:01:14 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-09-07 08:24:00 +0100 |
commit | 7465f62eb559d10902f478be7a51b9661d1f89be (patch) | |
tree | 9b4dcef390c84f1689c02769e9ec4dc5679b4e1f /app/assets/javascripts/ide/components | |
parent | 843467b8c4be9ff1658d18d606f7fd5b149cbec9 (diff) | |
download | gitlab-ce-7465f62eb559d10902f478be7a51b9661d1f89be.tar.gz |
fixed action name changes after rebase
fixed content not updating in editor when changing template
Diffstat (limited to 'app/assets/javascripts/ide/components')
-rw-r--r-- | app/assets/javascripts/ide/components/file_templates/bar.vue | 11 | ||||
-rw-r--r-- | app/assets/javascripts/ide/components/file_templates/dropdown.vue | 7 |
2 files changed, 14 insertions, 4 deletions
diff --git a/app/assets/javascripts/ide/components/file_templates/bar.vue b/app/assets/javascripts/ide/components/file_templates/bar.vue index 8344b5440e9..d9cca3fe1f2 100644 --- a/app/assets/javascripts/ide/components/file_templates/bar.vue +++ b/app/assets/javascripts/ide/components/file_templates/bar.vue @@ -23,16 +23,20 @@ export default { this.setInitialType(); }, methods: { - ...mapActions('fileTemplates', ['setTemplateType', 'fetchTemplate']), + ...mapActions('fileTemplates', [ + 'setSelectedTemplateType', + 'fetchTemplate', + 'undoFileTemplate', + ]), setInitialType() { const type = this.templateTypes.find(t => t.name === this.activeFile.name); if (type) { - this.setTemplateType(type); + this.setSelectedTemplateType(type); } }, selectTemplateType(type) { - this.setTemplateType(type); + this.setSelectedTemplateType(type); }, selecteTemplate(template) { this.fetchTemplate(template); @@ -69,6 +73,7 @@ export default { <button type="button" class="btn btn-default" + @click="undoFileTemplate" > {{ __('Undo') }} </button> diff --git a/app/assets/javascripts/ide/components/file_templates/dropdown.vue b/app/assets/javascripts/ide/components/file_templates/dropdown.vue index 914022d8764..11074c0c6de 100644 --- a/app/assets/javascripts/ide/components/file_templates/dropdown.vue +++ b/app/assets/javascripts/ide/components/file_templates/dropdown.vue @@ -77,11 +77,12 @@ export default { <div class="dropdown"> <dropdown-button :toggle-text="label" + data-display="static" /> <div class="dropdown-menu"> <div v-if="title" - class="dropdown-title" + class="dropdown-title ml-0 mr-0" > {{ title }} </div> @@ -95,6 +96,10 @@ export default { type="search" class="dropdown-input-field" /> + <i + aria-hidden="true" + class="fa fa-search dropdown-input-search" + ></i> </div> <div class="dropdown-content"> <loading-icon |