Flarum 1.0 update

FriendsOfFlarum · May 17, 2021 · c592688 · c592688
1 parent 9557736
commit c592688
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         }
       ],
     "require": {
-        "flarum/core": "^0.1.0-beta.16"
+        "flarum/core": "^1.0.0"
     },
     "authors": [
         {
@@ -43,7 +43,10 @@
                 "name": "fas fa-pen",
                 "backgroundColor": "#e74c3c",
                 "color": "#fff"
-            }
+            },
+            "optional-dependencies": [
+                "flarum/suspend"
+            ]
         },
         "flagrow": {
             "discuss": "https://discuss.flarum.org/d/17775"

diff --git a/js/package-lock.json b/js/package-lock.json
diff --git a/js/package.json b/js/package.json
@@ -14,6 +14,6 @@
     },
     "devDependencies": {
         "flarum": "0.1.0-beta.16",
-        "prettier": "^1.19.1"
+        "prettier": "^2.2.1"
     }
 }
diff --git a/js/src/forum/components/UserBio.js b/js/src/forum/components/UserBio.js
@@ -103,16 +103,13 @@ export default class UserBio extends Component {
         m.redraw.sync();
 
         const bio = this;
-        const save = function(e) {
+        const save = function (e) {
             if (e.shiftKey) return;
             e.preventDefault();
             bio.save($(this).val());
         };
 
-        this.$('textarea')
-            .focus()
-            .bind('blur', save)
-            .bind('keydown', 'return', save);
+        this.$('textarea').focus().bind('blur', save).bind('keydown', 'return', save);
         m.redraw();
     }
 

diff --git a/js/src/forum/index.js b/js/src/forum/index.js
@@ -8,19 +8,11 @@ import UserBio from './components/UserBio';
 
 app.initializers.add('fof-user-bio', () => {
     User.prototype.bio = Model.attribute('bio');
-    User.prototype.bioHtml = computed('bio', bio =>
-        bio
-            ? '<p>' +
-              $('<div/>')
-                  .text(bio)
-                  .html()
-                  .replace(/\n/g, '<br>')
-                  .autoLink({ rel: 'nofollow ugc' }) +
-              '</p>'
-            : ''
+    User.prototype.bioHtml = computed('bio', (bio) =>
+        bio ? '<p>' + $('<div/>').text(bio).html().replace(/\n/g, '<br>').autoLink({ rel: 'nofollow ugc' }) + '</p>' : ''
     );
 
-    extend(UserCard.prototype, 'infoItems', function(items) {
+    extend(UserCard.prototype, 'infoItems', function (items) {
         let user = this.attrs.user;
 
         if (!user.attribute('canViewBio')) {