diff options
author | pburdette <pburdette@gitlab.com> | 2019-09-09 11:29:00 -0400 |
---|---|---|
committer | pburdette <pburdette@gitlab.com> | 2019-09-09 11:29:00 -0400 |
commit | dc849d948eef679b8a9f4a6d7c67aeb0916bf8fc (patch) | |
tree | 09140aac1f22c9f691cbd7564b91f373c6e93744 | |
parent | 455038c1c8c50111ea6fab63d9bdff5626da0e63 (diff) | |
download | gitlab-ce-resolve-usability-problem-file-template.tar.gz |
Clear editor and hide template selector when filename input is emptyresolve-usability-problem-file-template
-rw-r--r-- | app/assets/javascripts/blob/file_template_mediator.js | 11 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/editor.scss | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/app/assets/javascripts/blob/file_template_mediator.js b/app/assets/javascripts/blob/file_template_mediator.js index 42b62e8ece4..115c4ee801b 100644 --- a/app/assets/javascripts/blob/file_template_mediator.js +++ b/app/assets/javascripts/blob/file_template_mediator.js @@ -91,7 +91,12 @@ export default class FileTemplateMediator { listenForFilenameInput() { this.$filenameInput.on('keyup blur', () => { - this.displayMatchedTemplateSelector(); + if(this.isFilenameEmpty()) { + this.clearEditorContent() + this.hideTemplateSelectorMenu() + } else { + this.displayMatchedTemplateSelector(); + } }); } @@ -255,6 +260,10 @@ export default class FileTemplateMediator { this.$filenameInput.val(filename) } + isFilenameEmpty() { + return this.getFilename() === "" + } + getSelected() { return this.templateSelectors.find(selector => selector.selected); } diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss index 413195498d7..1914a47514e 100644 --- a/app/assets/stylesheets/pages/editor.scss +++ b/app/assets/stylesheets/pages/editor.scss @@ -33,8 +33,8 @@ .file-title { @extend .monospace; line-height: 35px; - padding-top: 2px; - padding-bottom: 2px; + padding-top: 7px; + padding-bottom: 7px; display: flex; align-items: center; } @@ -182,7 +182,6 @@ .template-selector-dropdowns-wrap { display: inline-block; - margin: 10px 0 0 8px; vertical-align: top; @media(max-width: map-get($grid-breakpoints, md)-1) { @@ -199,7 +198,6 @@ display: inline-block; vertical-align: top; font-family: $regular_font; - margin-top: -5px; @media(max-width: map-get($grid-breakpoints, md)-1) { display: block; |