diff options
| author | Phil Hughes <me@iamphill.com> | 2017-01-06 10:02:16 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-01-06 10:36:59 +0000 |
| commit | de59f498077e33bc479ef54775383e7cb9de96d9 (patch) | |
| tree | b3357f440cb7b4ac21cf702fdd8870d48fb87153 | |
| parent | 6003f6ea93f8935ef4b6e9972f06a6a11aa48e69 (diff) | |
| download | gitlab-ce-fixed-failing-markdown-input-tests.tar.gz | |
Fixed failing markdown button testsfixed-failing-markdown-input-tests
| -rw-r--r-- | app/views/projects/_zen.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/notes/_edit_form.html.haml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/_zen.html.haml b/app/views/projects/_zen.html.haml index 0c8241053e7..5f66adbc00c 100644 --- a/app/views/projects/_zen.html.haml +++ b/app/views/projects/_zen.html.haml @@ -1,10 +1,11 @@ - @gfm_form = true - supports_slash_commands = local_assigns.fetch(:supports_slash_commands, false) +- textarea_id = local_assigns.fetch(:textarea_id, 'note_note') .zen-backdrop - classes << ' js-gfm-input js-autosize markdown-area' - if defined?(f) && f = f.text_area attr, class: classes, placeholder: placeholder, data: { supports_slash_commands: supports_slash_commands } - else - = text_area_tag attr, nil, class: classes, placeholder: placeholder + = text_area_tag attr, nil, class: classes, placeholder: placeholder, id: textarea_id %a.zen-control.zen-control-leave.js-zen-leave{ href: "#" } = icon('compress') diff --git a/app/views/projects/notes/_edit_form.html.haml b/app/views/projects/notes/_edit_form.html.haml index d36b4e6c8ab..edeccaf3dc6 100644 --- a/app/views/projects/notes/_edit_form.html.haml +++ b/app/views/projects/notes/_edit_form.html.haml @@ -4,7 +4,7 @@ = hidden_field_tag :target_id, '', class: 'js-form-target-id' = hidden_field_tag :target_type, '', class: 'js-form-target-type' = render layout: 'projects/md_preview', locals: { preview_class: 'md-preview', referenced_users: true } do - = render 'projects/zen', attr: 'note[note]', classes: 'note-textarea js-note-text js-task-list-field', placeholder: "Write a comment or drag your files here..." + = render 'projects/zen', attr: 'note[note]', classes: 'note-textarea js-note-text js-task-list-field', placeholder: "Write a comment or drag your files here...", textarea_id: nil = render 'projects/notes/hints' .note-form-actions.clearfix |