diff options
| -rw-r--r-- | app/assets/javascripts/blob/template_selector.js | 9 | ||||
| -rw-r--r-- | app/assets/javascripts/templates/issuable_template_selector.js.es6 | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/app/assets/javascripts/blob/template_selector.js b/app/assets/javascripts/blob/template_selector.js index 26852aadea5..6d41442cdfc 100644 --- a/app/assets/javascripts/blob/template_selector.js +++ b/app/assets/javascripts/blob/template_selector.js @@ -72,14 +72,17 @@ // To be implemented on the extending class // e.g. // Api.gitignoreText item.name, @requestFileSuccess.bind(@) - TemplateSelector.prototype.requestFileSuccess = function(file, skipFocus, append) { + TemplateSelector.prototype.requestFileSuccess = function(file, opts) { var oldValue = this.editor.getValue(); var newValue = file.content; - if (append && oldValue.length && oldValue !== newValue) { + if (opts == null) { + opts = {}; + } + if (opts.append && oldValue.length && oldValue !== newValue) { newValue = oldValue + '\n\n' + newValue; } this.editor.setValue(newValue, 1); - if (!skipFocus) this.editor.focus(); + if (!opts.skipFocus) this.editor.focus(); if (this.editor instanceof jQuery) { this.editor.get(0).dispatchEvent(this.autosizeUpdateEvent); diff --git a/app/assets/javascripts/templates/issuable_template_selector.js.es6 b/app/assets/javascripts/templates/issuable_template_selector.js.es6 index a1ca1c1941c..017008c8438 100644 --- a/app/assets/javascripts/templates/issuable_template_selector.js.es6 +++ b/app/assets/javascripts/templates/issuable_template_selector.js.es6 @@ -38,12 +38,12 @@ // separated by a blank line if the previous value is non-empty. if (this.titleInput.val() === '') { // If the title has not yet been set, focus the title input and - // skip focusing the description input by setting `true` as the 2nd - // argument to `requestFileSuccess`. - this.requestFileSuccess(this.currentTemplate, true, append); + // skip focusing the description input by setting `true` as the + // `skipFocus` option to `requestFileSuccess`. + this.requestFileSuccess(this.currentTemplate, {skipFocus: true, append}); this.titleInput.focus(); } else { - this.requestFileSuccess(this.currentTemplate, false, append); + this.requestFileSuccess(this.currentTemplate, {skipFocus: false, append}); } return; } |