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 !

CHANGELOG.md

@@ -1,3 +1,17 @@
+# Upcoming Wekan release
+
+This release adds the following new features:
+
+* [Markdown in card/minicard/checlist titles and checklist items. Next line: Shift+Enter. Submit: Enter.](https://github.com/wekan/wekan/pull/1334);
+
+and fixes the following bugs:
+
+* [Fix: Emoji detection breaks MAC addresses](https://github.com/wekan/wekan/issues/1248);
+* [Fix: Codeblocks should not be scanned for emoji](https://github.com/wekan/wekan/issues/643);
+* [Fix: Whitespace trimming breaks Markdown code block indentation](https://github.com/wekan/wekan/issues/1288).
+
+Thanks to Github user brooksbecton for contributions.
+
 # v0.54 2017-11-02 Wekan release
 
 This release adds the following new features:

client/components/cards/cardDetails.jade

@@ -9,9 +9,10 @@ template(name="cardDetails")
           a.fa.fa-navicon.card-details-menu.js-open-card-details-menu
         h2.card-details-title.js-card-title(
           class="{{#if canModifyCard}}js-open-inlined-form is-editable{{/if}}")
-            = title
-            if isWatching
-              i.fa.fa-eye.card-details-watch
+            +viewer
+              = title
+              if isWatching
+                i.fa.fa-eye.card-details-watch
 
     if archived
       p.warning {{_ 'card-archived'}}

client/components/cards/cardDetails.js

@@ -197,7 +197,8 @@ Template.editCardTitleForm.onRendered(function () {
 Template.editCardTitleForm.events({
   'keydown .js-edit-card-title' (evt) {
     // If enter key was pressed, submit the data
-    if (evt.keyCode === 13) {
+    // Unless the shift key is also being pressed
+    if (evt.keyCode === 13 && !event.shiftKey) {
       $('.js-submit-edit-card-title-form').click();
     }
   },

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

client/components/cards/checklists.js

@@ -146,8 +146,9 @@ BlazeComponent.extendComponent({
   },
 
   pressKey(event) {
-    //If user press enter key inside a form, submit it, so user doesn't have to leave keyboard to submit a form.
-    if (event.keyCode === 13) {
+    //If user press enter key inside a form, submit it
+    //Unless the user is also holding down the 'shift' key
+    if (event.keyCode === 13 && !event.shiftKey) {
       event.preventDefault();
       const $form = $(event.currentTarget).closest('form');
       $form.find('button[type=submit]').click();

client/components/cards/minicard.jade

@@ -6,7 +6,9 @@ template(name="minicard")
       .minicard-labels
         each labels
           .minicard-label(class="card-label-{{color}}" title="{{name}}")
-    .minicard-title= title
+    .minicard-title
+      +viewer
+        = title
     .dates
       if startAt
           .date