chore: major frontend JS cleanup (#3609)

flarum · May 7, 2023 · d4fa864 · d4fa864
1 parent d8e33e7
commit d4fa864
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 26 deletions.
diff --git a/js/src/forum/addLikeAction.js b/js/src/forum/addLikeAction.js
@@ -15,32 +15,31 @@ export default function () {
 
     items.add(
       'like',
-      Button.component(
-        {
-          className: 'Button Button--link',
-          onclick: () => {
-            isLiked = !isLiked;
-
-            post.save({ isLiked });
-
-            // We've saved the fact that we do or don't like the post, but in order
-            // to provide instantaneous feedback to the user, we'll need to add or
-            // remove the like from the relationship data manually.
-            const data = post.data.relationships.likes.data;
-            data.some((like, i) => {
-              if (like.id === app.session.user.id()) {
-                data.splice(i, 1);
-                return true;
-              }
-            });
-
-            if (isLiked) {
-              data.unshift({ type: 'users', id: app.session.user.id() });
+      <Button
+        className="Button Button--link"
+        onclick={() => {
+          isLiked = !isLiked;
+
+          post.save({ isLiked });
+
+          // We've saved the fact that we do or don't like the post, but in order
+          // to provide instantaneous feedback to the user, we'll need to add or
+          // remove the like from the relationship data manually.
+          const data = post.data.relationships.likes.data;
+          data.some((like, i) => {
+            if (like.id === app.session.user.id()) {
+              data.splice(i, 1);
+              return true;
             }
-          },
-        },
-        app.translator.trans(isLiked ? 'flarum-likes.forum.post.unlike_link' : 'flarum-likes.forum.post.like_link')
-      )
+          });
+
+          if (isLiked) {
+            data.unshift({ type: 'users', id: app.session.user.id() });
+          }
+        }}
+      >
+        {app.translator.trans(isLiked ? 'flarum-likes.forum.post.unlike_link' : 'flarum-likes.forum.post.like_link')}
+      </Button>
     );
   });
 }
diff --git a/js/src/forum/addLikesList.js b/js/src/forum/addLikesList.js
@@ -59,7 +59,7 @@ export default function () {
         'liked',
         <div className="Post-likedBy">
           {icon('far fa-thumbs-up')}
-          {app.translator.trans('flarum-likes.forum.post.liked_by' + (likes[0] === app.session.user ? '_self' : '') + '_text', {
+          {app.translator.trans(`flarum-likes.forum.post.liked_by${likes[0] === app.session.user ? '_self' : ''}_text`, {
             count: names.length,
             users: punctuateSeries(names),
           })}