diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-11-18 23:31:00 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-11-18 23:31:00 +0200 |
| commit | 13d8e75c05cf8ed90c4b5d8ee5aadad0f9444b8f (patch) | |
| tree | f6adf1888e052aaf639794c4e5fe314254a6a850 /client/components/cards/checklists.jade | |
| parent | ba3c3f8289534fed7b1525821fbf0d2fd3bd5ec2 (diff) | |
| parent | 8ae9cb97f7e32a4ede4b0e5c10c10b218a58b4d4 (diff) | |
| download | wekan-13d8e75c05cf8ed90c4b5d8ee5aadad0f9444b8f.tar.gz wekan-13d8e75c05cf8ed90c4b5d8ee5aadad0f9444b8f.tar.bz2 wekan-13d8e75c05cf8ed90c4b5d8ee5aadad0f9444b8f.zip | |
Merge branch 'brooksbecton-addMarkdownToTitle' into devel
Markdown in card/minicard/checlist titles
and checklist items. Next line: Shift+Enter. Submit: Enter. Closes #926.
Fix: Emoji detection breaks MAC addresses. Closes #1248.
Fix: Codeblocks should not be scanned for emoji. Closes #643.
Fix: Whitespace trimming breaks Markdown code block indentation. Closes #1288.
Thanks to brooksbecton !
Diffstat (limited to 'client/components/cards/checklists.jade')
| -rw-r--r-- | client/components/cards/checklists.jade | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade index 9ff52d8e..42fe3bd4 100644 --- a/client/components/cards/checklists.jade +++ b/client/components/cards/checklists.jade @@ -28,9 +28,13 @@ template(name="checklistDetail") span.checklist-stat(class="{{#if checklist.isFinished}}is-finished{{/if}}") {{checklist.finishedCount}}/{{checklist.itemCount}} if canModifyCard - h2.title.js-open-inlined-form.is-editable {{checklist.title}} + h2.title.js-open-inlined-form.is-editable + +viewer + = checklist.title else - h2.title {{checklist.title}} + h2.title + +viewer + = checklist.title +checklistItems(checklist = checklist) template(name="checklistDeleteDialog") @@ -83,7 +87,11 @@ template(name='itemDetail') .item.js-checklist-item if canModifyCard .check-box.materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}") - .item-title.js-open-inlined-form.is-editable(class="{{#if item.isFinished }}is-checked{{/if}}") {{item.title}} + .item-title.js-open-inlined-form.is-editable(class="{{#if item.isFinished }}is-checked{{/if}}") + +viewer + = item.title else .materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}") - .item-title(class="{{#if item.isFinished }}is-checked{{/if}}") {{item.title}} + .item-title(class="{{#if item.isFinished }}is-checked{{/if}}") + +viewer + = item.title |