diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-06 10:28:25 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-06 10:28:25 +0100 |
| commit | a9186d07e9b0b678450403b35028dc058299c74d (patch) | |
| tree | 57e1bdc75037098937b4e7040b0a4c6fdececead /app | |
| parent | 5200686bd980751d73738fdecd8232b682a7fcdc (diff) | |
| download | gitlab-ce-a9186d07e9b0b678450403b35028dc058299c74d.tar.gz | |
Fixed close button text
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/comment_type_toggle.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js | 6 | ||||
| -rw-r--r-- | app/views/shared/_comment_type_toggle.html.haml | 0 |
3 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/comment_type_toggle.js b/app/assets/javascripts/comment_type_toggle.js index df337441a40..2110d19a9ea 100644 --- a/app/assets/javascripts/comment_type_toggle.js +++ b/app/assets/javascripts/comment_type_toggle.js @@ -25,6 +25,10 @@ class CommentTypeToggle { inputSetterConfig.push({ input: this.secondaryButton, valueAttribute: 'data-secondary-button-text', + }, { + input: this.secondaryButton, + valueAttribute: 'data-secondary-button-text', + inputAttribute: 'data-alternative-text', }); } diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index ee62ca2fbfb..e22232af800 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -149,9 +149,9 @@ require('./task_list'); this.commentTypeToggle = new CommentTypeToggle( form.querySelector('.js-comment-type-dropdown .dropdown-toggle'), form.querySelector('.js-comment-type-dropdown .dropdown-menu'), - document.querySelector('.timeline-content-form #note_type'), + document.querySelector('.js-main-target-form #note_type'), form.querySelector('.js-comment-type-dropdown .js-comment-submit-button'), - document.querySelector('.js-note-target-close'), + document.querySelector('.js-main-target-form .js-note-target-close'), ); this.commentTypeToggle.initDroplab(); @@ -949,7 +949,7 @@ require('./task_list'); discardbtn = form.find('.js-note-discard'); if (textarea.val().trim().length > 0) { reopentext = reopenbtn.data('alternative-text'); - closetext = closebtn.data('alternative-text'); + closetext = closebtn.attr('data-alternative-text'); if (reopenbtn.text() !== reopentext) { reopenbtn.text(reopentext); } diff --git a/app/views/shared/_comment_type_toggle.html.haml b/app/views/shared/_comment_type_toggle.html.haml deleted file mode 100644 index e69de29bb2d..00000000000 --- a/app/views/shared/_comment_type_toggle.html.haml +++ /dev/null |