From cf7e132a8a15c01d6b23b7b905dfee7b3b16d2ee Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Sat, 27 Aug 2016 23:33:34 +0930
Subject: [PATCH] Avoid JSX to workaround Mithril 0.1.x weirdness. closes
 flarum/core#975

---
 .../js/forum/src/components/CommentPost.js    |  5 ++++-
 framework/core/js/lib/helpers/listItems.js    | 22 +++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/framework/core/js/forum/src/components/CommentPost.js b/framework/core/js/forum/src/components/CommentPost.js
index 8e91096ac..e31be5ed1 100644
--- a/framework/core/js/forum/src/components/CommentPost.js
+++ b/framework/core/js/forum/src/components/CommentPost.js
@@ -41,8 +41,11 @@ export default class CommentPost extends Post {
   }
 
   content() {
+    // Note: we avoid using JSX for the <ul> below because it results in some
+    // weirdness in Mithril.js 0.1.x (see flarum/core#975). This workaround can
+    // be reverted when we upgrade to Mithril 1.0.
     return super.content().concat([
-      <header className="Post-header"><ul>{listItems(this.headerItems().toArray())}</ul></header>,
+      <header className="Post-header">{m('ul', listItems(this.headerItems().toArray()))}</header>,
       <div className="Post-body">
         {this.isEditing()
           ? <div className="Post-preview" config={this.configPreview.bind(this)}/>
diff --git a/framework/core/js/lib/helpers/listItems.js b/framework/core/js/lib/helpers/listItems.js
index d7ebe0544..651749bfc 100644
--- a/framework/core/js/lib/helpers/listItems.js
+++ b/framework/core/js/lib/helpers/listItems.js
@@ -39,17 +39,15 @@ export default function listItems(items) {
       item.attrs.key = item.attrs.key || item.itemName;
     }
 
-    return [
-      isListItem
-        ? item
-        : <li className={classList([
-            (item.itemName ? 'item-' + item.itemName : ''),
-            className,
-            (active ? 'active' : '')
-          ])}
-            key={item.itemName}>
-            {item}
-          </li>
-    ];
+    return isListItem
+      ? item
+      : <li className={classList([
+          (item.itemName ? 'item-' + item.itemName : ''),
+          className,
+          (active ? 'active' : '')
+        ])}
+          key={item.itemName}>
+          {item}
+        </li>;
   });
 }