diff --git a/js/admin/dist/app.js b/js/admin/dist/app.js
index c325ba7bd..24a526bcd 100644
--- a/js/admin/dist/app.js
+++ b/js/admin/dist/app.js
@@ -21358,12 +21358,12 @@ System.register('flarum/helpers/listItems', ['flarum/components/Separator', 'fla
item.attrs.key = item.attrs.key || item.itemName;
}
- return [isListItem ? item : m(
+ return isListItem ? item : m(
'li',
{ className: classList([item.itemName ? 'item-' + item.itemName : '', className, active ? 'active' : '']),
key: item.itemName },
item
- )];
+ );
});
}
diff --git a/js/forum/dist/app.js b/js/forum/dist/app.js
index 4e5930a85..60a6267de 100644
--- a/js/forum/dist/app.js
+++ b/js/forum/dist/app.js
@@ -19714,14 +19714,13 @@ System.register('flarum/components/CommentPost', ['flarum/components/Post', 'fla
}, {
key: 'content',
value: function content() {
+ // Note: we avoid using JSX for the
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 babelHelpers.get(Object.getPrototypeOf(CommentPost.prototype), 'content', this).call(this).concat([m(
'header',
{ className: 'Post-header' },
- m(
- 'ul',
- null,
- listItems(this.headerItems().toArray())
- )
+ m('ul', listItems(this.headerItems().toArray()))
), m(
'div',
{ className: 'Post-body' },
@@ -28598,12 +28597,12 @@ System.register('flarum/helpers/listItems', ['flarum/components/Separator', 'fla
item.attrs.key = item.attrs.key || item.itemName;
}
- return [isListItem ? item : m(
+ return isListItem ? item : m(
'li',
{ className: classList([item.itemName ? 'item-' + item.itemName : '', className, active ? 'active' : '']),
key: item.itemName },
item
- )];
+ );
});
}
diff --git a/js/forum/src/components/CommentPost.js b/js/forum/src/components/CommentPost.js
index 8e91096ac..e31be5ed1 100644
--- a/js/forum/src/components/CommentPost.js
+++ b/js/forum/src/components/CommentPost.js
@@ -41,8 +41,11 @@ export default class CommentPost extends Post {
}
content() {
+ // Note: we avoid using JSX for the 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([
- {listItems(this.headerItems().toArray())}
,
+ {m('ul', listItems(this.headerItems().toArray()))},
{this.isEditing()
?
diff --git a/js/lib/helpers/listItems.js b/js/lib/helpers/listItems.js
index d7ebe0544..651749bfc 100644
--- a/js/lib/helpers/listItems.js
+++ b/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
- :
-
- {item}
-
- ];
+ return isListItem
+ ? item
+ : -
+ {item}
+
;
});
}