Merge branch 'master' into dk/1236-user-preferences

[ci skip] [skip ci]

.gitattributes

@@ -11,5 +11,3 @@ phpunit.xml export-ignore
 tests export-ignore
 
 js/dist/* -diff
-
-* text=auto eol=lf

README.md

@@ -1,14 +1,12 @@
-<p align="center"><img src="https://flarum.org/assets/img/logo.png"></p>
+<p align="center"><img src="https://flarum.org/img/logo.png"></p>
 
 <p align="center">
-<a href="https://github.com/flarum/core/actions?query=workflow%3ATests"><img src="https://github.com/flarum/core/workflows/Tests/badge.svg" alt="PHP Tests"></a>
+<a href="https://travis-ci.org/flarum/core"><img src="https://travis-ci.org/flarum/core.svg" alt="Build Status"></a>
-<a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/packagist/dt/flarum/core" alt="Total Downloads"></a>
+<a href="https://packagist.org/packages/flarum/core"><img src="https://poser.pugx.org/flarum/core/d/total.svg" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/github/v/release/flarum/core?sort=semver" alt="Latest Version"></a>
+<a href="https://packagist.org/packages/flarum/core"><img src="https://poser.pugx.org/flarum/core/v/stable.svg" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/packagist/l/flarum/core" alt="License"></a>
+<a href="https://packagist.org/packages/flarum/core"><img src="https://poser.pugx.org/flarum/core/license.svg" alt="License"></a>
-<a href="https://github.styleci.io/repos/28257573"><img src="https://github.styleci.io/repos/28257573/shield?style=flat" alt="StyleCI"></a>
 </p>
 
-
 ## About Flarum
 
 **[Flarum](https://flarum.org/) is a delightfully simple discussion platform for your website.** It's fast and easy to use, with all the features you need to run a successful community. It is designed to be:
@@ -34,3 +32,4 @@ If you discover a security vulnerability within Flarum, please send an e-mail to
 ## License
 
 Flarum is open-source software licensed under the [MIT License](https://github.com/flarum/flarum/blob/master/LICENSE).
+

composer.json

@@ -37,25 +37,25 @@
     "require": {
         "php": ">=7.2",
         "axy/sourcemap": "^0.1.4",
-        "components/font-awesome": "^5.14.0",
+        "components/font-awesome": "5.9.*",
         "dflydev/fig-cookies": "^2.0.1",
         "doctrine/dbal": "^2.7",
         "franzl/whoops-middleware": "^0.4.0",
-        "illuminate/bus": "^6.0",
+        "illuminate/bus": "5.8.*",
-        "illuminate/cache": "^6.0",
+        "illuminate/cache": "5.8.*",
-        "illuminate/config": "^6.0",
+        "illuminate/config": "5.8.*",
-        "illuminate/container": "^6.0",
+        "illuminate/container": "5.8.*",
-        "illuminate/contracts": "^6.0",
+        "illuminate/contracts": "5.8.*",
-        "illuminate/database": "^6.0",
+        "illuminate/database": "5.8.*",
-        "illuminate/events": "^6.0",
+        "illuminate/events": "5.8.*",
-        "illuminate/filesystem": "^6.0",
+        "illuminate/filesystem": "5.8.*",
-        "illuminate/hashing": "^6.0",
+        "illuminate/hashing": "5.8.*",
-        "illuminate/mail": "^6.0",
+        "illuminate/mail": "5.8.*",
-        "illuminate/queue": "^6.0",
+        "illuminate/queue": "5.8.*",
-        "illuminate/session": "^6.0",
+        "illuminate/session": "5.8.*",
-        "illuminate/support": "^6.0",
+        "illuminate/support": "5.8.*",
-        "illuminate/validation": "^6.0",
+        "illuminate/validation": "5.8.*",
-        "illuminate/view": "^6.0",
+        "illuminate/view": "5.8.*",
         "intervention/image": "^2.5.0",
         "laminas/laminas-diactoros": "^1.8.4",
         "laminas/laminas-httphandlerrunner": "^1.0",
@@ -66,7 +66,6 @@
         "middlewares/base-path-router": "^0.2.1",
         "middlewares/request-handler": "^1.2",
         "monolog/monolog": "^1.16.0",
-        "nesbot/carbon": "^2.0",
         "nikic/fast-route": "^0.6",
         "psr/http-message": "^1.0",
         "psr/http-server-handler": "^1.0",

js/package-lock.json

@@ -289,11 +289,6 @@
         "@babel/types": "^7.0.0"
       }
     },
-    "@babel/helper-validator-identifier": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz",
-      "integrity": "sha512-bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw=="
-    },
     "@babel/helper-wrap-function": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz",
@@ -450,21 +445,6 @@
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "@babel/plugin-syntax-typescript": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.1.tgz",
-      "integrity": "sha512-X/d8glkrAtra7CaQGMiGs/OGa6XgUzqPcBXCIGFCpCqnfGlT0Wfbzo/B89xHhnInTaItPK8LALblVXcUOEh95Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz",
-          "integrity": "sha512-j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g=="
-        }
-      }
-    },
     "@babel/plugin-transform-arrow-functions": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz",
@@ -760,159 +740,6 @@
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "@babel/plugin-transform-typescript": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.3.tgz",
-      "integrity": "sha512-qU9Lu7oQyh3PGMQncNjQm8RWkzw6LqsWZQlZPQMgrGt6s3YiBIaQ+3CQV/FA/icGS5XlSWZGwo/l8ErTyelS0Q==",
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.10.3",
-        "@babel/helper-plugin-utils": "^7.10.3",
-        "@babel/plugin-syntax-typescript": "^7.10.1"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz",
-          "integrity": "sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==",
-          "requires": {
-            "@babel/highlight": "^7.10.3"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.3.tgz",
-          "integrity": "sha512-drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA==",
-          "requires": {
-            "@babel/types": "^7.10.3",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-create-class-features-plugin": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.3.tgz",
-          "integrity": "sha512-iRT9VwqtdFmv7UheJWthGc/h2s7MqoweBF9RUj77NFZsg9VfISvBTum3k6coAhJ8RWv2tj3yUjA03HxPd0vfpQ==",
-          "requires": {
-            "@babel/helper-function-name": "^7.10.3",
-            "@babel/helper-member-expression-to-functions": "^7.10.3",
-            "@babel/helper-optimise-call-expression": "^7.10.3",
-            "@babel/helper-plugin-utils": "^7.10.3",
-            "@babel/helper-replace-supers": "^7.10.1",
-            "@babel/helper-split-export-declaration": "^7.10.1"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.3.tgz",
-          "integrity": "sha512-FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw==",
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.10.3",
-            "@babel/template": "^7.10.3",
-            "@babel/types": "^7.10.3"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.3.tgz",
-          "integrity": "sha512-iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg==",
-          "requires": {
-            "@babel/types": "^7.10.3"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.3.tgz",
-          "integrity": "sha512-q7+37c4EPLSjNb2NmWOjNwj0+BOyYlssuQ58kHEWk1Z78K5i8vTUsteq78HMieRPQSl/NtpQyJfdjt3qZ5V2vw==",
-          "requires": {
-            "@babel/types": "^7.10.3"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.3.tgz",
-          "integrity": "sha512-kT2R3VBH/cnSz+yChKpaKRJQJWxdGoc6SjioRId2wkeV3bK0wLLioFpJROrX0U4xr/NmxSSAWT/9Ih5snwIIzg==",
-          "requires": {
-            "@babel/types": "^7.10.3"
-          }
-        },
-        "@babel/helper-plugin-utils": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz",
-          "integrity": "sha512-j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g=="
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz",
-          "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==",
-          "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.10.1",
-            "@babel/helper-optimise-call-expression": "^7.10.1",
-            "@babel/traverse": "^7.10.1",
-            "@babel/types": "^7.10.1"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-          "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
-          "requires": {
-            "@babel/types": "^7.10.1"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz",
-          "integrity": "sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==",
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.3",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.3.tgz",
-          "integrity": "sha512-oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA=="
-        },
-        "@babel/template": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz",
-          "integrity": "sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==",
-          "requires": {
-            "@babel/code-frame": "^7.10.3",
-            "@babel/parser": "^7.10.3",
-            "@babel/types": "^7.10.3"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.3.tgz",
-          "integrity": "sha512-qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug==",
-          "requires": {
-            "@babel/code-frame": "^7.10.3",
-            "@babel/generator": "^7.10.3",
-            "@babel/helper-function-name": "^7.10.3",
-            "@babel/helper-split-export-declaration": "^7.10.1",
-            "@babel/parser": "^7.10.3",
-            "@babel/types": "^7.10.3",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@babel/types": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.3.tgz",
-          "integrity": "sha512-nZxaJhBXBQ8HVoIcGsf9qWep3Oh3jCENK54V4mRF7qaJabVsAYdbTtmSD8WmAp1R6ytPiu5apMwSXyxB1WlaBA==",
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.3",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
-      }
-    },
     "@babel/plugin-transform-unicode-regex": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz",
@@ -985,22 +812,6 @@
         "@babel/plugin-transform-react-jsx-source": "^7.0.0"
       }
     },
-    "@babel/preset-typescript": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.10.1.tgz",
-      "integrity": "sha512-m6GV3y1ShiqxnyQj10600ZVOFrSSAa8HQ3qIUk2r+gcGtHTIRw0dJnFLt1WNXpKjtVw7yw1DAPU/6ma2ZvgJuA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-transform-typescript": "^7.10.1"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz",
-          "integrity": "sha512-j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g=="
-        }
-      }
-    },
     "@babel/runtime": {
       "version": "7.1.5",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.5.tgz",
@@ -1075,11 +886,6 @@
       "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
       "dev": true
     },
-    "@types/mithril": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/mithril/-/mithril-2.0.3.tgz",
-      "integrity": "sha512-cZHOdO2IiXYeyjeDYdbOisSdfaJRzfmRo3zVzgu33IWTMA0KEQObp9fdvqcuYdPz93iJ1yCl19GcEjo/9yv+yA=="
-    },
     "@types/parse-json": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
@@ -2028,11 +1834,6 @@
       "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
       "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk="
     },
-    "dayjs": {
-      "version": "1.8.28",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.28.tgz",
-      "integrity": "sha512-ccnYgKC0/hPSGXxj7Ju6AV/BP4HUkXC2u15mikXT5mX9YorEaoi1bEKOmAqdkJHN4EEkmAf97SpH66Try5Mbeg=="
-    },
     "debug": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -2141,9 +1942,9 @@
       "integrity": "sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g=="
     },
     "elliptic": {
-      "version": "6.5.3",
+      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
-      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
       "requires": {
         "bn.js": "^4.4.0",
         "brorand": "^1.0.1",
@@ -3642,9 +3443,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.19",
+      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
     },
     "lodash-es": {
       "version": "4.17.14",
@@ -3812,9 +3613,9 @@
       }
     },
     "mithril": {
-      "version": "2.0.4",
+      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/mithril/-/mithril-2.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/mithril/-/mithril-0.2.8.tgz",
-      "integrity": "sha512-mgw+DMZlhMS4PpprF6dl7ZoeZq5GGcAuWnrg5e12MvaGauc4jzWsDZtVGRCktsiQczOEUr2K5teKbE5k44RlOg=="
+      "integrity": "sha512-9XuGnVmS2OyFexUuP/CcJFFJjHLM+RGYBxyVRNyQ6khbMfDJIF/xyZ4zq18ZRfPagpFmWUFpjHd5ZqPULGZyNg=="
     },
     "mixin-deep": {
       "version": "1.3.2",
@@ -3843,6 +3644,11 @@
         "minimist": "^1.2.5"
       }
     },
+    "moment": {
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
+      "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",

js/package.json

@@ -2,19 +2,17 @@
   "private": true,
   "name": "@flarum/core",
   "dependencies": {
-    "@babel/preset-typescript": "^7.10.1",
-    "@types/mithril": "^2.0.3",
     "bootstrap": "^3.4.1",
     "classnames": "^2.2.5",
     "color-thief-browser": "^2.0.2",
-    "dayjs": "^1.8.28",
     "expose-loader": "^0.7.5",
     "flarum-webpack-config": "0.1.0-beta.10",
     "jquery": "^3.4.1",
     "jquery.hotkeys": "^0.1.0",
     "lodash-es": "^4.17.14",
     "m.attrs.bidi": "github:tobscure/m.attrs.bidi",
-    "mithril": "^2.0.4",
+    "mithril": "^0.2.8",
+    "moment": "^2.22.2",
     "punycode": "^2.1.1",
     "spin.js": "^3.1.0",
     "webpack": "^4.43.0",

js/shims.d.ts

@@ -1,32 +0,0 @@
-// Mithril
-import Mithril from 'mithril';
-
-// Other third-party libs
-import * as _dayjs from 'dayjs';
-import * as _$ from 'jquery';
-
-// Globals from flarum/core
-import Application from './src/common/Application';
-
-/**
- * flarum/core exposes several extensions globally:
- *
- * - jQuery for convenient DOM manipulation
- * - Mithril for VDOM and components
- * - dayjs for date/time operations
- *
- * Since these are already part of the global namespace, extensions won't need
- * to (and should not) bundle these themselves.
- */
-declare global {
-  const $: typeof _$;
-  const m: Mithril.Static;
-  const dayjs: typeof _dayjs;
-}
-
-/**
- * All global variables owned by flarum/core.
- */
-declare global {
-  const app: Application;
-}

js/src/admin/AdminApplication.js

@@ -27,18 +27,13 @@ export default class AdminApplication extends Application {
    * @inheritdoc
    */
   mount() {
-    m.mount(document.getElementById('app-navigation'), { view: () => Navigation.component({ className: 'App-backControl', drawer: true }) });
+    m.mount(document.getElementById('app-navigation'), Navigation.component({ className: 'App-backControl', drawer: true }));
-    m.mount(document.getElementById('header-navigation'), Navigation);
+    m.mount(document.getElementById('header-navigation'), Navigation.component());
-    m.mount(document.getElementById('header-primary'), HeaderPrimary);
+    m.mount(document.getElementById('header-primary'), HeaderPrimary.component());
-    m.mount(document.getElementById('header-secondary'), HeaderSecondary);
+    m.mount(document.getElementById('header-secondary'), HeaderSecondary.component());
-    m.mount(document.getElementById('admin-navigation'), AdminNav);
+    m.mount(document.getElementById('admin-navigation'), AdminNav.component());
-
-    // Mithril does not render the home route on https://example.com/admin, so
-    // we need to go to https://example.com/admin#/ explicitly.
-    if (!document.location.hash) document.location.hash = '#/';
-
-    m.route.prefix = '#';
 
+    m.route.mode = 'hash';
     super.mount();
 
     // If an extension has just been enabled, then we will run its settings

js/src/admin/components/AdminLinkButton.js

@@ -10,7 +10,11 @@
 import LinkButton from '../../common/components/LinkButton';
 
 export default class AdminLinkButton extends LinkButton {
-  getButtonContent(children) {
+  getButtonContent() {
-    return [...super.getButtonContent(children), <div className="AdminLinkButton-description">{this.attrs.description}</div>];
+    const content = super.getButtonContent();
+
+    content.push(<div className="AdminLinkButton-description">{this.props.description}</div>);
+
+    return content;
   }
 }

js/src/admin/components/AdminNav.js

@@ -31,74 +31,62 @@ export default class AdminNav extends Component {
 
     items.add(
       'dashboard',
-      AdminLinkButton.component(
+      AdminLinkButton.component({
-        {
+        href: app.route('dashboard'),
-          href: app.route('dashboard'),
+        icon: 'far fa-chart-bar',
-          icon: 'far fa-chart-bar',
+        children: app.translator.trans('core.admin.nav.dashboard_button'),
-          description: app.translator.trans('core.admin.nav.dashboard_text'),
+        description: app.translator.trans('core.admin.nav.dashboard_text'),
-        },
+      })
-        app.translator.trans('core.admin.nav.dashboard_button')
-      )
     );
 
     items.add(
       'basics',
-      AdminLinkButton.component(
+      AdminLinkButton.component({
-        {
+        href: app.route('basics'),
-          href: app.route('basics'),
+        icon: 'fas fa-pencil-alt',
-          icon: 'fas fa-pencil-alt',
+        children: app.translator.trans('core.admin.nav.basics_button'),
-          description: app.translator.trans('core.admin.nav.basics_text'),
+        description: app.translator.trans('core.admin.nav.basics_text'),
-        },
+      })
-        app.translator.trans('core.admin.nav.basics_button')
-      )
     );
 
     items.add(
       'mail',
-      AdminLinkButton.component(
+      AdminLinkButton.component({
-        {
+        href: app.route('mail'),
-          href: app.route('mail'),
+        icon: 'fas fa-envelope',
-          icon: 'fas fa-envelope',
+        children: app.translator.trans('core.admin.nav.email_button'),
-          description: app.translator.trans('core.admin.nav.email_text'),
+        description: app.translator.trans('core.admin.nav.email_text'),
-        },
+      })
-        app.translator.trans('core.admin.nav.email_button')
-      )
     );
 
     items.add(
       'permissions',
-      AdminLinkButton.component(
+      AdminLinkButton.component({
-        {
+        href: app.route('permissions'),
-          href: app.route('permissions'),
+        icon: 'fas fa-key',
-          icon: 'fas fa-key',
+        children: app.translator.trans('core.admin.nav.permissions_button'),
-          description: app.translator.trans('core.admin.nav.permissions_text'),
+        description: app.translator.trans('core.admin.nav.permissions_text'),
-        },
+      })
-        app.translator.trans('core.admin.nav.permissions_button')
-      )
     );
 
     items.add(
       'appearance',
-      AdminLinkButton.component(
+      AdminLinkButton.component({
-        {
+        href: app.route('appearance'),
-          href: app.route('appearance'),
+        icon: 'fas fa-paint-brush',
-          icon: 'fas fa-paint-brush',
+        children: app.translator.trans('core.admin.nav.appearance_button'),
-          description: app.translator.trans('core.admin.nav.appearance_text'),
+        description: app.translator.trans('core.admin.nav.appearance_text'),
-        },
+      })
-        app.translator.trans('core.admin.nav.appearance_button')
-      )
     );
 
     items.add(
       'extensions',
-      AdminLinkButton.component(
+      AdminLinkButton.component({
-        {
+        href: app.route('extensions'),
-          href: app.route('extensions'),
+        icon: 'fas fa-puzzle-piece',
-          icon: 'fas fa-puzzle-piece',
+        children: app.translator.trans('core.admin.nav.extensions_button'),
-          description: app.translator.trans('core.admin.nav.extensions_text'),
+        description: app.translator.trans('core.admin.nav.extensions_text'),
-        },
+      })
-        app.translator.trans('core.admin.nav.extensions_button')
-      )
     );
 
     return items;

js/src/admin/components/AppearancePage.js

@@ -1,7 +1,6 @@
 import Page from '../../common/components/Page';
 import Button from '../../common/components/Button';
 import Switch from '../../common/components/Switch';
-import Stream from '../../common/utils/Stream';
 import EditCustomCssModal from './EditCustomCssModal';
 import EditCustomHeaderModal from './EditCustomHeaderModal';
 import EditCustomFooterModal from './EditCustomFooterModal';
@@ -9,13 +8,13 @@ import UploadImageButton from './UploadImageButton';
 import saveSettings from '../utils/saveSettings';
 
 export default class AppearancePage extends Page {
-  oninit(vnode) {
+  init() {
-    super.oninit(vnode);
+    super.init();
 
-    this.primaryColor = Stream(app.data.settings.theme_primary_color);
+    this.primaryColor = m.prop(app.data.settings.theme_primary_color);
-    this.secondaryColor = Stream(app.data.settings.theme_secondary_color);
+    this.secondaryColor = m.prop(app.data.settings.theme_secondary_color);
-    this.darkMode = Stream(app.data.settings.theme_dark_mode);
+    this.darkMode = m.prop(app.data.settings.theme_dark_mode === '1');
-    this.coloredHeader = Stream(app.data.settings.theme_colored_header);
+    this.coloredHeader = m.prop(app.data.settings.theme_colored_header === '1');
   }
 
   view() {
@@ -28,34 +27,40 @@ export default class AppearancePage extends Page {
               <div className="helpText">{app.translator.trans('core.admin.appearance.colors_text')}</div>
 
               <div className="AppearancePage-colors-input">
-                <input className="FormControl" type="text" placeholder="#aaaaaa" bidi={this.primaryColor} />
+                <input
-                <input className="FormControl" type="text" placeholder="#aaaaaa" bidi={this.secondaryColor} />
+                  className="FormControl"
+                  type="text"
+                  placeholder="#aaaaaa"
+                  value={this.primaryColor()}
+                  onchange={m.withAttr('value', this.primaryColor)}
+                />
+                <input
+                  className="FormControl"
+                  type="text"
+                  placeholder="#aaaaaa"
+                  value={this.secondaryColor()}
+                  onchange={m.withAttr('value', this.secondaryColor)}
+                />
               </div>
 
-              {Switch.component(
+              {Switch.component({
-                {
+                state: this.darkMode(),
-                  state: this.darkMode(),
+                children: app.translator.trans('core.admin.appearance.dark_mode_label'),
-                  onchange: this.darkMode,
+                onchange: this.darkMode,
-                },
+              })}
-                app.translator.trans('core.admin.appearance.dark_mode_label')
-              )}
 
-              {Switch.component(
+              {Switch.component({
-                {
+                state: this.coloredHeader(),
-                  state: this.coloredHeader(),
+                children: app.translator.trans('core.admin.appearance.colored_header_label'),
-                  onchange: this.coloredHeader,
+                onchange: this.coloredHeader,
-                },
+              })}
-                app.translator.trans('core.admin.appearance.colored_header_label')
-              )}
 
-              {Button.component(
+              {Button.component({
-                {
+                className: 'Button Button--primary',
-                  className: 'Button Button--primary',
+                type: 'submit',
-                  type: 'submit',
+                children: app.translator.trans('core.admin.appearance.submit_button'),
-                  loading: this.loading,
+                loading: this.loading,
-                },
+              })}
-                app.translator.trans('core.admin.appearance.submit_button')
-              )}
             </fieldset>
           </form>
 
@@ -74,37 +79,31 @@ export default class AppearancePage extends Page {
           <fieldset>
             <legend>{app.translator.trans('core.admin.appearance.custom_header_heading')}</legend>
             <div className="helpText">{app.translator.trans('core.admin.appearance.custom_header_text')}</div>
-            {Button.component(
+            {Button.component({
-              {
+              className: 'Button',
-                className: 'Button',
+              children: app.translator.trans('core.admin.appearance.edit_header_button'),
-                onclick: () => app.modal.show(EditCustomHeaderModal),
+              onclick: () => app.modal.show(new EditCustomHeaderModal()),
-              },
+            })}
-              app.translator.trans('core.admin.appearance.edit_header_button')
-            )}
           </fieldset>
 
           <fieldset>
             <legend>{app.translator.trans('core.admin.appearance.custom_footer_heading')}</legend>
             <div className="helpText">{app.translator.trans('core.admin.appearance.custom_footer_text')}</div>
-            {Button.component(
+            {Button.component({
-              {
+              className: 'Button',
-                className: 'Button',
+              children: app.translator.trans('core.admin.appearance.edit_footer_button'),
-                onclick: () => app.modal.show(EditCustomFooterModal),
+              onclick: () => app.modal.show(new EditCustomFooterModal()),
-              },
+            })}
-              app.translator.trans('core.admin.appearance.edit_footer_button')
-            )}
           </fieldset>
 
           <fieldset>
             <legend>{app.translator.trans('core.admin.appearance.custom_styles_heading')}</legend>
             <div className="helpText">{app.translator.trans('core.admin.appearance.custom_styles_text')}</div>
-            {Button.component(
+            {Button.component({
-              {
+              className: 'Button',
-                className: 'Button',
+              children: app.translator.trans('core.admin.appearance.edit_css_button'),
-                onclick: () => app.modal.show(EditCustomCssModal),
+              onclick: () => app.modal.show(new EditCustomCssModal()),
-              },
+            })}
-              app.translator.trans('core.admin.appearance.edit_css_button')
-            )}
           </fieldset>
         </div>
       </div>

js/src/admin/components/BasicsPage.js

@@ -2,15 +2,14 @@ import Page from '../../common/components/Page';
 import FieldSet from '../../common/components/FieldSet';
 import Select from '../../common/components/Select';
 import Button from '../../common/components/Button';
+import Alert from '../../common/components/Alert';
 import saveSettings from '../utils/saveSettings';
 import ItemList from '../../common/utils/ItemList';
 import Switch from '../../common/components/Switch';
-import Stream from '../../common/utils/Stream';
-import withAttr from '../../common/utils/withAttr';
 
 export default class BasicsPage extends Page {
-  oninit(vnode) {
+  init() {
-    super.oninit(vnode);
+    super.init();
 
     this.loading = false;
 
@@ -27,7 +26,7 @@ export default class BasicsPage extends Page {
     this.values = {};
 
     const settings = app.data.settings;
-    this.fields.forEach((key) => (this.values[key] = Stream(settings[key])));
+    this.fields.forEach((key) => (this.values[key] = m.prop(settings[key])));
 
     this.localeOptions = {};
     const locales = app.data.locales;
@@ -51,51 +50,45 @@ export default class BasicsPage extends Page {
       <div className="BasicsPage">
         <div className="container">
           <form onsubmit={this.onsubmit.bind(this)}>
-            {FieldSet.component(
+            {FieldSet.component({
-              {
+              label: app.translator.trans('core.admin.basics.forum_title_heading'),
-                label: app.translator.trans('core.admin.basics.forum_title_heading'),
+              children: [<input className="FormControl" value={this.values.forum_title()} oninput={m.withAttr('value', this.values.forum_title)} />],
-              },
+            })}
-              [<input className="FormControl" bidi={this.values.forum_title} />]
-            )}
 
-            {FieldSet.component(
+            {FieldSet.component({
-              {
+              label: app.translator.trans('core.admin.basics.forum_description_heading'),
-                label: app.translator.trans('core.admin.basics.forum_description_heading'),
+              children: [
-              },
-              [
                 <div className="helpText">{app.translator.trans('core.admin.basics.forum_description_text')}</div>,
-                <textarea className="FormControl" bidi={this.values.forum_description} />,
+                <textarea
-              ]
+                  className="FormControl"
-            )}
+                  value={this.values.forum_description()}
+                  oninput={m.withAttr('value', this.values.forum_description)}
+                />,
+              ],
+            })}
 
             {Object.keys(this.localeOptions).length > 1
-              ? FieldSet.component(
+              ? FieldSet.component({
-                  {
+                  label: app.translator.trans('core.admin.basics.default_language_heading'),
-                    label: app.translator.trans('core.admin.basics.default_language_heading'),
+                  children: [
-                  },
-                  [
                     Select.component({
                       options: this.localeOptions,
                       value: this.values.default_locale(),
                       onchange: this.values.default_locale,
                     }),
-                    Switch.component(
+                    Switch.component({
-                      {
+                      state: this.values.show_language_selector(),
-                        state: this.values.show_language_selector(),
+                      onchange: this.values.show_language_selector,
-                        onchange: this.values.show_language_selector,
+                      children: app.translator.trans('core.admin.basics.show_language_selector_label'),
-                      },
+                    }),
-                      app.translator.trans('core.admin.basics.show_language_selector_label')
+                  ],
-                    ),
+                })
-                  ]
-                )
               : ''}
 
-            {FieldSet.component(
+            {FieldSet.component({
-              {
+              label: app.translator.trans('core.admin.basics.home_page_heading'),
-                label: app.translator.trans('core.admin.basics.home_page_heading'),
+              className: 'BasicsPage-homePage',
-                className: 'BasicsPage-homePage',
+              children: [
-              },
-              [
                 <div className="helpText">{app.translator.trans('core.admin.basics.home_page_text')}</div>,
                 this.homePageItems()
                   .toArray()
@@ -106,52 +99,51 @@ export default class BasicsPage extends Page {
                         name="homePage"
                         value={path}
                         checked={this.values.default_route() === path}
-                        onclick={withAttr('value', this.values.default_route)}
+                        onclick={m.withAttr('value', this.values.default_route)}
                       />
                       {label}
                     </label>
                   )),
-              ]
+              ],
-            )}
+            })}
 
-            {FieldSet.component(
+            {FieldSet.component({
-              {
+              label: app.translator.trans('core.admin.basics.welcome_banner_heading'),
-                label: app.translator.trans('core.admin.basics.welcome_banner_heading'),
+              className: 'BasicsPage-welcomeBanner',
-                className: 'BasicsPage-welcomeBanner',
+              children: [
-              },
-              [
                 <div className="helpText">{app.translator.trans('core.admin.basics.welcome_banner_text')}</div>,
                 <div className="BasicsPage-welcomeBanner-input">
-                  <input className="FormControl" bidi={this.values.welcome_title} />
+                  <input className="FormControl" value={this.values.welcome_title()} oninput={m.withAttr('value', this.values.welcome_title)} />
-                  <textarea className="FormControl" bidi={this.values.welcome_message} />
+                  <textarea
+                    className="FormControl"
+                    value={this.values.welcome_message()}
+                    oninput={m.withAttr('value', this.values.welcome_message)}
+                  />
                 </div>,
-              ]
+              ],
-            )}
+            })}
 
             {Object.keys(this.displayNameOptions).length > 1
-              ? FieldSet.component(
+              ? FieldSet.component({
-                  {
+                  label: app.translator.trans('core.admin.basics.display_name_heading'),
-                    label: app.translator.trans('core.admin.basics.display_name_heading'),
+                  children: [
-                  },
-                  [
                     <div className="helpText">{app.translator.trans('core.admin.basics.display_name_text')}</div>,
                     Select.component({
                       options: this.displayNameOptions,
-                      bidi: this.values.display_name_driver,
+                      value: this.values.display_name_driver(),
+                      onchange: this.values.display_name_driver,
                     }),
-                  ]
+                  ],
-                )
+                })
               : ''}
 
-            {Button.component(
+            {Button.component({
-              {
+              type: 'submit',
-                type: 'submit',
+              className: 'Button Button--primary',
-                className: 'Button Button--primary',
+              children: app.translator.trans('core.admin.basics.submit_button'),
-                loading: this.loading,
+              loading: this.loading,
-                disabled: !this.changed(),
+              disabled: !this.changed(),
-              },
+            })}
-              app.translator.trans('core.admin.basics.submit_button')
-            )}
           </form>
         </div>
       </div>
@@ -194,7 +186,7 @@ export default class BasicsPage extends Page {
 
     saveSettings(settings)
       .then(() => {
-        this.successAlert = app.alerts.show({ type: 'success' }, app.translator.trans('core.admin.basics.saved_message'));
+        app.alerts.show((this.successAlert = new Alert({ type: 'success', children: app.translator.trans('core.admin.basics.saved_message') })));
       })
       .catch(() => {})
       .then(() => {

js/src/admin/components/EditGroupModal.js

@@ -4,23 +4,20 @@ import Badge from '../../common/components/Badge';
 import Group from '../../common/models/Group';
 import ItemList from '../../common/utils/ItemList';
 import Switch from '../../common/components/Switch';
-import Stream from '../../common/utils/Stream';
 
 /**
  * The `EditGroupModal` component shows a modal dialog which allows the user
  * to create or edit a group.
  */
 export default class EditGroupModal extends Modal {
-  oninit(vnode) {
+  init() {
-    super.oninit(vnode);
+    this.group = this.props.group || app.store.createRecord('groups');
 
-    this.group = this.attrs.group || app.store.createRecord('groups');
+    this.nameSingular = m.prop(this.group.nameSingular() || '');
-
+    this.namePlural = m.prop(this.group.namePlural() || '');
-    this.nameSingular = Stream(this.group.nameSingular() || '');
+    this.icon = m.prop(this.group.icon() || '');
-    this.namePlural = Stream(this.group.namePlural() || '');
+    this.color = m.prop(this.group.color() || '');
-    this.icon = Stream(this.group.icon() || '');
+    this.isHidden = m.prop(this.group.isHidden() || false);
-    this.color = Stream(this.group.color() || '');
-    this.isHidden = Stream(this.group.isHidden() || false);
   }
 
   className() {
@@ -56,8 +53,18 @@ export default class EditGroupModal extends Modal {
       <div className="Form-group">
         <label>{app.translator.trans('core.admin.edit_group.name_label')}</label>
         <div className="EditGroupModal-name-input">
-          <input className="FormControl" placeholder={app.translator.trans('core.admin.edit_group.singular_placeholder')} bidi={this.nameSingular} />
+          <input
-          <input className="FormControl" placeholder={app.translator.trans('core.admin.edit_group.plural_placeholder')} bidi={this.namePlural} />
+            className="FormControl"
+            placeholder={app.translator.trans('core.admin.edit_group.singular_placeholder')}
+            value={this.nameSingular()}
+            oninput={m.withAttr('value', this.nameSingular)}
+          />
+          <input
+            className="FormControl"
+            placeholder={app.translator.trans('core.admin.edit_group.plural_placeholder')}
+            value={this.namePlural()}
+            oninput={m.withAttr('value', this.namePlural)}
+          />
         </div>
       </div>,
       30
@@ -67,7 +74,7 @@ export default class EditGroupModal extends Modal {
       'color',
       <div className="Form-group">
         <label>{app.translator.trans('core.admin.edit_group.color_label')}</label>
-        <input className="FormControl" placeholder="#aaaaaa" bidi={this.color} />
+        <input className="FormControl" placeholder="#aaaaaa" value={this.color()} oninput={m.withAttr('value', this.color)} />
       </div>,
       20
     );
@@ -79,7 +86,7 @@ export default class EditGroupModal extends Modal {
         <div className="helpText">
           {app.translator.trans('core.admin.edit_group.icon_text', { a: <a href="https://fontawesome.com/icons?m=free" tabindex="-1" /> })}
         </div>
-        <input className="FormControl" placeholder="fas fa-bolt" bidi={this.icon} />
+        <input className="FormControl" placeholder="fas fa-bolt" value={this.icon()} oninput={m.withAttr('value', this.icon)} />
       </div>,
       10
     );
@@ -87,13 +94,11 @@ export default class EditGroupModal extends Modal {
     items.add(
       'hidden',
       <div className="Form-group">
-        {Switch.component(
+        {Switch.component({
-          {
+          state: !!Number(this.isHidden()),
-            state: !!Number(this.isHidden()),
+          children: app.translator.trans('core.admin.edit_group.hide_label'),
-            onchange: this.isHidden,
+          onchange: this.isHidden,
-          },
+        })}
-          app.translator.trans('core.admin.edit_group.hide_label')
-        )}
       </div>,
       10
     );
@@ -101,14 +106,12 @@ export default class EditGroupModal extends Modal {
     items.add(
       'submit',
       <div className="Form-group">
-        {Button.component(
+        {Button.component({
-          {
+          type: 'submit',
-            type: 'submit',
+          className: 'Button Button--primary EditGroupModal-save',
-            className: 'Button Button--primary EditGroupModal-save',
+          loading: this.loading,
-            loading: this.loading,
+          children: app.translator.trans('core.admin.edit_group.submit_button'),
-          },
+        })}
-          app.translator.trans('core.admin.edit_group.submit_button')
-        )}
         {this.group.exists && this.group.id() !== Group.ADMINISTRATOR_ID ? (
           <button type="button" className="Button EditGroupModal-delete" onclick={this.deleteGroup.bind(this)}>
             {app.translator.trans('core.admin.edit_group.delete_button')}

js/src/admin/components/ExtensionsPage.js

@@ -12,14 +12,12 @@ export default class ExtensionsPage extends Page {
       <div className="ExtensionsPage">
         <div className="ExtensionsPage-header">
           <div className="container">
-            {Button.component(
+            {Button.component({
-              {
+              children: app.translator.trans('core.admin.extensions.add_button'),
-                icon: 'fas fa-plus',
+              icon: 'fas fa-plus',
-                className: 'Button Button--primary',
+              className: 'Button Button--primary',
-                onclick: () => app.modal.show(AddExtensionModal),
+              onclick: () => app.modal.show(new AddExtensionModal()),
-              },
+            })}
-              app.translator.trans('core.admin.extensions.add_button')
-            )}
           </div>
         </div>
 
@@ -74,35 +72,31 @@ export default class ExtensionsPage extends Page {
     if (app.extensionSettings[name]) {
       items.add(
         'settings',
-        Button.component(
+        Button.component({
-          {
+          icon: 'fas fa-cog',
-            icon: 'fas fa-cog',
+          children: app.translator.trans('core.admin.extensions.settings_button'),
-            onclick: app.extensionSettings[name],
+          onclick: app.extensionSettings[name],
-          },
+        })
-          app.translator.trans('core.admin.extensions.settings_button')
-        )
       );
     }
 
     if (!enabled) {
       items.add(
         'uninstall',
-        Button.component(
+        Button.component({
-          {
+          icon: 'far fa-trash-alt',
-            icon: 'far fa-trash-alt',
+          children: app.translator.trans('core.admin.extensions.uninstall_button'),
-            onclick: () => {
+          onclick: () => {
-              app
+            app
-                .request({
+              .request({
-                  url: app.forum.attribute('apiUrl') + '/extensions/' + name,
+                url: app.forum.attribute('apiUrl') + '/extensions/' + name,
-                  method: 'DELETE',
+                method: 'DELETE',
-                })
+              })
-                .then(() => window.location.reload());
+              .then(() => window.location.reload());
 
-              app.modal.show(LoadingModal);
+            app.modal.show(new LoadingModal());
-            },
           },
-          app.translator.trans('core.admin.extensions.uninstall_button')
+        })
-        )
       );
     }
 
@@ -122,33 +116,13 @@ export default class ExtensionsPage extends Page {
       .request({
         url: app.forum.attribute('apiUrl') + '/extensions/' + id,
         method: 'PATCH',
-        body: { enabled: !enabled },
+        data: { enabled: !enabled },
-        errorHandler: this.onerror.bind(this),
       })
       .then(() => {
         if (!enabled) localStorage.setItem('enabledExtension', id);
         window.location.reload();
       });
 
-    app.modal.show(LoadingModal);
+    app.modal.show(new LoadingModal());
-  }
-
-  onerror(e) {
-    // We need to give the modal animation time to start; if we close the modal too early,
-    // it breaks the bootstrap modal library.
-    // TODO: This workaround should be removed when we move away from bootstrap JS for modals.
-    setTimeout(() => {
-      app.modal.close();
-
-      const error = JSON.parse(e.responseText).errors[0];
-
-      app.alerts.show(
-        { type: 'error' },
-        app.translator.trans(`core.lib.error.${error.code}_message`, {
-          extension: error.extension,
-          extensions: error.extensions.join(', '),
-        })
-      );
-    }, 250);
   }
 }

js/src/admin/components/HeaderSecondary.js

@@ -11,6 +11,13 @@ export default class HeaderSecondary extends Component {
     return <ul className="Header-controls">{listItems(this.items().toArray())}</ul>;
   }
 
+  config(isInitialized, context) {
+    // Since this component is 'above' the content of the page (that is, it is a
+    // part of the global UI that persists between routes), we will flag the DOM
+    // to be retained across route changes.
+    context.retain = true;
+  }
+
   /**
    * Build an item list for the controls.
    *

js/src/admin/components/LoadingModal.js

@@ -1,10 +1,9 @@
 import Modal from '../../common/components/Modal';
 
 export default class LoadingModal extends Modal {
-  /**
+  isDismissible() {
-   * @inheritdoc
+    return false;
-   */
+  }
-  static isDismissible = false;
 
   className() {
     return 'LoadingModal Modal--small';

js/src/admin/components/MailPage.js

@@ -5,11 +5,10 @@ import Alert from '../../common/components/Alert';
 import Select from '../../common/components/Select';
 import LoadingIndicator from '../../common/components/LoadingIndicator';
 import saveSettings from '../utils/saveSettings';
-import Stream from '../../common/utils/Stream';
 
 export default class MailPage extends Page {
-  oninit(vnode) {
+  init() {
-    super.oninit(vnode);
+    super.init();
 
     this.saving = false;
     this.sendingTest = false;
@@ -25,7 +24,7 @@ export default class MailPage extends Page {
     this.status = { sending: false, errors: {} };
 
     const settings = app.data.settings;
-    this.fields.forEach((key) => (this.values[key] = Stream(settings[key])));
+    this.fields.forEach((key) => (this.values[key] = m.prop(settings[key])));
 
     app
       .request({
@@ -40,7 +39,7 @@ export default class MailPage extends Page {
         for (const driver in this.driverFields) {
           for (const field in this.driverFields[driver]) {
             this.fields.push(field);
-            this.values[field] = Stream(settings[field]);
+            this.values[field] = m.prop(settings[field]);
           }
         }
 
@@ -70,27 +69,23 @@ export default class MailPage extends Page {
             <h2>{app.translator.trans('core.admin.email.heading')}</h2>
             <div className="helpText">{app.translator.trans('core.admin.email.text')}</div>
 
-            {FieldSet.component(
+            {FieldSet.component({
-              {
+              label: app.translator.trans('core.admin.email.addresses_heading'),
-                label: app.translator.trans('core.admin.email.addresses_heading'),
+              className: 'MailPage-MailSettings',
-                className: 'MailPage-MailSettings',
+              children: [
-              },
-              [
                 <div className="MailPage-MailSettings-input">
                   <label>
                     {app.translator.trans('core.admin.email.from_label')}
-                    <input className="FormControl" bidi={this.values.mail_from} />
+                    <input className="FormControl" value={this.values.mail_from() || ''} oninput={m.withAttr('value', this.values.mail_from)} />
                   </label>
                 </div>,
-              ]
+              ],
-            )}
+            })}
 
-            {FieldSet.component(
+            {FieldSet.component({
-              {
+              label: app.translator.trans('core.admin.email.driver_heading'),
-                label: app.translator.trans('core.admin.email.driver_heading'),
+              className: 'MailPage-MailSettings',
-                className: 'MailPage-MailSettings',
+              children: [
-              },
-              [
                 <div className="MailPage-MailSettings-input">
                   <label>
                     {app.translator.trans('core.admin.email.driver_label')}
@@ -101,24 +96,20 @@ export default class MailPage extends Page {
                     />
                   </label>
                 </div>,
-              ]
+              ],
-            )}
+            })}
 
             {this.status.sending ||
-              Alert.component(
+              Alert.component({
-                {
+                children: app.translator.trans('core.admin.email.not_sending_message'),
-                  dismissible: false,
+                dismissible: false,
-                },
+              })}
-                app.translator.trans('core.admin.email.not_sending_message')
-              )}
 
             {fieldKeys.length > 0 &&
-              FieldSet.component(
+              FieldSet.component({
-                {
+                label: app.translator.trans(`core.admin.email.${this.values.mail_driver()}_heading`),
-                  label: app.translator.trans(`core.admin.email.${this.values.mail_driver()}_heading`),
+                className: 'MailPage-MailSettings',
-                  className: 'MailPage-MailSettings',
+                children: [
-                },
-                [
                   <div className="MailPage-MailSettings-input">
                     {fieldKeys.map((field) => [
                       <label>
@@ -128,37 +119,31 @@ export default class MailPage extends Page {
                       this.status.errors[field] && <p className="ValidationError">{this.status.errors[field]}</p>,
                     ])}
                   </div>,
-                ]
+                ],
-              )}
+              })}
 
             <FieldSet>
-              {Button.component(
+              {Button.component({
-                {
+                type: 'submit',
-                  type: 'submit',
+                className: 'Button Button--primary',
-                  className: 'Button Button--primary',
+                children: app.translator.trans('core.admin.email.submit_button'),
-                  disabled: !this.changed(),
+                disabled: !this.changed(),
-                },
+              })}
-                app.translator.trans('core.admin.email.submit_button')
-              )}
             </FieldSet>
 
-            {FieldSet.component(
+            {FieldSet.component({
-              {
+              label: app.translator.trans('core.admin.email.send_test_mail_heading'),
-                label: app.translator.trans('core.admin.email.send_test_mail_heading'),
+              className: 'MailPage-MailSettings',
-                className: 'MailPage-MailSettings',
+              children: [
-              },
-              [
                 <div className="helpText">{app.translator.trans('core.admin.email.send_test_mail_text', { email: app.session.user.email() })}</div>,
-                Button.component(
+                Button.component({
-                  {
+                  className: 'Button Button--primary',
-                    className: 'Button Button--primary',
+                  children: app.translator.trans('core.admin.email.send_test_mail_button'),
-                    disabled: this.sendingTest || this.changed(),
+                  disabled: this.sendingTest || this.changed(),
-                    onclick: () => this.sendTestEmail(),
+                  onclick: () => this.sendTestEmail(),
-                  },
+                }),
-                  app.translator.trans('core.admin.email.send_test_mail_button')
+              ],
-                ),
+            })}
-              ]
-            )}
           </form>
         </div>
       </div>
@@ -171,7 +156,7 @@ export default class MailPage extends Page {
     const prop = this.values[name];
 
     if (typeof field === 'string') {
-      return <input className="FormControl" bidi={prop} />;
+      return <input className="FormControl" value={prop() || ''} oninput={m.withAttr('value', prop)} />;
     } else {
       return <Select value={prop()} options={field} onchange={prop} />;
     }
@@ -194,7 +179,9 @@ export default class MailPage extends Page {
       })
       .then((response) => {
         this.sendingTest = false;
-        this.testEmailSuccessAlert = app.alerts.show({ type: 'success' }, app.translator.trans('core.admin.email.send_test_mail_success'));
+        app.alerts.show(
+          (this.testEmailSuccessAlert = new Alert({ type: 'success', children: app.translator.trans('core.admin.email.send_test_mail_success') }))
+        );
       })
       .catch((error) => {
         this.sendingTest = false;
@@ -217,7 +204,7 @@ export default class MailPage extends Page {
 
     saveSettings(settings)
       .then(() => {
-        this.successAlert = app.alerts.show({ type: 'success' }, app.translator.trans('core.admin.basics.saved_message'));
+        app.alerts.show((this.successAlert = new Alert({ type: 'success', children: app.translator.trans('core.admin.basics.saved_message') })));
       })
       .catch(() => {})
       .then(() => {

js/src/admin/components/PermissionDropdown.js

@@ -32,109 +32,101 @@ function filterByRequiredPermissions(groupIds, permission) {
 }
 
 export default class PermissionDropdown extends Dropdown {
-  static initAttrs(attrs) {
+  static initProps(props) {
-    super.initAttrs(attrs);
+    super.initProps(props);
 
-    attrs.className = 'PermissionDropdown';
+    props.className = 'PermissionDropdown';
-    attrs.buttonClassName = 'Button Button--text';
+    props.buttonClassName = 'Button Button--text';
   }
 
-  view(vnode) {
+  view() {
-    const children = [];
+    this.props.children = [];
 
-    let groupIds = app.data.permissions[this.attrs.permission] || [];
+    let groupIds = app.data.permissions[this.props.permission] || [];
 
-    groupIds = filterByRequiredPermissions(groupIds, this.attrs.permission);
+    groupIds = filterByRequiredPermissions(groupIds, this.props.permission);
 
     const everyone = groupIds.indexOf(Group.GUEST_ID) !== -1;
     const members = groupIds.indexOf(Group.MEMBER_ID) !== -1;
     const adminGroup = app.store.getById('groups', Group.ADMINISTRATOR_ID);
 
     if (everyone) {
-      this.attrs.label = Badge.component({ icon: 'fas fa-globe' });
+      this.props.label = Badge.component({ icon: 'fas fa-globe' });
     } else if (members) {
-      this.attrs.label = Badge.component({ icon: 'fas fa-user' });
+      this.props.label = Badge.component({ icon: 'fas fa-user' });
     } else {
-      this.attrs.label = [badgeForId(Group.ADMINISTRATOR_ID), groupIds.map(badgeForId)];
+      this.props.label = [badgeForId(Group.ADMINISTRATOR_ID), groupIds.map(badgeForId)];
     }
 
     if (this.showing) {
-      if (this.attrs.allowGuest) {
+      if (this.props.allowGuest) {
-        children.push(
+        this.props.children.push(
-          Button.component(
+          Button.component({
-            {
+            children: [Badge.component({ icon: 'fas fa-globe' }), ' ', app.translator.trans('core.admin.permissions_controls.everyone_button')],
-              icon: everyone ? 'fas fa-check' : true,
+            icon: everyone ? 'fas fa-check' : true,
-              onclick: () => this.save([Group.GUEST_ID]),
+            onclick: () => this.save([Group.GUEST_ID]),
-              disabled: this.isGroupDisabled(Group.GUEST_ID),
+            disabled: this.isGroupDisabled(Group.GUEST_ID),
-            },
+          })
-            [Badge.component({ icon: 'fas fa-globe' }), ' ', app.translator.trans('core.admin.permissions_controls.everyone_button')]
-          )
         );
       }
 
-      children.push(
+      this.props.children.push(
-        Button.component(
+        Button.component({
-          {
+          children: [Badge.component({ icon: 'fas fa-user' }), ' ', app.translator.trans('core.admin.permissions_controls.members_button')],
-            icon: members ? 'fas fa-check' : true,
+          icon: members ? 'fas fa-check' : true,
-            onclick: () => this.save([Group.MEMBER_ID]),
+          onclick: () => this.save([Group.MEMBER_ID]),
-            disabled: this.isGroupDisabled(Group.MEMBER_ID),
+          disabled: this.isGroupDisabled(Group.MEMBER_ID),
-          },
+        }),
-          [Badge.component({ icon: 'fas fa-user' }), ' ', app.translator.trans('core.admin.permissions_controls.members_button')]
-        ),
 
         Separator.component(),
 
-        Button.component(
+        Button.component({
-          {
+          children: [badgeForId(adminGroup.id()), ' ', adminGroup.namePlural()],
-            icon: !everyone && !members ? 'fas fa-check' : true,
+          icon: !everyone && !members ? 'fas fa-check' : true,
-            disabled: !everyone && !members,
+          disabled: !everyone && !members,
-            onclick: (e) => {
+          onclick: (e) => {
-              if (e.shiftKey) e.stopPropagation();
+            if (e.shiftKey) e.stopPropagation();
-              this.save([]);
+            this.save([]);
-            },
           },
-          [badgeForId(adminGroup.id()), ' ', adminGroup.namePlural()]
+        })
-        )
       );
 
       [].push.apply(
-        children,
+        this.props.children,
         app.store
           .all('groups')
           .filter((group) => [Group.ADMINISTRATOR_ID, Group.GUEST_ID, Group.MEMBER_ID].indexOf(group.id()) === -1)
           .map((group) =>
-            Button.component(
+            Button.component({
-              {
+              children: [badgeForId(group.id()), ' ', group.namePlural()],
-                icon: groupIds.indexOf(group.id()) !== -1 ? 'fas fa-check' : true,
+              icon: groupIds.indexOf(group.id()) !== -1 ? 'fas fa-check' : true,
-                onclick: (e) => {
+              onclick: (e) => {
-                  if (e.shiftKey) e.stopPropagation();
+                if (e.shiftKey) e.stopPropagation();
-                  this.toggle(group.id());
+                this.toggle(group.id());
-                },
-                disabled: this.isGroupDisabled(group.id()) && this.isGroupDisabled(Group.MEMBER_ID) && this.isGroupDisabled(Group.GUEST_ID),
               },
-              [badgeForId(group.id()), ' ', group.namePlural()]
+              disabled: this.isGroupDisabled(group.id()) && this.isGroupDisabled(Group.MEMBER_ID) && this.isGroupDisabled(Group.GUEST_ID),
-            )
+            })
           )
       );
     }
 
-    return super.view({ ...vnode, children });
+    return super.view();
   }
 
   save(groupIds) {
-    const permission = this.attrs.permission;
+    const permission = this.props.permission;
 
     app.data.permissions[permission] = groupIds;
 
     app.request({
       method: 'POST',
       url: app.forum.attribute('apiUrl') + '/permission',
-      body: { permission, groupIds },
+      data: { permission, groupIds },
     });
   }
 
   toggle(groupId) {
-    const permission = this.attrs.permission;
+    const permission = this.props.permission;
 
     let groupIds = app.data.permissions[permission] || [];
 
@@ -151,6 +143,6 @@ export default class PermissionDropdown extends Dropdown {
   }
 
   isGroupDisabled(id) {
-    return filterByRequiredPermissions([id], this.attrs.permission).indexOf(id) === -1;
+    return filterByRequiredPermissions([id], this.props.permission).indexOf(id) === -1;
   }
 }

js/src/admin/components/PermissionGrid.js

@@ -6,9 +6,7 @@ import ItemList from '../../common/utils/ItemList';
 import icon from '../../common/helpers/icon';
 
 export default class PermissionGrid extends Component {
-  oninit(vnode) {
+  init() {
-    super.oninit(vnode);
-
     this.permissions = this.permissionItems().toArray();
   }
 

js/src/admin/components/PermissionsPage.js

@@ -15,7 +15,7 @@ export default class PermissionsPage extends Page {
               .all('groups')
               .filter((group) => [Group.GUEST_ID, Group.MEMBER_ID].indexOf(group.id()) === -1)
               .map((group) => (
-                <button className="Button Group" onclick={() => app.modal.show(EditGroupModal, { group })}>
+                <button className="Button Group" onclick={() => app.modal.show(new EditGroupModal({ group }))}>
                   {GroupBadge.component({
                     group,
                     className: 'Group-icon',
@@ -24,7 +24,7 @@ export default class PermissionsPage extends Page {
                   <span className="Group-name">{group.namePlural()}</span>
                 </button>
               ))}
-            <button className="Button Group Group--add" onclick={() => app.modal.show(EditGroupModal)}>
+            <button className="Button Group Group--add" onclick={() => app.modal.show(new EditGroupModal())}>
               {icon('fas fa-plus', { className: 'Group-icon' })}
               <span className="Group-name">{app.translator.trans('core.admin.permissions.new_group_button')}</span>
             </button>

js/src/admin/components/SessionDropdown.js

@@ -9,16 +9,18 @@ import ItemList from '../../common/utils/ItemList';
  * avatar/name, with a dropdown of session controls.
  */
 export default class SessionDropdown extends Dropdown {
-  static initAttrs(attrs) {
+  static initProps(props) {
-    super.initAttrs(attrs);
+    super.initProps(props);
 
-    attrs.className = 'SessionDropdown';
+    props.className = 'SessionDropdown';
-    attrs.buttonClassName = 'Button Button--user Button--flat';
+    props.buttonClassName = 'Button Button--user Button--flat';
-    attrs.menuClassName = 'Dropdown-menu--right';
+    props.menuClassName = 'Dropdown-menu--right';
   }
 
-  view(vnode) {
+  view() {
-    return super.view({ ...vnode, children: this.items().toArray() });
+    this.props.children = this.items().toArray();
+
+    return super.view();
   }
 
   getButtonContent() {
@@ -37,13 +39,11 @@ export default class SessionDropdown extends Dropdown {
 
     items.add(
       'logOut',
-      Button.component(
+      Button.component({
-        {
+        icon: 'fas fa-sign-out-alt',
-          icon: 'fas fa-sign-out-alt',
+        children: app.translator.trans('core.admin.header.log_out_button'),
-          onclick: app.session.logout.bind(app.session),
+        onclick: app.session.logout.bind(app.session),
-        },
+      }),
-        app.translator.trans('core.admin.header.log_out_button')
-      ),
       -100
     );
 

js/src/admin/components/SettingDropdown.js

@@ -3,30 +3,23 @@ import Button from '../../common/components/Button';
 import saveSettings from '../utils/saveSettings';
 
 export default class SettingDropdown extends SelectDropdown {
-  static initAttrs(attrs) {
+  static initProps(props) {
-    super.initAttrs(attrs);
+    super.initProps(props);
 
-    attrs.className = 'SettingDropdown';
+    props.className = 'SettingDropdown';
-    attrs.buttonClassName = 'Button Button--text';
+    props.buttonClassName = 'Button Button--text';
-    attrs.caretIcon = 'fas fa-caret-down';
+    props.caretIcon = 'fas fa-caret-down';
-    attrs.defaultLabel = 'Custom';
+    props.defaultLabel = 'Custom';
-  }
 
-  view(vnode) {
+    props.children = props.options.map(({ value, label }) => {
-    return super.view({
+      const active = app.data.settings[props.key] === value;
-      ...vnode,
-      children: this.attrs.options.map(({ value, label }) => {
-        const active = app.data.settings[this.attrs.key] === value;
 
-        return Button.component(
+      return Button.component({
-          {
+        children: label,
-            icon: active ? 'fas fa-check' : true,
+        icon: active ? 'fas fa-check' : true,
-            onclick: saveSettings.bind(this, { [this.attrs.key]: value }),
+        onclick: saveSettings.bind(this, { [props.key]: value }),
-            active,
+        active,
-          },
+      });
-          label
-        );
-      }),
     });
   }
 }

js/src/admin/components/SettingsModal.js

@@ -1,12 +1,9 @@
 import Modal from '../../common/components/Modal';
 import Button from '../../common/components/Button';
-import Stream from '../../common/utils/Stream';
 import saveSettings from '../utils/saveSettings';
 
 export default class SettingsModal extends Modal {
-  oninit(vnode) {
+  init() {
-    super.oninit(vnode);
-
     this.settings = {};
     this.loading = false;
   }
@@ -36,7 +33,7 @@ export default class SettingsModal extends Modal {
   }
 
   setting(key, fallback = '') {
-    this.settings[key] = this.settings[key] || Stream(app.data.settings[key] || fallback);
+    this.settings[key] = this.settings[key] || m.prop(app.data.settings[key] || fallback);
 
     return this.settings[key];
   }

js/src/admin/components/StatusWidget.js

@@ -46,7 +46,7 @@ export default class StatusWidget extends DashboardWidget {
   }
 
   handleClearCache(e) {
-    app.modal.show(LoadingModal);
+    app.modal.show(new LoadingModal());
 
     app
       .request({

js/src/admin/components/UploadImageButton.js

@@ -1,28 +1,32 @@
 import Button from '../../common/components/Button';
 
 export default class UploadImageButton extends Button {
-  loading = false;
+  init() {
+    this.loading = false;
+  }
 
-  view(vnode) {
+  view() {
-    this.attrs.loading = this.loading;
+    this.props.loading = this.loading;
-    this.attrs.className = (this.attrs.className || '') + ' Button';
+    this.props.className = (this.props.className || '') + ' Button';
 
-    if (app.data.settings[this.attrs.name + '_path']) {
+    if (app.data.settings[this.props.name + '_path']) {
-      this.attrs.onclick = this.remove.bind(this);
+      this.props.onclick = this.remove.bind(this);
+      this.props.children = app.translator.trans('core.admin.upload_image.remove_button');
 
       return (
         <div>
           <p>
-            <img src={app.forum.attribute(this.attrs.name + 'Url')} alt="" />
+            <img src={app.forum.attribute(this.props.name + 'Url')} alt="" />
           </p>
-          <p>{super.view({ ...vnode, children: app.translator.trans('core.admin.upload_image.remove_button') })}</p>
+          <p>{super.view()}</p>
         </div>
       );
     } else {
-      this.attrs.onclick = this.upload.bind(this);
+      this.props.onclick = this.upload.bind(this);
+      this.props.children = app.translator.trans('core.admin.upload_image.upload_button');
     }
 
-    return super.view({ ...vnode, children: app.translator.trans('core.admin.upload_image.upload_button') });
+    return super.view();
   }
 
   /**
@@ -38,8 +42,8 @@ export default class UploadImageButton extends Button {
       .hide()
       .click()
       .on('change', (e) => {
-        const body = new FormData();
+        const data = new FormData();
-        body.append(this.attrs.name, $(e.target)[0].files[0]);
+        data.append(this.props.name, $(e.target)[0].files[0]);
 
         this.loading = true;
         m.redraw();
@@ -49,7 +53,7 @@ export default class UploadImageButton extends Button {
             method: 'POST',
             url: this.resourceUrl(),
             serialize: (raw) => raw,
-            body,
+            data,
           })
           .then(this.success.bind(this), this.failure.bind(this));
       });
@@ -71,7 +75,7 @@ export default class UploadImageButton extends Button {
   }
 
   resourceUrl() {
-    return app.forum.attribute('apiUrl') + '/' + this.attrs.name;
+    return app.forum.attribute('apiUrl') + '/' + this.props.name;
   }
 
   /**

js/src/admin/routes.js

@@ -12,11 +12,11 @@ import MailPage from './components/MailPage';
  */
 export default function (app) {
   app.routes = {
-    dashboard: { path: '/', component: DashboardPage },
+    dashboard: { path: '/', component: DashboardPage.component() },
-    basics: { path: '/basics', component: BasicsPage },
+    basics: { path: '/basics', component: BasicsPage.component() },
-    permissions: { path: '/permissions', component: PermissionsPage },
+    permissions: { path: '/permissions', component: PermissionsPage.component() },
-    appearance: { path: '/appearance', component: AppearancePage },
+    appearance: { path: '/appearance', component: AppearancePage.component() },
-    extensions: { path: '/extensions', component: ExtensionsPage },
+    extensions: { path: '/extensions', component: ExtensionsPage.component() },
-    mail: { path: '/mail', component: MailPage },
+    mail: { path: '/mail', component: MailPage.component() },
   };
 }

js/src/admin/utils/saveSettings.js

@@ -7,7 +7,7 @@ export default function saveSettings(settings) {
     .request({
       method: 'POST',
       url: app.forum.attribute('apiUrl') + '/settings',
-      body: settings,
+      data: settings,
     })
     .catch((error) => {
       app.data.settings = oldSettings;

js/src/common/Application.js

@@ -1,4 +1,5 @@
 import ItemList from './utils/ItemList';
+import Alert from './components/Alert';
 import Button from './components/Button';
 import ModalManager from './components/ModalManager';
 import AlertManager from './components/AlertManager';
@@ -22,8 +23,6 @@ import Group from './models/Group';
 import Notification from './models/Notification';
 import { flattenDeep } from 'lodash-es';
 import PageState from './states/PageState';
-import ModalManagerState from './states/ModalManagerState';
-import AlertManagerState from './states/AlertManagerState';
 
 /**
  * The `App` class provides a container for an application, as well as various
@@ -110,13 +109,13 @@ export default class Application {
   booted = false;
 
   /**
-   * The key for an Alert that was shown as a result of an AJAX request error.
+   * An Alert that was shown as a result of an AJAX request error. If present,
-   * If present, it will be dismissed on the next successful request.
+   * it will be dismissed on the next successful request.
    *
-   * @type {int}
+   * @type {null|Alert}
    * @private
    */
-  requestErrorAlert = null;
+  requestError = null;
 
   /**
    * The page the app is currently on.
@@ -140,20 +139,6 @@ export default class Application {
    */
   previous = new PageState(null);
 
-  /*
-   * An object that manages modal state.
-   *
-   * @type {ModalManagerState}
-   */
-  modal = new ModalManagerState();
-
-  /**
-   * An object that manages the state of active alerts.
-   *
-   * @type {AlertManagerState}
-   */
-  alerts = new AlertManagerState();
-
   data;
 
   title = '';
@@ -189,9 +174,8 @@ export default class Application {
   }
 
   mount(basePath = '') {
-    // An object with a callable view property is used in order to pass arguments to the component; see https://mithril.js.org/mount.html
+    this.modal = m.mount(document.getElementById('modal'), <ModalManager />);
-    m.mount(document.getElementById('modal'), { view: () => ModalManager.component({ state: this.modal }) });
+    this.alerts = m.mount(document.getElementById('alerts'), <AlertManager />);
-    m.mount(document.getElementById('alerts'), { view: () => AlertManager.component({ state: this.alerts }) });
 
     this.drawer = new Drawer();
 
@@ -231,16 +215,6 @@ export default class Application {
     return null;
   }
 
-  /**
-   * Determine the current screen mode, based on our media queries.
-   *
-   * @returns {String} - one of "phone", "tablet", "desktop" or "desktop-hd"
-   */
-  screen() {
-    const styles = getComputedStyle(document.documentElement);
-    return styles.getPropertyValue('--flarum-screen');
-  }
-
   /**
    * Set the <title> of the page.
    *
@@ -263,16 +237,13 @@ export default class Application {
   }
 
   updateTitle() {
-    const count = this.titleCount ? `(${this.titleCount}) ` : '';
+    document.title = (this.titleCount ? `(${this.titleCount}) ` : '') + (this.title ? this.title + ' - ' : '') + this.forum.attribute('title');
-    const pageTitleWithSeparator = this.title && m.route.get() !== '/' ? this.title + ' - ' : '';
-    const title = this.forum.attribute('title');
-    document.title = count + pageTitleWithSeparator + title;
   }
 
   /**
    * Make an AJAX request, handling any low-level errors that may occur.
    *
-   * @see https://mithril.js.org/request.html
+   * @see https://lhorie.github.io/mithril/mithril.request.html
    * @param {Object} options
    * @return {Promise}
    * @public
@@ -339,18 +310,22 @@ export default class Application {
       }
     };
 
-    if (this.requestErrorAlert) this.alerts.dismiss(this.requestErrorAlert);
+    if (this.requestError) this.alerts.dismiss(this.requestError.alert);
 
     // Now make the request. If it's a failure, inspect the error that was
     // returned and show an alert containing its contents.
-    return m.request(options).then(
+    const deferred = m.deferred();
-      (response) => response,
+
+    m.request(options).then(
+      (response) => deferred.resolve(response),
       (error) => {
-        let content;
+        this.requestError = error;
+
+        let children;
 
         switch (error.status) {
           case 422:
-            content = error.response.errors
+            children = error.response.errors
               .map((error) => [error.detail, <br />])
               .reduce((a, b) => a.concat(b), [])
               .slice(0, -1);
@@ -358,37 +333,36 @@ export default class Application {
 
           case 401:
           case 403:
-            content = app.translator.trans('core.lib.error.permission_denied_message');
+            children = app.translator.trans('core.lib.error.permission_denied_message');
             break;
 
           case 404:
           case 410:
-            content = app.translator.trans('core.lib.error.not_found_message');
+            children = app.translator.trans('core.lib.error.not_found_message');
             break;
 
           case 429:
-            content = app.translator.trans('core.lib.error.rate_limit_exceeded_message');
+            children = app.translator.trans('core.lib.error.rate_limit_exceeded_message');
             break;
 
           default:
-            content = app.translator.trans('core.lib.error.generic_message');
+            children = app.translator.trans('core.lib.error.generic_message');
         }
 
         const isDebug = app.forum.attribute('debug');
         // contains a formatted errors if possible, response must be an JSON API array of errors
         // the details property is decoded to transform escaped characters such as '\n'
-        const errors = error.response && error.response.errors;
+        const formattedError = error.response && Array.isArray(error.response.errors) && error.response.errors.map((e) => decodeURI(e.detail));
-        const formattedError = Array.isArray(errors) && errors[0] && errors[0].detail && errors.map((e) => decodeURI(e.detail));
 
-        error.alert = {
+        error.alert = new Alert({
           type: 'error',
-          content,
+          children,
           controls: isDebug && [
             <Button className="Button Button--link" onclick={this.showDebug.bind(this, error, formattedError)}>
               Debug
             </Button>,
           ],
-        };
+        });
 
         try {
           options.errorHandler(error);
@@ -404,12 +378,14 @@ export default class Application {
             console.groupEnd();
           }
 
-          this.requestErrorAlert = this.alerts.show(error.alert, error.alert.content);
+          this.alerts.show(error.alert);
         }
 
-        return Promise.reject(error);
+        deferred.reject(error);
       }
     );
+
+    return deferred.promise;
   }
 
   /**
@@ -418,9 +394,9 @@ export default class Application {
    * @private
    */
   showDebug(error, formattedError) {
-    this.alerts.dismiss(this.requestErrorAlert);
+    this.alerts.dismiss(this.requestError.alert);
 
-    this.modal.show(RequestErrorModal, { error, formattedError });
+    this.modal.show(new RequestErrorModal({ error, formattedError }));
   }
 
   /**
@@ -432,19 +408,9 @@ export default class Application {
    * @public
    */
   route(name, params = {}) {
-    const route = this.routes[name];
+    const url = this.routes[name].path.replace(/:([^\/]+)/g, (m, key) => extract(params, key));
-
+    const queryString = m.route.buildQueryString(params);
-    if (!route) throw new Error(`Route '${name}' does not exist`);
+    const prefix = m.route.mode === 'pathname' ? app.forum.attribute('basePath') : '';
-
-    const url = route.path.replace(/:([^\/]+)/g, (m, key) => extract(params, key));
-
-    // Remove falsy values in params to avoid having urls like '/?sort&q'
-    for (const key in params) {
-      if (params.hasOwnProperty(key) && !params[key]) delete params[key];
-    }
-
-    const queryString = m.buildQueryString(params);
-    const prefix = m.route.prefix === '' ? this.forum.attribute('basePath') : '';
 
     return prefix + url + (queryString ? '?' + queryString : '');
   }

js/src/common/Component.js

@@ -0,0 +1,221 @@
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * The `Component` class defines a user interface 'building block'. A component
+ * can generate a virtual DOM to be rendered on each redraw.
+ *
+ * An instance's virtual DOM can be retrieved directly using the {@link
+ * Component#render} method.
+ *
+ * @example
+ * this.myComponentInstance = new MyComponent({foo: 'bar'});
+ * return m('div', this.myComponentInstance.render());
+ *
+ * Alternatively, components can be nested, letting Mithril take care of
+ * instance persistence. For this, the static {@link Component.component} method
+ * can be used.
+ *
+ * @example
+ * return m('div', MyComponent.component({foo: 'bar'));
+ *
+ * @see https://lhorie.github.io/mithril/mithril.component.html
+ * @abstract
+ */
+export default class Component {
+  /**
+   * @param {Object} props
+   * @param {Array|Object} children
+   * @public
+   */
+  constructor(props = {}, children = null) {
+    if (children) props.children = children;
+
+    this.constructor.initProps(props);
+
+    /**
+     * The properties passed into the component.
+     *
+     * @type {Object}
+     */
+    this.props = props;
+
+    /**
+     * The root DOM element for the component.
+     *
+     * @type DOMElement
+     * @public
+     */
+    this.element = null;
+
+    /**
+     * Whether or not to retain the component's subtree on redraw.
+     *
+     * @type {boolean}
+     * @public
+     */
+    this.retain = false;
+
+    this.init();
+  }
+
+  /**
+   * Called when the component is constructed.
+   *
+   * @protected
+   */
+  init() {}
+
+  /**
+   * Called when the component is destroyed, i.e. after a redraw where it is no
+   * longer a part of the view.
+   *
+   * @see https://lhorie.github.io/mithril/mithril.component.html#unloading-components
+   * @param {Object} e
+   * @public
+   */
+  onunload() {}
+
+  /**
+   * Get the renderable virtual DOM that represents the component's view.
+   *
+   * This should NOT be overridden by subclasses. Subclasses wishing to define
+   * their virtual DOM should override Component#view instead.
+   *
+   * @example
+   * this.myComponentInstance = new MyComponent({foo: 'bar'});
+   * return m('div', this.myComponentInstance.render());
+   *
+   * @returns {Object}
+   * @final
+   * @public
+   */
+  render() {
+    const vdom = this.retain ? { subtree: 'retain' } : this.view();
+
+    // Override the root element's config attribute with our own function, which
+    // will set the component instance's element property to the root DOM
+    // element, and then run the component class' config method.
+    vdom.attrs = vdom.attrs || {};
+
+    const originalConfig = vdom.attrs.config;
+
+    vdom.attrs.config = (...args) => {
+      this.element = args[0];
+      this.config.apply(this, args.slice(1));
+      if (originalConfig) originalConfig.apply(this, args);
+    };
+
+    return vdom;
+  }
+
+  /**
+   * Returns a jQuery object for this component's element. If you pass in a
+   * selector string, this method will return a jQuery object, using the current
+   * element as its buffer.
+   *
+   * For example, calling `component.$('li')` will return a jQuery object
+   * containing all of the `li` elements inside the DOM element of this
+   * component.
+   *
+   * @param {String} [selector] a jQuery-compatible selector string
+   * @returns {jQuery} the jQuery object for the DOM node
+   * @final
+   * @public
+   */
+  $(selector) {
+    const $element = $(this.element);
+
+    return selector ? $element.find(selector) : $element;
+  }
+
+  /**
+   * Called after the component's root element is redrawn. This hook can be used
+   * to perform any actions on the DOM, both on the initial draw and any
+   * subsequent redraws. See Mithril's documentation for more information.
+   *
+   * @see https://lhorie.github.io/mithril/mithril.html#the-config-attribute
+   * @param {Boolean} isInitialized
+   * @param {Object} context
+   * @param {Object} vdom
+   * @public
+   */
+  config() {}
+
+  /**
+   * Get the virtual DOM that represents the component's view.
+   *
+   * @return {Object} The virtual DOM
+   * @protected
+   */
+  view() {
+    throw new Error('Component#view must be implemented by subclass');
+  }
+
+  /**
+   * Get a Mithril component object for this component, preloaded with props.
+   *
+   * @see https://lhorie.github.io/mithril/mithril.component.html
+   * @param {Object} [props] Properties to set on the component
+   * @param children
+   * @return {Object} The Mithril component object
+   * @property {function} controller
+   * @property {function} view
+   * @property {Object} component The class of this component
+   * @property {Object} props The props that were passed to the component
+   * @public
+   */
+  static component(props = {}, children = null) {
+    const componentProps = Object.assign({}, props);
+
+    if (children) componentProps.children = children;
+
+    this.initProps(componentProps);
+
+    // Set up a function for Mithril to get the component's view. It will accept
+    // the component's controller (which happens to be the component itself, in
+    // our case), update its props with the ones supplied, and then render the view.
+    const view = (component) => {
+      component.props = componentProps;
+      return component.render();
+    };
+
+    // Mithril uses this property on the view function to cache component
+    // controllers between redraws, thus persisting component state.
+    view.$original = this.prototype.view;
+
+    // Our output object consists of a controller constructor + a view function
+    // which Mithril will use to instantiate and render the component. We also
+    // attach a reference to the props that were passed through and the
+    // component's class for reference.
+    const output = {
+      controller: this.bind(undefined, componentProps),
+      view: view,
+      props: componentProps,
+      component: this,
+    };
+
+    // If a `key` prop was set, then we'll assume that we want that to actually
+    // show up as an attribute on the component object so that Mithril's key
+    // algorithm can be applied.
+    if (componentProps.key) {
+      output.attrs = { key: componentProps.key };
+    }
+
+    return output;
+  }
+
+  /**
+   * Initialize the component's props.
+   *
+   * @param {Object} props
+   * @public
+   */
+  static initProps(props) {}
+}

js/src/common/Component.ts

@@ -1,168 +0,0 @@
-import * as Mithril from 'mithril';
-
-let deprecatedPropsWarned = false;
-let deprecatedInitPropsWarned = false;
-
-export interface ComponentAttrs extends Mithril.Attributes {}
-
-/**
- * The `Component` class defines a user interface 'building block'. A component
- * generates a virtual DOM to be rendered on each redraw.
- *
- * Essentially, this is a wrapper for Mithril's components that adds several useful features:
- *
- *  - In the `oninit` and `onbeforeupdate` lifecycle hooks, we store vnode attrs in `this.attrs.
- *    This allows us to use attrs across components without having to pass the vnode to every single
- *    method.
- *  - The static `initAttrs` method allows a convenient way to provide defaults (or to otherwise modify)
- *    the attrs that have been passed into a component.
- *  - When the component is created in the DOM, we store its DOM element under `this.element`; this lets
- *    us use jQuery to modify child DOM state from internal methods via the `this.$()` method.
- *  - A convenience `component` method, which serves as an alternative to hyperscript and JSX.
- *
- * As with other Mithril components, components extending Component can be initialized
- * and nested using JSX, hyperscript, or a combination of both. The `component` method can also
- * be used.
- *
- * @example
- * return m('div', <MyComponent foo="bar"><p>Hello World</p></MyComponent>);
- *
- * @example
- * return m('div', MyComponent.component({foo: 'bar'), m('p', 'Hello World!'));
- *
- * @see https://mithril.js.org/components.html
- */
-export default abstract class Component<T extends ComponentAttrs = ComponentAttrs> implements Mithril.ClassComponent<T> {
-  /**
-   * The root DOM element for the component.
-   */
-  protected element!: Element;
-
-  /**
-   * The attributes passed into the component.
-   *
-   * @see https://mithril.js.org/components.html#passing-data-to-components
-   */
-  protected attrs!: T;
-
-  /**
-   * @inheritdoc
-   */
-  abstract view(vnode: Mithril.Vnode<T, this>): Mithril.Children;
-
-  /**
-   * @inheritdoc
-   */
-  oninit(vnode: Mithril.Vnode<T, this>) {
-    this.setAttrs(vnode.attrs);
-  }
-
-  /**
-   * @inheritdoc
-   */
-  oncreate(vnode: Mithril.VnodeDOM<T, this>) {
-    this.element = vnode.dom;
-  }
-
-  /**
-   * @inheritdoc
-   */
-  onbeforeupdate(vnode: Mithril.VnodeDOM<T, this>) {
-    this.setAttrs(vnode.attrs);
-  }
-
-  /**
-   * Returns a jQuery object for this component's element. If you pass in a
-   * selector string, this method will return a jQuery object, using the current
-   * element as its buffer.
-   *
-   * For example, calling `component.$('li')` will return a jQuery object
-   * containing all of the `li` elements inside the DOM element of this
-   * component.
-   *
-   * @param {String} [selector] a jQuery-compatible selector string
-   * @returns {jQuery} the jQuery object for the DOM node
-   * @final
-   */
-  protected $(selector) {
-    const $element = $(this.element);
-
-    return selector ? $element.find(selector) : $element;
-  }
-
-  /**
-   * Convenience method to attach a component without JSX.
-   * Has the same effect as calling `m(THIS_CLASS, attrs, children)`.
-   *
-   * @see https://mithril.js.org/hyperscript.html#mselector,-attributes,-children
-   */
-  static component(attrs = {}, children = null): Mithril.Vnode {
-    const componentAttrs = Object.assign({}, attrs);
-
-    return m(this as any, componentAttrs, children);
-  }
-
-  /**
-   * Saves a reference to the vnode attrs after running them through initAttrs,
-   * and checking for common issues.
-   */
-  private setAttrs(attrs: T = {} as T): void {
-    (this.constructor as typeof Component).initAttrs(attrs);
-
-    if (attrs) {
-      if ('children' in attrs) {
-        throw new Error(
-          `[${
-            (this.constructor as any).name
-          }] The "children" attribute of attrs should never be used. Either pass children in as the vnode children or rename the attribute`
-        );
-      }
-
-      if ('tag' in attrs) {
-        throw new Error(`[${(this.constructor as any).name}] You cannot use the "tag" attribute name with Mithril 2.`);
-      }
-    }
-
-    this.attrs = attrs;
-  }
-
-  /**
-   * Initialize the component's attrs.
-   *
-   * This can be used to assign default values for missing, optional attrs.
-   */
-  protected static initAttrs<T>(attrs: T): void {
-    // Deprecated, part of Mithril 2 BC layer
-    if ('initProps' in this && !deprecatedInitPropsWarned) {
-      deprecatedInitPropsWarned = true;
-      console.warn('initProps is deprecated, please use initAttrs instead.');
-      (this as any).initProps(attrs);
-    }
-  }
-
-  // BEGIN DEPRECATED MITHRIL 2 BC LAYER
-
-  /**
-   * The attributes passed into the component.
-   *
-   * @see https://mithril.js.org/components.html#passing-data-to-components
-   *
-   * @deprecated, use attrs instead.
-   */
-  get props() {
-    if (!deprecatedPropsWarned) {
-      deprecatedPropsWarned = true;
-      console.warn('this.props is deprecated, please use this.attrs instead.');
-    }
-    return this.attrs;
-  }
-  set props(props) {
-    if (!deprecatedPropsWarned) {
-      deprecatedPropsWarned = true;
-      console.warn('this.props is deprecated, please use this.attrs instead.');
-    }
-    this.attrs = props;
-  }
-
-  // END DEPRECATED MITHRIL 2 BC LAYER
-}

js/src/common/Fragment.ts

@@ -1,74 +0,0 @@
-import * as Mithril from 'mithril';
-
-/**
- * The `Fragment` class represents a chunk of DOM that is rendered once with Mithril and then takes
- * over control of its own DOM and lifecycle.
- *
- * This is very similar to the `Component` wrapper class, but is used for more fine-grained control over
- * the rendering and display of some significant chunks of the DOM. In contrast to components, fragments
- * do not offer Mithril's lifecycle hooks.
- *
- * Use this when you want to enjoy the benefits of JSX / VDOM for initial rendering, combined with
- * small helper methods that then make updates to that DOM directly, instead of fully redrawing
- * everything through Mithril.
- *
- * This should only be used when necessary, and only with `m.render`. If you are unsure whether you need
- * this or `Component, you probably need `Component`.
- */
-export default abstract class Fragment {
-  /**
-   * The root DOM element for the fragment.
-   */
-  protected element!: Element;
-
-  /**
-   * Returns a jQuery object for this fragment's element. If you pass in a
-   * selector string, this method will return a jQuery object, using the current
-   * element as its buffer.
-   *
-   * For example, calling `fragment.$('li')` will return a jQuery object
-   * containing all of the `li` elements inside the DOM element of this
-   * fragment.
-   *
-   * @param {String} [selector] a jQuery-compatible selector string
-   * @returns {jQuery} the jQuery object for the DOM node
-   * @final
-   */
-  public $(selector) {
-    const $element = $(this.element);
-
-    return selector ? $element.find(selector) : $element;
-  }
-
-  /**
-   * Get the renderable virtual DOM that represents the fragment's view.
-   *
-   * This should NOT be overridden by subclasses. Subclasses wishing to define
-   * their virtual DOM should override Fragment#view instead.
-   *
-   * @example
-   * const fragment = new MyFragment();
-   * m.render(document.body, fragment.render());
-   *
-   * @final
-   */
-  public render(): Mithril.Vnode<Mithril.Attributes, this> {
-    const vdom = this.view();
-
-    vdom.attrs = vdom.attrs || {};
-
-    const originalOnCreate = vdom.attrs.oncreate;
-
-    vdom.attrs.oncreate = (vnode) => {
-      this.element = vnode.dom;
-      if (originalOnCreate) originalOnCreate.apply(this, [vnode]);
-    };
-
-    return vdom;
-  }
-
-  /**
-   * Creates a view out of virtual elements.
-   */
-  abstract view(): Mithril.Vnode<Mithril.Attributes, this>;
-}

js/src/common/Model.js

@@ -161,7 +161,7 @@ export default class Model {
           {
             method: this.exists ? 'PATCH' : 'POST',
             url: app.forum.attribute('apiUrl') + this.apiEndpoint(),
-            body: request,
+            data: request,
           },
           options
         )
@@ -180,7 +180,7 @@ export default class Model {
         // old data! We'll revert to that and let others handle the error.
         (response) => {
           this.pushData(oldData);
-          m.redraw();
+          m.lazyRedraw();
           throw response;
         }
       );
@@ -189,13 +189,13 @@ export default class Model {
   /**
    * Send a request to delete the resource.
    *
-   * @param {Object} body Data to send along with the DELETE request.
+   * @param {Object} data Data to send along with the DELETE request.
    * @param {Object} [options]
    * @return {Promise}
    * @public
    */
-  delete(body, options = {}) {
+  delete(data, options = {}) {
-    if (!this.exists) return Promise.resolve();
+    if (!this.exists) return m.deferred().resolve().promise;
 
     return app
       .request(
@@ -203,7 +203,7 @@ export default class Model {
           {
             method: 'DELETE',
             url: app.forum.attribute('apiUrl') + this.apiEndpoint(),
-            body,
+            data,
           },
           options
         )

js/src/common/Session.js

@@ -30,13 +30,13 @@ export default class Session {
    * @return {Promise}
    * @public
    */
-  login(body, options = {}) {
+  login(data, options = {}) {
     return app.request(
       Object.assign(
         {
           method: 'POST',
-          url: `${app.forum.attribute('baseUrl')}/login`,
+          url: app.forum.attribute('baseUrl') + '/login',
-          body,
+          data,
         },
         options
       )
@@ -49,6 +49,6 @@ export default class Session {
    * @public
    */
   logout() {
-    window.location = `${app.forum.attribute('baseUrl')}/logout?token=${this.csrfToken}`;
+    window.location = app.forum.attribute('baseUrl') + '/logout?token=' + this.csrfToken;
   }
 }

js/src/common/Store.js

@@ -82,13 +82,13 @@ export default class Store {
    * @public
    */
   find(type, id, query = {}, options = {}) {
-    let params = query;
+    let data = query;
     let url = app.forum.attribute('apiUrl') + '/' + type;
 
     if (id instanceof Array) {
       url += '?filter[id]=' + id.join(',');
     } else if (typeof id === 'object') {
-      params = id;
+      data = id;
     } else if (id) {
       url += '/' + id;
     }
@@ -99,7 +99,7 @@ export default class Store {
           {
             method: 'GET',
             url,
-            params,
+            data,
           },
           options
         )

js/src/common/Translator.js

@@ -1,3 +1,4 @@
+import User from './models/User';
 import username from './helpers/username';
 import extract from './utils/extract';
 
@@ -70,34 +71,18 @@ export default class Translator {
       const match = part.match(new RegExp('{([a-z0-9_]+)}|<(/?)([a-z0-9_]+)>', 'i'));
 
       if (match) {
-        // Either an opening or closing tag.
         if (match[1]) {
           open[0].push(input[match[1]]);
         } else if (match[3]) {
           if (match[2]) {
-            // Closing tag. We start by removing all raw children (generally in the form of strings) from the temporary
-            // holding array, then run them through m.fragment to convert them to vnodes. Usually this will just give us a
-            // text vnode, but using m.fragment as opposed to an explicit conversion should be more flexible. This is necessary because
-            // otherwise, our generated vnode will have raw strings as its children, and mithril expects vnodes.
-            // Finally, we add the now-processed vnodes back onto the holding array (which is the same object in memory as the
-            // children array of the vnode we are currently processing), and remove the reference to the holding array so that
-            // further text will be added to the full set of returned elements.
-            const rawChildren = open[0].splice(0, open[0].length);
-            open[0].push(...m.fragment(rawChildren).children);
             open.shift();
           } else {
-            // If a vnode with a matching tag was provided in the translator input, we use that. Otherwise, we create a new vnode
-            // with this tag, and an empty children array (since we're expecting to insert children, as that's the point of having this in translator)
             let tag = input[match[3]] || { tag: match[3], children: [] };
             open[0].push(tag);
-            // Insert the tag's children array as the first element of open, so that text in between the opening
-            // and closing tags will be added to the tag's children, not to the full set of returned elements.
             open.unshift(tag.children || tag);
           }
         }
       } else {
-        // Not an html tag, we add it to open[0], which is either the full set of returned elements (vnodes and text),
-        // or if an html tag is currently being processed, the children attribute of that html tag's vnode.
         open[0].push(part);
       }
     });

js/src/common/compat.js

@@ -12,19 +12,15 @@ import anchorScroll from './utils/anchorScroll';
 import RequestError from './utils/RequestError';
 import abbreviateNumber from './utils/abbreviateNumber';
 import * as string from './utils/string';
-import Stream from './utils/Stream';
 import SubtreeRetainer from './utils/SubtreeRetainer';
-import setRouteWithForcedRefresh from './utils/setRouteWithForcedRefresh';
 import extract from './utils/extract';
 import ScrollListener from './utils/ScrollListener';
 import stringToColor from './utils/stringToColor';
-import subclassOf from './utils/subclassOf';
 import patchMithril from './utils/patchMithril';
 import classList from './utils/classList';
 import extractText from './utils/extractText';
 import formatNumber from './utils/formatNumber';
 import mapRoutes from './utils/mapRoutes';
-import withAttr from './utils/withAttr';
 import Notification from './models/Notification';
 import User from './models/User';
 import Post from './models/Post';
@@ -47,7 +43,6 @@ import FieldSet from './components/FieldSet';
 import Select from './components/Select';
 import Navigation from './components/Navigation';
 import Alert from './components/Alert';
-import Link from './components/Link';
 import LinkButton from './components/LinkButton';
 import Checkbox from './components/Checkbox';
 import SelectDropdown from './components/SelectDropdown';
@@ -66,7 +61,6 @@ import highlight from './helpers/highlight';
 import username from './helpers/username';
 import userOnline from './helpers/userOnline';
 import listItems from './helpers/listItems';
-import Fragment from './Fragment';
 
 export default {
   extend: extend,
@@ -87,15 +81,11 @@ export default {
   'utils/extract': extract,
   'utils/ScrollListener': ScrollListener,
   'utils/stringToColor': stringToColor,
-  'utils/Stream': Stream,
-  'utils/subclassOf': subclassOf,
-  'utils/setRouteWithForcedRefresh': setRouteWithForcedRefresh,
   'utils/patchMithril': patchMithril,
   'utils/classList': classList,
   'utils/extractText': extractText,
   'utils/formatNumber': formatNumber,
   'utils/mapRoutes': mapRoutes,
-  'utils/withAttr': withAttr,
   'models/Notification': Notification,
   'models/User': User,
   'models/Post': Post,
@@ -103,7 +93,6 @@ export default {
   'models/Group': Group,
   'models/Forum': Forum,
   Component: Component,
-  Fragment: Fragment,
   Translator: Translator,
   'components/AlertManager': AlertManager,
   'components/Page': Page,
@@ -119,7 +108,6 @@ export default {
   'components/Select': Select,
   'components/Navigation': Navigation,
   'components/Alert': Alert,
-  'components/Link': Link,
   'components/LinkButton': LinkButton,
   'components/Checkbox': Checkbox,
   'components/SelectDropdown': SelectDropdown,

js/src/common/components/Alert.js

@@ -1,33 +1,31 @@
-import Component, { ComponentAttrs } from '../Component';
+import Component from '../Component';
 import Button from './Button';
 import listItems from '../helpers/listItems';
 import extract from '../utils/extract';
-import Mithril from 'mithril';
-
-export interface AlertAttrs extends ComponentAttrs {
-  /** The type of alert this is. Will be used to give the alert a class name of `Alert--{type}`. */
-  type?: string;
-  /** An array of controls to show in the alert. */
-  controls?: Mithril.Children;
-  /** Whether or not the alert can be dismissed. */
-  dismissible?: boolean;
-  /** A callback to run when the alert is dismissed */
-  ondismiss?: Function;
-}
 
 /**
  * The `Alert` component represents an alert box, which contains a message,
  * some controls, and may be dismissible.
+ *
+ * The alert may have the following special props:
+ *
+ * - `type` The type of alert this is. Will be used to give the alert a class
+ *   name of `Alert--{type}`.
+ * - `controls` An array of controls to show in the alert.
+ * - `dismissible` Whether or not the alert can be dismissed.
+ * - `ondismiss` A callback to run when the alert is dismissed.
+ *
+ * All other props will be assigned as attributes on the alert element.
  */
-export default class Alert<T extends AlertAttrs = AlertAttrs> extends Component<T> {
+export default class Alert extends Component {
-  view(vnode: Mithril.Vnode) {
+  view() {
-    const attrs = Object.assign({}, this.attrs);
+    const attrs = Object.assign({}, this.props);
 
     const type = extract(attrs, 'type');
     attrs.className = 'Alert Alert--' + type + ' ' + (attrs.className || '');
 
-    const content = extract(attrs, 'content') || vnode.children;
+    const children = extract(attrs, 'children');
-    const controls = (extract(attrs, 'controls') || []) as Mithril.ChildArray;
+    const controls = extract(attrs, 'controls') || [];
 
     // If the alert is meant to be dismissible (which is the case by default),
     // then we will create a dismiss button to append as the final control in
@@ -42,7 +40,7 @@ export default class Alert<T extends AlertAttrs = AlertAttrs> extends Component<
 
     return (
       <div {...attrs}>
-        <span className="Alert-body">{content}</span>
+        <span className="Alert-body">{children}</span>
         <ul className="Alert-controls">{listItems(controls.concat(dismissControl))}</ul>
       </div>
     );

js/src/common/components/AlertManager.js

@@ -6,23 +6,72 @@ import Alert from './Alert';
  * be shown and dismissed.
  */
 export default class AlertManager extends Component {
-  oninit(vnode) {
+  init() {
-    super.oninit(vnode);
+    /**
-
+     * An array of Alert components which are currently showing.
-    this.state = this.attrs.state;
+     *
+     * @type {Alert[]}
+     * @protected
+     */
+    this.components = [];
   }
 
   view() {
     return (
       <div className="AlertManager">
-        {Object.entries(this.state.getActiveAlerts()).map(([key, alert]) => (
+        {this.components.map((component) => (
-          <div className="AlertManager-alert">
+          <div className="AlertManager-alert">{component}</div>
-            <alert.componentClass {...alert.attrs} ondismiss={this.state.dismiss.bind(this.state, key)}>
-              {alert.children}
-            </alert.componentClass>
-          </div>
         ))}
       </div>
     );
   }
+
+  config(isInitialized, context) {
+    // Since this component is 'above' the content of the page (that is, it is a
+    // part of the global UI that persists between routes), we will flag the DOM
+    // to be retained across route changes.
+    context.retain = true;
+  }
+
+  /**
+   * Show an Alert in the alerts area.
+   *
+   * @param {Alert} component
+   * @public
+   */
+  show(component) {
+    if (!(component instanceof Alert)) {
+      throw new Error('The AlertManager component can only show Alert components');
+    }
+
+    component.props.ondismiss = this.dismiss.bind(this, component);
+
+    this.components.push(component);
+    m.redraw();
+  }
+
+  /**
+   * Dismiss an alert.
+   *
+   * @param {Alert} component
+   * @public
+   */
+  dismiss(component) {
+    const index = this.components.indexOf(component);
+
+    if (index !== -1) {
+      this.components.splice(index, 1);
+      m.redraw();
+    }
+  }
+
+  /**
+   * Clear all alerts.
+   *
+   * @public
+   */
+  clear() {
+    this.components = [];
+    m.redraw();
+  }
 }

js/src/common/components/Badge.js

@@ -6,18 +6,18 @@ import extract from '../utils/extract';
  * The `Badge` component represents a user/discussion badge, indicating some
  * status (e.g. a discussion is stickied, a user is an admin).
  *
- * A badge may have the following special attrs:
+ * A badge may have the following special props:
  *
  * - `type` The type of badge this is. This will be used to give the badge a
  *   class name of `Badge--{type}`.
  * - `icon` The name of an icon to show inside the badge.
  * - `label`
  *
- * All other attrs will be assigned as attributes on the badge element.
+ * All other props will be assigned as attributes on the badge element.
  */
 export default class Badge extends Component {
   view() {
-    const attrs = Object.assign({}, this.attrs);
+    const attrs = Object.assign({}, this.props);
     const type = extract(attrs, 'type');
     const iconName = extract(attrs, 'icon');
 
@@ -27,9 +27,9 @@ export default class Badge extends Component {
     return <span {...attrs}>{iconName ? icon(iconName, { className: 'Badge-icon' }) : m.trust('&nbsp;')}</span>;
   }
 
-  oncreate(vnode) {
+  config(isInitialized) {
-    super.oncreate(vnode);
+    if (isInitialized) return;
 
-    if (this.attrs.label) this.$().tooltip();
+    if (this.props.label) this.$().tooltip();
   }
 }

js/src/common/components/Button.js

@@ -1,15 +1,12 @@
 import Component from '../Component';
 import icon from '../helpers/icon';
-import classList from '../utils/classList';
 import extract from '../utils/extract';
 import extractText from '../utils/extractText';
 import LoadingIndicator from './LoadingIndicator';
 
 /**
  * The `Button` component defines an element which, when clicked, performs an
- * action.
+ * action. The button may have the following special props:
- *
- * ### Attrs
  *
  * - `icon` The name of the icon class. If specified, the button will be given a
  *   'has-icon' class name.
@@ -18,38 +15,41 @@ import LoadingIndicator from './LoadingIndicator';
  *   removed.
  * - `loading` Whether or not the button should be in a disabled loading state.
  *
- * All other attrs will be assigned as attributes on the button element.
+ * All other props will be assigned as attributes on the button element.
  *
  * Note that a Button has no default class names. This is because a Button can
  * be used to represent any generic clickable control, like a menu item.
  */
 export default class Button extends Component {
-  view(vnode) {
+  view() {
-    const attrs = Object.assign({}, this.attrs);
+    const attrs = Object.assign({}, this.props);
 
+    delete attrs.children;
+
+    attrs.className = attrs.className || '';
     attrs.type = attrs.type || 'button';
 
     // If a tooltip was provided for buttons without additional content, we also
     // use this tooltip as text for screen readers
-    if (attrs.title && !vnode.children) {
+    if (attrs.title && !this.props.children) {
       attrs['aria-label'] = attrs.title;
     }
 
     // If nothing else is provided, we use the textual button content as tooltip
-    if (!attrs.title && vnode.children) {
+    if (!attrs.title && this.props.children) {
-      attrs.title = extractText(vnode.children);
+      attrs.title = extractText(this.props.children);
     }
 
     const iconName = extract(attrs, 'icon');
+    if (iconName) attrs.className += ' hasIcon';
 
     const loading = extract(attrs, 'loading');
     if (attrs.disabled || loading) {
+      attrs.className += ' disabled' + (loading ? ' loading' : '');
       delete attrs.onclick;
     }
 
-    attrs.className = classList([attrs.className, iconName && 'hasIcon', (attrs.disabled || loading) && 'disabled', loading && 'loading']);
+    return <button {...attrs}>{this.getButtonContent()}</button>;
-
-    return <button {...attrs}>{this.getButtonContent(vnode.children)}</button>;
   }
 
   /**
@@ -58,13 +58,13 @@ export default class Button extends Component {
    * @return {*}
    * @protected
    */
-  getButtonContent(children) {
+  getButtonContent() {
-    const iconName = this.attrs.icon;
+    const iconName = this.props.icon;
 
     return [
       iconName && iconName !== true ? icon(iconName, { className: 'Button-icon' }) : '',
-      children ? <span className="Button-label">{children}</span> : '',
+      this.props.children ? <span className="Button-label">{this.props.children}</span> : '',
-      this.attrs.loading ? <LoadingIndicator size="tiny" className="LoadingIndicator--inline" /> : '',
+      this.props.loading ? LoadingIndicator.component({ size: 'tiny', className: 'LoadingIndicator--inline' }) : '',
     ];
   }
 }

js/src/common/components/Checkbox.js

@@ -1,13 +1,11 @@
 import Component from '../Component';
 import LoadingIndicator from './LoadingIndicator';
 import icon from '../helpers/icon';
-import classList from '../utils/classList';
-import withAttr from '../utils/withAttr';
 
 /**
  * The `Checkbox` component defines a checkbox input.
  *
- * ### Attrs
+ * ### Props
  *
  * - `state` Whether or not the checkbox is checked.
  * - `className` The class name for the root element.
@@ -17,24 +15,16 @@ import withAttr from '../utils/withAttr';
  * - `children` A text label to display next to the checkbox.
  */
 export default class Checkbox extends Component {
-  view(vnode) {
+  view() {
-    // Sometimes, false is stored in the DB as '0'. This is a temporary
+    let className = 'Checkbox ' + (this.props.state ? 'on' : 'off') + ' ' + (this.props.className || '');
-    // conversion layer until a more robust settings encoding is introduced
+    if (this.props.loading) className += ' loading';
-    if (this.attrs.state === '0') this.attrs.state = false;
+    if (this.props.disabled) className += ' disabled';
-
-    const className = classList([
-      'Checkbox',
-      this.attrs.state ? 'on' : 'off',
-      this.attrs.className,
-      this.attrs.loading && 'loading',
-      this.attrs.disabled && 'disabled',
-    ]);
 
     return (
       <label className={className}>
-        <input type="checkbox" checked={this.attrs.state} disabled={this.attrs.disabled} onchange={withAttr('checked', this.onchange.bind(this))} />
+        <input type="checkbox" checked={this.props.state} disabled={this.props.disabled} onchange={m.withAttr('checked', this.onchange.bind(this))} />
         <div className="Checkbox-display">{this.getDisplay()}</div>
-        {vnode.children}
+        {this.props.children}
       </label>
     );
   }
@@ -46,7 +36,7 @@ export default class Checkbox extends Component {
    * @protected
    */
   getDisplay() {
-    return this.attrs.loading ? <LoadingIndicator size="tiny" /> : icon(this.attrs.state ? 'fas fa-check' : 'fas fa-times');
+    return this.props.loading ? LoadingIndicator.component({ size: 'tiny' }) : icon(this.props.state ? 'fas fa-check' : 'fas fa-times');
   }
 
   /**
@@ -56,6 +46,6 @@ export default class Checkbox extends Component {
    * @protected
    */
   onchange(checked) {
-    if (this.attrs.onchange) this.attrs.onchange(checked, this);
+    if (this.props.onchange) this.props.onchange(checked, this);
   }
 }

js/src/common/components/ConfirmDocumentUnload.js

@@ -1,40 +0,0 @@
-import Component from '../Component';
-
-/**
- * The `ConfirmDocumentUnload` component can be used to register a global
- * event handler that prevents closing the browser window/tab based on the
- * return value of a given callback prop.
- *
- * ### Attrs
- *
- * - `when` - a callback returning true when the browser should prompt for
- *            confirmation before closing the window/tab
- *
- * ### Children
- *
- * NOTE: Only the first child will be rendered. (Use this component to wrap
- * another component / DOM element.)
- *
- */
-export default class ConfirmDocumentUnload extends Component {
-  handler() {
-    return this.attrs.when() || undefined;
-  }
-
-  oncreate(vnode) {
-    super.oncreate(vnode);
-
-    this.boundHandler = this.handler.bind(this);
-    $(window).on('beforeunload', this.boundHandler);
-  }
-
-  onremove() {
-    $(window).off('beforeunload', this.boundHandler);
-  }
-
-  view(vnode) {
-    // To avoid having to render another wrapping <div> here, we assume that
-    // this component is only wrapped around a single element / component.
-    return vnode.children[0];
-  }
-}

js/src/common/components/Dropdown.js

@@ -6,7 +6,7 @@ import listItems from '../helpers/listItems';
  * The `Dropdown` component displays a button which, when clicked, shows a
  * dropdown menu beneath it.
  *
- * ### Attrs
+ * ### Props
  *
  * - `buttonClassName` A class name to apply to the dropdown toggle button.
  * - `menuClassName` A class name to apply to the dropdown menu.
@@ -19,33 +19,33 @@ import listItems from '../helpers/listItems';
  * The children will be displayed as a list inside of the dropdown menu.
  */
 export default class Dropdown extends Component {
-  static initAttrs(attrs) {
+  static initProps(props) {
-    attrs.className = attrs.className || '';
+    super.initProps(props);
-    attrs.buttonClassName = attrs.buttonClassName || '';
+
-    attrs.menuClassName = attrs.menuClassName || '';
+    props.className = props.className || '';
-    attrs.label = attrs.label || '';
+    props.buttonClassName = props.buttonClassName || '';
-    attrs.caretIcon = typeof attrs.caretIcon !== 'undefined' ? attrs.caretIcon : 'fas fa-caret-down';
+    props.menuClassName = props.menuClassName || '';
+    props.label = props.label || '';
+    props.caretIcon = typeof props.caretIcon !== 'undefined' ? props.caretIcon : 'fas fa-caret-down';
   }
 
-  oninit(vnode) {
+  init() {
-    super.oninit(vnode);
-
     this.showing = false;
   }
 
-  view(vnode) {
+  view() {
-    const items = vnode.children ? listItems(vnode.children) : [];
+    const items = this.props.children ? listItems(this.props.children) : [];
 
     return (
-      <div className={'ButtonGroup Dropdown dropdown ' + this.attrs.className + ' itemCount' + items.length + (this.showing ? ' open' : '')}>
+      <div className={'ButtonGroup Dropdown dropdown ' + this.props.className + ' itemCount' + items.length + (this.showing ? ' open' : '')}>
-        {this.getButton(vnode.children)}
+        {this.getButton()}
         {this.getMenu(items)}
       </div>
     );
   }
 
-  oncreate(vnode) {
+  config(isInitialized) {
-    super.oncreate(vnode);
+    if (isInitialized) return;
 
     // When opening the dropdown menu, work out if the menu goes beyond the
     // bottom of the viewport. If it does, we will apply class to make it show
@@ -53,8 +53,8 @@ export default class Dropdown extends Component {
     this.$().on('shown.bs.dropdown', () => {
       this.showing = true;
 
-      if (this.attrs.onshow) {
+      if (this.props.onshow) {
-        this.attrs.onshow();
+        this.props.onshow();
       }
 
       m.redraw();
@@ -76,8 +76,8 @@ export default class Dropdown extends Component {
     this.$().on('hidden.bs.dropdown', () => {
       this.showing = false;
 
-      if (this.attrs.onhide) {
+      if (this.props.onhide) {
-        this.attrs.onhide();
+        this.props.onhide();
       }
 
       m.redraw();
@@ -90,10 +90,10 @@ export default class Dropdown extends Component {
    * @return {*}
    * @protected
    */
-  getButton(children) {
+  getButton() {
     return (
-      <button className={'Dropdown-toggle ' + this.attrs.buttonClassName} data-toggle="dropdown" onclick={this.attrs.onclick}>
+      <button className={'Dropdown-toggle ' + this.props.buttonClassName} data-toggle="dropdown" onclick={this.props.onclick}>
-        {this.getButtonContent(children)}
+        {this.getButtonContent()}
       </button>
     );
   }
@@ -104,15 +104,15 @@ export default class Dropdown extends Component {
    * @return {*}
    * @protected
    */
-  getButtonContent(children) {
+  getButtonContent() {
     return [
-      this.attrs.icon ? icon(this.attrs.icon, { className: 'Button-icon' }) : '',
+      this.props.icon ? icon(this.props.icon, { className: 'Button-icon' }) : '',
-      <span className="Button-label">{this.attrs.label}</span>,
+      <span className="Button-label">{this.props.label}</span>,
-      this.attrs.caretIcon ? icon(this.attrs.caretIcon, { className: 'Button-caret' }) : '',
+      this.props.caretIcon ? icon(this.props.caretIcon, { className: 'Button-caret' }) : '',
     ];
   }
 
   getMenu(items) {
-    return <ul className={'Dropdown-menu dropdown-menu ' + this.attrs.menuClassName}>{items}</ul>;
+    return <ul className={'Dropdown-menu dropdown-menu ' + this.props.menuClassName}>{items}</ul>;
   }
 }

js/src/common/components/FieldSet.js

@@ -11,11 +11,11 @@ import listItems from '../helpers/listItems';
  * The children should be an array of items to show in the fieldset.
  */
 export default class FieldSet extends Component {
-  view(vnode) {
+  view() {
     return (
-      <fieldset className={this.attrs.className}>
+      <fieldset className={this.props.className}>
-        <legend>{this.attrs.label}</legend>
+        <legend>{this.props.label}</legend>
-        <ul>{listItems(vnode.children)}</ul>
+        <ul>{listItems(this.props.children)}</ul>
       </fieldset>
     );
   }

js/src/common/components/GroupBadge.js

@@ -1,16 +1,16 @@
 import Badge from './Badge';
 
 export default class GroupBadge extends Badge {
-  static initAttrs(attrs) {
+  static initProps(props) {
-    super.initAttrs(attrs);
+    super.initProps(props);
 
-    if (attrs.group) {
+    if (props.group) {
-      attrs.icon = attrs.group.icon();
+      props.icon = props.group.icon();
-      attrs.style = { backgroundColor: attrs.group.color() };
+      props.style = { backgroundColor: props.group.color() };
-      attrs.label = typeof attrs.label === 'undefined' ? attrs.group.nameSingular() : attrs.label;
+      props.label = typeof props.label === 'undefined' ? props.group.nameSingular() : props.label;
-      attrs.type = 'group--' + attrs.group.id();
+      props.type = 'group--' + props.group.id();
 
-      delete attrs.group;
+      delete props.group;
     }
   }
 }

js/src/common/components/Link.js

@@ -1,47 +0,0 @@
-import Component from '../Component';
-import extract from '../utils/extract';
-
-/**
- * The link component enables both internal and external links.
- * It will return a regular HTML link for any links to external sites,
- * and it will use Mithril's m.route.Link for any internal links.
- *
- * Links will default to internal; the 'external' attr must be set to
- * `true` for the link to be external.
- */
-export default class Link extends Component {
-  view(vnode) {
-    let { options = {}, ...attrs } = vnode.attrs;
-
-    attrs.href = attrs.href || '';
-
-    // For some reason, m.route.Link does not like vnode.text, so if present, we
-    // need to convert it to text vnodes and store it in children.
-    const children = vnode.children || { tag: '#', children: vnode.text };
-
-    if (attrs.external) {
-      return <a {...attrs}>{children}</a>;
-    }
-
-    // If the href URL of the link is the same as the current page path
-    // we will not add a new entry to the browser history.
-    // This allows us to still refresh the Page component
-    // without adding endless history entries.
-    if (attrs.href === m.route.get()) {
-      if (!('replace' in options)) options.replace = true;
-    }
-
-    // Mithril 2 does not completely rerender the page if a route change leads to the same route
-    // (or the same component handling a different route).
-    // Here, the `force` parameter will use Mithril's key system to force a full rerender
-    // see https://mithril.js.org/route.html#key-parameter
-    if (extract(attrs, 'force')) {
-      if (!('state' in options)) options.state = {};
-      if (!('key' in options.state)) options.state.key = Date.now();
-    }
-
-    attrs.options = options;
-
-    return <m.route.Link {...attrs}>{children}</m.route.Link>;
-  }
-}

js/src/common/components/LinkButton.js

@@ -1,12 +1,11 @@
 import Button from './Button';
-import Link from './Link';
 
 /**
  * The `LinkButton` component defines a `Button` which links to a route.
  *
- * ### Attrs
+ * ### Props
  *
- * All of the attrs accepted by `Button`, plus:
+ * All of the props accepted by `Button`, plus:
  *
  * - `active` Whether or not the page that this button links to is currently
  *   active.
@@ -14,28 +13,26 @@ import Link from './Link';
  *   the `active` prop will automatically be set to true.
  */
 export default class LinkButton extends Button {
-  static initAttrs(attrs) {
+  static initProps(props) {
-    super.initAttrs(attrs);
+    props.active = this.isActive(props);
-
+    props.config = props.config || m.route;
-    attrs.active = this.isActive(attrs);
   }
 
-  view(vnode) {
+  view() {
-    const vdom = super.view(vnode);
+    const vdom = super.view();
 
-    vdom.tag = Link;
+    vdom.tag = 'a';
-    vdom.attrs.active = String(vdom.attrs.active);
 
     return vdom;
   }
 
   /**
-   * Determine whether a component with the given attrs is 'active'.
+   * Determine whether a component with the given props is 'active'.
    *
-   * @param {Object} attrs
+   * @param {Object} props
    * @return {Boolean}
    */
-  static isActive(attrs) {
+  static isActive(props) {
-    return typeof attrs.active !== 'undefined' ? attrs.active : m.route.get() === attrs.href;
+    return typeof props.active !== 'undefined' ? props.active : m.route() === props.href;
   }
 }

js/src/common/components/LoadingIndicator.js

@@ -2,17 +2,16 @@ import Component from '../Component';
 import { Spinner } from 'spin.js';
 
 /**
- * The `LoadingIndicator` component displays a loading spinner with spin.js.
+ * The `LoadingIndicator` component displays a loading spinner with spin.js. It
- *
+ * may have the following special props:
- * ### Attrs
  *
  * - `size` The spin.js size preset to use. Defaults to 'small'.
  *
- * All other attrs will be assigned as attributes on the DOM element.
+ * All other props will be assigned as attributes on the element.
  */
 export default class LoadingIndicator extends Component {
   view() {
-    const attrs = Object.assign({}, this.attrs);
+    const attrs = Object.assign({}, this.props);
 
     attrs.className = 'LoadingIndicator ' + (attrs.className || '');
     delete attrs.size;
@@ -20,12 +19,12 @@ export default class LoadingIndicator extends Component {
     return <div {...attrs}>{m.trust('&nbsp;')}</div>;
   }
 
-  oncreate(vnode) {
+  config(isInitialized) {
-    super.oncreate(vnode);
+    if (isInitialized) return;
 
     const options = { zIndex: 'auto', color: this.$().css('color') };
 
-    switch (this.attrs.size) {
+    switch (this.props.size) {
       case 'large':
         Object.assign(options, { lines: 10, length: 8, width: 4, radius: 8 });
         break;

js/src/common/components/Modal.js

@@ -9,45 +9,24 @@ import Button from './Button';
  * @abstract
  */
 export default class Modal extends Component {
-  /**
+  init() {
-   * Determine whether or not the modal should be dismissible via an 'x' button.
+    /**
-   */
+     * An alert component to show below the header.
-  static isDismissible = true;
+     *
-
+     * @type {Alert}
-  /**
+     */
-   * Attributes for an alert component to show below the header.
+    this.alert = null;
-   *
-   * @type {object}
-   */
-  alertAttrs = null;
-
-  oncreate(vnode) {
-    super.oncreate(vnode);
-
-    this.attrs.animateShow(() => this.onready());
-  }
-
-  onbeforeremove() {
-    // If the global modal state currently contains a modal,
-    // we've just opened up a new one, and accordingly,
-    // we don't need to show a hide animation.
-    if (!this.attrs.state.modal) {
-      this.attrs.animateHide();
-      // Here, we ensure that the animation has time to complete.
-      // See https://mithril.js.org/lifecycle-methods.html#onbeforeremove
-      return new Promise((resolve) => setTimeout(resolve, 1000));
-    }
   }
 
   view() {
-    if (this.alertAttrs) {
+    if (this.alert) {
-      this.alertAttrs.dismissible = false;
+      this.alert.props.dismissible = false;
     }
 
     return (
       <div className={'Modal modal-dialog ' + this.className()}>
         <div className="Modal-content">
-          {this.constructor.isDismissible ? (
+          {this.isDismissible() ? (
             <div className="Modal-close App-backControl">
               {Button.component({
                 icon: 'fas fa-times',
@@ -64,7 +43,7 @@ export default class Modal extends Component {
               <h3 className="App-titleControl App-titleControl--text">{this.title()}</h3>
             </div>
 
-            {this.alertAttrs ? <div className="Modal-alert">{Alert.component(this.alertAttrs)}</div> : ''}
+            {alert ? <div className="Modal-alert">{this.alert}</div> : ''}
 
             {this.content()}
           </form>
@@ -73,6 +52,15 @@ export default class Modal extends Component {
     );
   }
 
+  /**
+   * Determine whether or not the modal should be dismissible via an 'x' button.
+   *
+   * @return {Boolean}
+   */
+  isDismissible() {
+    return true;
+  }
+
   /**
    * Get the class name to apply to the modal.
    *
@@ -111,11 +99,13 @@ export default class Modal extends Component {
     this.$('form').find('input, select, textarea').first().focus().select();
   }
 
+  onhide() {}
+
   /**
    * Hide the modal.
    */
   hide() {
-    this.attrs.state.close();
+    app.modal.close();
   }
 
   /**
@@ -133,7 +123,7 @@ export default class Modal extends Component {
    * @param {RequestError} error
    */
   onerror(error) {
-    this.alertAttrs = error.alert;
+    this.alert = error.alert;
 
     m.redraw();
 

js/src/common/components/ModalManager.js

@@ -1,4 +1,5 @@
 import Component from '../Component';
+import Modal from './Modal';
 
 /**
  * The `ModalManager` component manages a modal dialog. Only one modal dialog
@@ -6,45 +7,46 @@ import Component from '../Component';
  * overwrite the previous one.
  */
 export default class ModalManager extends Component {
+  init() {
+    this.showing = false;
+    this.component = null;
+  }
+
   view() {
-    const modal = this.attrs.state.modal;
+    return <div className="ModalManager modal fade">{this.component && this.component.render()}</div>;
-
-    return (
-      <div className="ModalManager modal fade">
-        {modal
-          ? modal.componentClass.component({
-              ...modal.attrs,
-              animateShow: this.animateShow.bind(this),
-              animateHide: this.animateHide.bind(this),
-              state: this.attrs.state,
-            })
-          : ''}
-      </div>
-    );
   }
 
-  oncreate(vnode) {
+  config(isInitialized, context) {
-    super.oncreate(vnode);
+    if (isInitialized) return;
 
-    // Ensure the modal state is notified about a closed modal, even when the
+    // Since this component is 'above' the content of the page (that is, it is a
-    // DOM-based Bootstrap JavaScript code triggered the closing of the modal,
+    // part of the global UI that persists between routes), we will flag the DOM
-    // e.g. via ESC key or a click on the modal backdrop.
+    // to be retained across route changes.
-    this.$().on('hidden.bs.modal', this.attrs.state.close.bind(this.attrs.state));
+    context.retain = true;
+
+    this.$().on('hidden.bs.modal', this.clear.bind(this)).on('shown.bs.modal', this.onready.bind(this));
   }
 
-  animateShow(readyCallback) {
+  /**
-    const dismissible = !!this.attrs.state.modal.componentClass.isDismissible;
+   * Show a modal dialog.
-
+   *
-    // If we are opening this modal while another modal is already open,
+   * @param {Modal} component
-    // the shown event will not run, because the modal is already open.
+   * @public
-    // So, we need to manually trigger the readyCallback.
+   */
-    if (this.$().hasClass('in')) {
+  show(component) {
-      readyCallback();
+    if (!(component instanceof Modal)) {
-      return;
+      throw new Error('The ModalManager component can only show Modal components');
     }
 
+    clearTimeout(this.hideTimeout);
+
+    this.showing = true;
+    this.component = component;
+
+    m.redraw(true);
+
+    const dismissible = !!this.component.isDismissible();
     this.$()
-      .one('shown.bs.modal', readyCallback)
       .modal({
         backdrop: dismissible || 'static',
         keyboard: dismissible,
@@ -52,7 +54,50 @@ export default class ModalManager extends Component {
       .modal('show');
   }
 
-  animateHide() {
+  /**
-    this.$().modal('hide');
+   * Close the modal dialog.
+   *
+   * @public
+   */
+  close() {
+    if (!this.showing) return;
+
+    // Don't hide the modal immediately, because if the consumer happens to call
+    // the `show` method straight after to show another modal dialog, it will
+    // cause Bootstrap's modal JS to misbehave. Instead we will wait for a tiny
+    // bit to give the `show` method the opportunity to prevent this from going
+    // ahead.
+    this.hideTimeout = setTimeout(() => {
+      this.$().modal('hide');
+      this.showing = false;
+    });
+  }
+
+  /**
+   * Clear content from the modal area.
+   *
+   * @protected
+   */
+  clear() {
+    if (this.component) {
+      this.component.onhide();
+    }
+
+    this.component = null;
+
+    app.current.retain = false;
+
+    m.lazyRedraw();
+  }
+
+  /**
+   * When the modal dialog is ready to be used, tell it!
+   *
+   * @protected
+   */
+  onready() {
+    if (this.component && this.component.onready) {
+      this.component.onready(this.$());
+    }
   }
 }

js/src/common/components/Navigation.js

@@ -11,7 +11,7 @@ import LinkButton from './LinkButton';
  * If the app has a pane, it will also include a 'pin' button which toggles the
  * pinned state of the pane.
  *
- * Accepts the following attrs:
+ * Accepts the following props:
  *
  * - `className` The name of a class to set on the root element.
  * - `drawer` Whether or not to show a button to toggle the app's drawer if
@@ -23,7 +23,7 @@ export default class Navigation extends Component {
 
     return (
       <div
-        className={'Navigation ButtonGroup ' + (this.attrs.className || '')}
+        className={'Navigation ButtonGroup ' + (this.props.className || '')}
         onmouseenter={pane && pane.show.bind(pane)}
         onmouseleave={pane && pane.onmouseleave.bind(pane)}
       >
@@ -32,6 +32,13 @@ export default class Navigation extends Component {
     );
   }
 
+  config(isInitialized, context) {
+    // Since this component is 'above' the content of the page (that is, it is a
+    // part of the global UI that persists between routes), we will flag the DOM
+    // to be retained across route changes.
+    context.retain = true;
+  }
+
   /**
    * Get the back button.
    *
@@ -47,6 +54,7 @@ export default class Navigation extends Component {
       href: history.backUrl(),
       icon: 'fas fa-chevron-left',
       title: previous.title,
+      config: () => {},
       onclick: (e) => {
         if (e.shiftKey || e.ctrlKey || e.metaKey || e.which === 2) return;
         e.preventDefault();
@@ -80,7 +88,7 @@ export default class Navigation extends Component {
    * @protected
    */
   getDrawerButton() {
-    if (!this.attrs.drawer) return '';
+    if (!this.props.drawer) return '';
 
     const { drawer } = app;
     const user = app.session.user;

js/src/common/components/Page.js

@@ -7,10 +7,12 @@ import PageState from '../states/PageState';
  * @abstract
  */
 export default class Page extends Component {
-  oninit(vnode) {
+  init() {
-    super.oninit(vnode);
+    app.previous = app.current;
+    app.current = new PageState(this.constructor);
 
-    this.onNewRoute();
+    app.drawer.hide();
+    app.modal.close();
 
     /**
      * A class name to apply to the body while the route is active.
@@ -20,31 +22,13 @@ export default class Page extends Component {
     this.bodyClass = '';
   }
 
-  /**
+  config(isInitialized, context) {
-   * A collections of actions to run when the route changes.
+    if (isInitialized) return;
-   * This is extracted here, and not hardcoded in oninit, as oninit is not called
-   * when a different route is handled by the same component, but we still need to
-   * adjust the current route name.
-   */
-  onNewRoute() {
-    app.previous = app.current;
-    app.current = new PageState(this.constructor, { routeName: this.attrs.routeName });
-
-    app.drawer.hide();
-    app.modal.close();
-  }
-
-  oncreate(vnode) {
-    super.oncreate(vnode);
 
     if (this.bodyClass) {
       $('#app').addClass(this.bodyClass);
-    }
-  }
 
-  onremove() {
+      context.onunload = () => $('#app').removeClass(this.bodyClass);
-    if (this.bodyClass) {
-      $('#app').removeClass(this.bodyClass);
     }
   }
 }

js/src/common/components/Placeholder.js

@@ -4,7 +4,7 @@ import Component from '../Component';
  * The `Placeholder` component displays a muted text with some call to action,
  * usually used as an empty state.
  *
- * ### Attrs
+ * ### Props
  *
  * - `text`
  */
@@ -12,7 +12,7 @@ export default class Placeholder extends Component {
   view() {
     return (
       <div className="Placeholder">
-        <p>{this.attrs.text}</p>
+        <p>{this.props.text}</p>
       </div>
     );
   }

js/src/common/components/RequestErrorModal.js

@@ -6,11 +6,11 @@ export default class RequestErrorModal extends Modal {
   }
 
   title() {
-    return this.attrs.error.xhr ? `${this.attrs.error.xhr.status} ${this.attrs.error.xhr.statusText}` : '';
+    return this.props.error.xhr ? `${this.props.error.xhr.status} ${this.props.error.xhr.statusText}` : '';
   }
 
   content() {
-    const { error, formattedError } = this.attrs;
+    const { error, formattedError } = this.props;
 
     let responseText;
 
@@ -31,7 +31,7 @@ export default class RequestErrorModal extends Modal {
     return (
       <div className="Modal-body">
         <pre>
-          {this.attrs.error.options.method} {this.attrs.error.options.url}
+          {this.props.error.options.method} {this.props.error.options.url}
           <br />
           <br />
           {responseText}

js/src/common/components/Select.js

@@ -1,10 +1,9 @@
 import Component from '../Component';
 import icon from '../helpers/icon';
-import withAttr from '../utils/withAttr';
 
 /**
  * The `Select` component displays a <select> input, surrounded with some extra
- * elements for styling. It accepts the following attrs:
+ * elements for styling. It accepts the following props:
  *
  * - `options` A map of option values to labels.
  * - `onchange` A callback to run when the selected value is changed.
@@ -13,13 +12,13 @@ import withAttr from '../utils/withAttr';
  */
 export default class Select extends Component {
   view() {
-    const { options, onchange, value, disabled } = this.attrs;
+    const { options, onchange, value, disabled } = this.props;
 
     return (
       <span className="Select">
         <select
           className="Select-input FormControl"
-          onchange={onchange ? withAttr('value', onchange.bind(this)) : undefined}
+          onchange={onchange ? m.withAttr('value', onchange.bind(this)) : undefined}
           value={value}
           disabled={disabled}
         >

js/src/common/components/SelectDropdown.js

@@ -1,49 +1,31 @@
 import Dropdown from './Dropdown';
 import icon from '../helpers/icon';
 
-/**
- * Determines via a vnode is currently "active".
- * Due to changes in Mithril 2, attrs will not be instantiated until AFTER view()
- * is initially called on the parent component, so we can not always depend on the
- * active attr to determine which element should be displayed as the "active child".
- *
- * This is a temporary patch, and as so, is not exported / placed in utils.
- */
-function isActive(vnode) {
-  const tag = vnode.tag;
-
-  if ('initAttrs' in tag) {
-    tag.initAttrs(vnode.attrs);
-  }
-
-  return 'isActive' in tag ? tag.isActive(vnode.attrs) : vnode.attrs.active;
-}
-
 /**
  * The `SelectDropdown` component is the same as a `Dropdown`, except the toggle
  * button's label is set as the label of the first child which has a truthy
  * `active` prop.
  *
- * ### Attrs
+ * ### Props
  *
  * - `caretIcon`
  * - `defaultLabel`
  */
 export default class SelectDropdown extends Dropdown {
-  static initAttrs(attrs) {
+  static initProps(props) {
-    attrs.caretIcon = typeof attrs.caretIcon !== 'undefined' ? attrs.caretIcon : 'fas fa-sort';
+    props.caretIcon = typeof props.caretIcon !== 'undefined' ? props.caretIcon : 'fas fa-sort';
 
-    super.initAttrs(attrs);
+    super.initProps(props);
 
-    attrs.className += ' Dropdown--select';
+    props.className += ' Dropdown--select';
   }
 
-  getButtonContent(children) {
+  getButtonContent() {
-    const activeChild = children.find(isActive);
+    const activeChild = this.props.children.filter((child) => child.props.active)[0];
-    let label = (activeChild && activeChild.children) || this.attrs.defaultLabel;
+    let label = (activeChild && activeChild.props.children) || this.props.defaultLabel;
 
     if (label instanceof Array) label = label[0];
 
-    return [<span className="Button-label">{label}</span>, icon(this.attrs.caretIcon, { className: 'Button-caret' })];
+    return [<span className="Button-label">{label}</span>, icon(this.props.caretIcon, { className: 'Button-caret' })];
   }
 }

js/src/common/components/SplitDropdown.js

@@ -7,25 +7,25 @@ import icon from '../helpers/icon';
  * is displayed as its own button prior to the toggle button.
  */
 export default class SplitDropdown extends Dropdown {
-  static initAttrs(attrs) {
+  static initProps(props) {
-    super.initAttrs(attrs);
+    super.initProps(props);
 
-    attrs.className += ' Dropdown--split';
+    props.className += ' Dropdown--split';
-    attrs.menuClassName += ' Dropdown-menu--right';
+    props.menuClassName += ' Dropdown-menu--right';
   }
 
-  getButton(children) {
+  getButton() {
-    // Make a copy of the attrs of the first child component. We will assign
+    // Make a copy of the props of the first child component. We will assign
-    // these attrs to a new button, so that it has exactly the same behaviour as
+    // these props to a new button, so that it has exactly the same behaviour as
     // the first child.
-    const firstChild = this.getFirstChild(children);
+    const firstChild = this.getFirstChild();
-    const buttonAttrs = Object.assign({}, firstChild.attrs);
+    const buttonProps = Object.assign({}, firstChild.props);
-    buttonAttrs.className = (buttonAttrs.className || '') + ' SplitDropdown-button Button ' + this.attrs.buttonClassName;
+    buttonProps.className = (buttonProps.className || '') + ' SplitDropdown-button Button ' + this.props.buttonClassName;
 
     return [
-      Button.component(buttonAttrs, firstChild.children),
+      Button.component(buttonProps),
-      <button className={'Dropdown-toggle Button Button--icon ' + this.attrs.buttonClassName} data-toggle="dropdown">
+      <button className={'Dropdown-toggle Button Button--icon ' + this.props.buttonClassName} data-toggle="dropdown">
-        {icon(this.attrs.icon, { className: 'Button-icon' })}
+        {icon(this.props.icon, { className: 'Button-icon' })}
         {icon('fas fa-caret-down', { className: 'Button-caret' })}
       </button>,
     ];
@@ -38,8 +38,8 @@ export default class SplitDropdown extends Dropdown {
    * @return {*}
    * @protected
    */
-  getFirstChild(children) {
+  getFirstChild() {
-    let firstChild = children;
+    let firstChild = this.props.children;
 
     while (firstChild instanceof Array) firstChild = firstChild[0];
 

js/src/common/components/Switch.js

@@ -5,13 +5,13 @@ import Checkbox from './Checkbox';
  * a tick/cross one.
  */
 export default class Switch extends Checkbox {
-  static initAttrs(attrs) {
+  static initProps(props) {
-    super.initAttrs(attrs);
+    super.initProps(props);
 
-    attrs.className = (attrs.className || '') + ' Checkbox--switch';
+    props.className = (props.className || '') + ' Checkbox--switch';
   }
 
   getDisplay() {
-    return this.attrs.loading ? super.getDisplay() : '';
+    return this.props.loading ? super.getDisplay() : '';
   }
 }

js/src/common/extend/Model.js

@@ -1,4 +1,4 @@
-export default class Model {
+export default class Routes {
   type;
   attributes = [];
   hasOnes = [];

js/src/common/helpers/avatar.js

@@ -25,7 +25,7 @@ export default function avatar(user, attrs = {}) {
     if (hasTitle) attrs.title = attrs.title || username;
 
     if (avatarUrl) {
-      return <img {...attrs} src={avatarUrl} alt="" />;
+      return <img {...attrs} src={avatarUrl} />;
     }
 
     content = username.charAt(0).toUpperCase();

js/src/common/helpers/fullTime.js

@@ -6,10 +6,10 @@
  * @return {Object}
  */
 export default function fullTime(time) {
-  const d = dayjs(time);
+  const mo = moment(time);
 
-  const datetime = d.format();
+  const datetime = mo.format();
-  const full = d.format('LLLL');
+  const full = mo.format('LLLL');
 
   return (
     <time pubdate datetime={datetime}>

js/src/common/helpers/humanTime.js

@@ -9,10 +9,10 @@ import humanTimeUtil from '../utils/humanTime';
  * @return {Object}
  */
 export default function humanTime(time) {
-  const d = dayjs(time);
+  const mo = moment(time);
 
-  const datetime = d.format();
+  const datetime = mo.format();
-  const full = d.format('LLLL');
+  const full = mo.format('LLLL');
   const ago = humanTimeUtil(time);
 
   return (

js/src/common/helpers/icon.js

@@ -0,0 +1,12 @@
+/**
+ * The `icon` helper displays an icon.
+ *
+ * @param {String} fontClass The full icon class, prefix and the icon’s name.
+ * @param {Object} attrs Any other attributes to apply.
+ * @return {Object}
+ */
+export default function icon(fontClass, attrs = {}) {
+  attrs.className = 'icon ' + fontClass + ' ' + (attrs.className || '');
+
+  return <i {...attrs} />;
+}

js/src/common/helpers/icon.tsx

@@ -1,13 +0,0 @@
-import * as Mithril from 'mithril';
-
-/**
- * The `icon` helper displays an icon.
- *
- * @param fontClass The full icon class, prefix and the icon’s name.
- * @param attrs Any other attributes to apply.
- */
-export default function icon(fontClass: string, attrs: Mithril.Attributes = {}): Mithril.Vnode {
-  attrs.className = 'icon ' + fontClass + ' ' + (attrs.className || '');
-
-  return <i {...attrs} />;
-}

js/src/common/helpers/listItems.js

@@ -2,14 +2,14 @@ import Separator from '../components/Separator';
 import classList from '../utils/classList';
 
 function isSeparator(item) {
-  return item.tag === Separator;
+  return item && item.component === Separator;
 }
 
 function withoutUnnecessarySeparators(items) {
   const newItems = [];
   let prevItem;
 
-  items.filter(Boolean).forEach((item, i) => {
+  items.forEach((item, i) => {
     if (!isSeparator(item) || (prevItem && !isSeparator(prevItem) && i !== items.length - 1)) {
       prevItem = item;
       newItems.push(item);
@@ -30,27 +30,21 @@ export default function listItems(items) {
   if (!(items instanceof Array)) items = [items];
 
   return withoutUnnecessarySeparators(items).map((item) => {
-    const isListItem = item.tag && item.tag.isListItem;
+    const isListItem = item.component && item.component.isListItem;
-    const active = item.tag && item.tag.isActive && item.tag.isActive(item.attrs);
+    const active = item.component && item.component.isActive && item.component.isActive(item.props);
-    const className = (item.attrs && item.attrs.itemClassName) || item.itemClassName;
+    const className = item.props ? item.props.itemClassName : item.itemClassName;
 
     if (isListItem) {
       item.attrs = item.attrs || {};
       item.attrs.key = item.attrs.key || item.itemName;
-      item.key = item.attrs.key;
     }
 
-    const node = isListItem ? (
+    return isListItem ? (
       item
     ) : (
-      <li
+      <li className={classList([item.itemName ? 'item-' + item.itemName : '', className, active ? 'active' : ''])} key={item.itemName}>
-        className={classList([className, item.itemName && `item-${item.itemName}`, active && 'active'])}
-        key={(item.attrs && item.attrs.key) || item.itemName}
-      >
         {item}
       </li>
     );
-
-    return node;
   });
 }

js/src/common/index.js

@@ -1,6 +1,6 @@
 import 'expose-loader?$!expose-loader?jQuery!jquery';
 import 'expose-loader?m!mithril';
-import 'expose-loader?moment!expose-loader?dayjs!dayjs';
+import 'expose-loader?moment!moment';
 import 'expose-loader?m.bidi!m.attrs.bidi';
 import 'bootstrap/js/affix';
 import 'bootstrap/js/dropdown';
@@ -9,12 +9,6 @@ import 'bootstrap/js/tooltip';
 import 'bootstrap/js/transition';
 import 'jquery.hotkeys/jquery.hotkeys';
 
-import relativeTime from 'dayjs/plugin/relativeTime';
-import localizedFormat from 'dayjs/plugin/localizedFormat';
-
-dayjs.extend(relativeTime);
-dayjs.extend(localizedFormat);
-
 import patchMithril from './utils/patchMithril';
 
 patchMithril(window);

js/src/common/models/User.js

@@ -54,7 +54,7 @@ Object.assign(User.prototype, {
    * @public
    */
   isOnline() {
-    return dayjs().subtract(5, 'minutes').isBefore(this.lastSeenAt());
+    return this.lastSeenAt() > moment().subtract(5, 'minutes').toDate();
   },
 
   /**

js/src/common/states/AlertManagerState.ts

@@ -1,80 +0,0 @@
-import Mithril from 'mithril';
-import Alert, { AlertAttrs } from '../components/Alert';
-
-/**
- * Returned by `AlertManagerState.show`. Used to dismiss alerts.
- */
-export type AlertIdentifier = number;
-
-export interface AlertState {
-  componentClass: typeof Alert;
-  attrs: AlertAttrs;
-  children: Mithril.Children;
-}
-
-export default class AlertManagerState {
-  protected activeAlerts: { [id: number]: AlertState } = {};
-  protected alertId = 0;
-
-  getActiveAlerts() {
-    return this.activeAlerts;
-  }
-
-  /**
-   * Show an Alert in the alerts area.
-   *
-   * @returns The alert's ID, which can be used to dismiss the alert.
-   */
-  show(children: Mithril.Children): AlertIdentifier;
-  show(attrs: AlertAttrs, children: Mithril.Children): AlertIdentifier;
-  show(componentClass: Alert, attrs: AlertAttrs, children: Mithril.Children): AlertIdentifier;
-
-  show(arg1: any, arg2?: any, arg3?: any) {
-    // Assigns variables as per the above signatures
-    let componentClass = Alert;
-    let attrs: AlertAttrs = {};
-    let children: Mithril.Children;
-
-    if (arguments.length == 1) {
-      children = arg1 as Mithril.Children;
-    } else if (arguments.length == 2) {
-      attrs = arg1 as AlertAttrs;
-      children = arg2 as Mithril.Children;
-    } else if (arguments.length == 3) {
-      componentClass = arg1 as typeof Alert;
-      attrs = arg2 as AlertAttrs;
-      children = arg3;
-    }
-
-    // Breaking Change Compliance Warning, Remove in Beta 15.
-    // This is applied to the first argument (attrs) because previously, the alert was passed as the first argument.
-    if (attrs === Alert || attrs instanceof Alert) {
-      // This is duplicated so that if the error is caught, an error message still shows up in the debug console.
-      console.error('The AlertManager can only show Alerts. Whichever extension triggered this alert should be updated to comply with beta 14.');
-      throw new Error('The AlertManager can only show Alerts. Whichever extension triggered this alert should be updated to comply with beta 14.');
-    }
-    // End Change Compliance Warning, Remove in Beta 15
-    this.activeAlerts[++this.alertId] = { children, attrs, componentClass };
-    m.redraw();
-
-    return this.alertId;
-  }
-
-  /**
-   * Dismiss an alert.
-   */
-  dismiss(key: AlertIdentifier): void {
-    if (!key || !(key in this.activeAlerts)) return;
-
-    delete this.activeAlerts[key];
-    m.redraw();
-  }
-
-  /**
-   * Clear all alerts.
-   */
-  clear(): void {
-    this.activeAlerts = {};
-    m.redraw();
-  }
-}

js/src/common/states/ModalManagerState.js

@@ -1,56 +0,0 @@
-import Modal from '../components/Modal';
-
-export default class ModalManagerState {
-  constructor() {
-    this.modal = null;
-  }
-
-  /**
-   * Show a modal dialog.
-   *
-   * @public
-   */
-  show(componentClass, attrs) {
-    // Breaking Change Compliance Warning, Remove in Beta 15.
-    if (!(componentClass.prototype instanceof Modal)) {
-      // This is duplicated so that if the error is caught, an error message still shows up in the debug console.
-      console.error('The ModalManager can only show Modals');
-      throw new Error('The ModalManager can only show Modals');
-    }
-    if (componentClass.init) {
-      // This is duplicated so that if the error is caught, an error message still shows up in the debug console.
-      console.error(
-        'The componentClass parameter must be a modal class, not a modal instance. Whichever extension triggered this modal should be updated to comply with beta 14.'
-      );
-      throw new Error(
-        'The componentClass parameter must be a modal class, not a modal instance. Whichever extension triggered this modal should be updated to comply with beta 14.'
-      );
-    }
-    // End Change Compliance Warning, Remove in Beta 15
-
-    clearTimeout(this.closeTimeout);
-
-    this.modal = { componentClass, attrs };
-
-    m.redraw.sync();
-  }
-
-  /**
-   * Close the modal dialog.
-   *
-   * @public
-   */
-  close() {
-    if (!this.modal) return;
-
-    // Don't hide the modal immediately, because if the consumer happens to call
-    // the `show` method straight after to show another modal dialog, it will
-    // cause Bootstrap's modal JS to misbehave. Instead we will wait for a tiny
-    // bit to give the `show` method the opportunity to prevent this from going
-    // ahead.
-    this.closeTimeout = setTimeout(() => {
-      this.modal = null;
-      m.redraw();
-    });
-  }
-}

js/src/common/utils/ItemList.js

@@ -1,9 +1,5 @@
 class Item {
-  content: any;
+  constructor(content, priority) {
-  priority: number;
-  key?: number;
-
-  constructor(content: any, priority?: number) {
     this.content = content;
     this.priority = priority;
   }
@@ -14,15 +10,23 @@ class Item {
  * by priority.
  */
 export default class ItemList {
-  /**
+  constructor() {
-   * The items in the list
+    /**
-   */
+     * The items in the list.
-  items: { [key: string]: Item } = {};
+     *
+     * @type {Object}
+     * @public
+     */
+    this.items = {};
+  }
 
   /**
    * Check whether the list is empty.
+   *
+   * @returns {boolean}
+   * @public
    */
-  isEmpty(): boolean {
+  isEmpty() {
     for (const i in this.items) {
       if (this.items.hasOwnProperty(i)) {
         return false;
@@ -34,27 +38,36 @@ export default class ItemList {
 
   /**
    * Check whether an item is present in the list.
+   *
+   * @param key
+   * @returns {boolean}
    */
-  has(key: string): boolean {
+  has(key) {
     return !!this.items[key];
   }
 
   /**
    * Get the content of an item.
+   *
+   * @param {String} key
+   * @return {*}
+   * @public
    */
-  get(key: string): any {
+  get(key) {
     return this.items[key].content;
   }
 
   /**
    * Add an item to the list.
    *
-   * @param key A unique key for the item.
+   * @param {String} key A unique key for the item.
-   * @param content The item's content.
+   * @param {*} content The item's content.
-   * @param [priority] The priority of the item. Items with a higher
+   * @param {Integer} [priority] The priority of the item. Items with a higher
    *     priority will be positioned before items with a lower priority.
+   * @return {ItemList}
+   * @public
    */
-  add(key: string, content: any, priority: number = 0): this {
+  add(key, content, priority = 0) {
     this.items[key] = new Item(content, priority);
 
     return this;
@@ -62,8 +75,14 @@ export default class ItemList {
 
   /**
    * Replace an item in the list, only if it is already present.
+   *
+   * @param {String} key
+   * @param {*} [content]
+   * @param {Integer} [priority]
+   * @return {ItemList}
+   * @public
    */
-  replace(key: string, content: any = null, priority: number = null): this {
+  replace(key, content = null, priority = null) {
     if (this.items[key]) {
       if (content !== null) {
         this.items[key].content = content;
@@ -79,8 +98,12 @@ export default class ItemList {
 
   /**
    * Remove an item from the list.
+   *
+   * @param {String} key
+   * @return {ItemList}
+   * @public
    */
-  remove(key: string): this {
+  remove(key) {
     delete this.items[key];
 
     return this;
@@ -88,8 +111,12 @@ export default class ItemList {
 
   /**
    * Merge another list's items into this one.
+   *
+   * @param {ItemList} items
+   * @return {ItemList}
+   * @public
    */
-  merge(items: this): this {
+  merge(items) {
     for (const i in items.items) {
       if (items.items.hasOwnProperty(i) && items.items[i] instanceof Item) {
         this.items[i] = items.items[i];
@@ -103,9 +130,12 @@ export default class ItemList {
    * Convert the list into an array of item content arranged by priority. Each
    * item's content will be assigned an `itemName` property equal to the item's
    * unique key.
+   *
+   * @return {Array}
+   * @public
    */
-  toArray(): any[] {
+  toArray() {
-    const items: Item[] = [];
+    const items = [];
 
     for (const i in this.items) {
       if (this.items.hasOwnProperty(i) && this.items[i] instanceof Item) {

js/src/common/utils/RequestError.js

@@ -1,14 +1,5 @@
 export default class RequestError {
-  status: string;
+  constructor(status, responseText, options, xhr) {
-  options: object;
-  xhr: XMLHttpRequest;
-
-  responseText: string | null;
-  response: object | null;
-
-  alert: any;
-
-  constructor(status: string, responseText: string | null, options: object, xhr: XMLHttpRequest) {
     this.status = status;
     this.responseText = responseText;
     this.options = options;

js/src/common/utils/Stream.js

@@ -1,3 +0,0 @@
-import Stream from 'mithril/stream';
-
-export default Stream;

js/src/common/utils/SubtreeRetainer.js

@@ -1,25 +1,20 @@
 /**
- * The `SubtreeRetainer` class keeps track of a number of pieces of data,
+ * The `SubtreeRetainer` class represents a Mithril virtual DOM subtree. It
- * comparing the values of these pieces at every iteration.
+ * keeps track of a number of pieces of data, allowing the subtree to be
- *
+ * retained if none of them have changed.
- * This is useful for preventing redraws to relatively static (or huge)
- * components whose VDOM only depends on very few values, when none of them
- * have changed.
  *
  * @example
- * // Check two callbacks for changes on each update
+ * // constructor
  * this.subtree = new SubtreeRetainer(
- *   () => this.attrs.post.freshness,
+ *   () => this.props.post.freshness,
  *   () => this.showing
  * );
+ * this.subtree.check(() => this.props.user.freshness);
  *
- * // Add more callbacks to be checked for updates
+ * // view
- * this.subtree.check(() => this.attrs.user.freshness);
+ * this.subtree.retain() || 'expensive expression'
  *
- * // In a component's onbeforeupdate() method:
+ * @see https://lhorie.github.io/mithril/mithril.html#persisting-dom-elements-across-route-changes
- * return this.subtree.needsRebuild()
- *
- * @see https://mithril.js.org/lifecycle-methods.html#onbeforeupdate
  */
 export default class SubtreeRetainer {
   /**
@@ -28,19 +23,16 @@ export default class SubtreeRetainer {
   constructor(...callbacks) {
     this.callbacks = callbacks;
     this.data = {};
-    // Build the initial data, so it is available when calling
-    // needsRebuild from the onbeforeupdate hook.
-    this.needsRebuild();
   }
 
   /**
-   * Return whether any data has changed since the last check.
+   * Return a virtual DOM directive that will retain a subtree if no data has
-   * If so, Mithril needs to re-diff the vnode and its children.
+   * changed since the last check.
    *
-   * @return {boolean}
+   * @return {Object|false}
    * @public
    */
-  needsRebuild() {
+  retain() {
     let needsRebuild = false;
 
     this.callbacks.forEach((callback, i) => {
@@ -52,7 +44,7 @@ export default class SubtreeRetainer {
       }
     });
 
-    return needsRebuild;
+    return needsRebuild ? false : { subtree: 'retain' };
   }
 
   /**
@@ -63,8 +55,6 @@ export default class SubtreeRetainer {
    */
   check(...callbacks) {
     this.callbacks = this.callbacks.concat(callbacks);
-    // Update the data cache when new checks are added.
-    this.needsRebuild();
   }
 
   /**

js/src/common/utils/SuperTextarea.js

@@ -1,109 +0,0 @@
-/**
- * A textarea wrapper with powerful helpers for text manipulation.
- *
- * This wraps a <textarea> DOM element and allows directly manipulating its text
- * contents and cursor positions.
- *
- * I apologize for the pretentious name. :)
- */
-export default class SuperTextarea {
-  /**
-   * @param {HTMLTextAreaElement} textarea
-   */
-  constructor(textarea) {
-    this.el = textarea;
-    this.$ = $(textarea);
-  }
-
-  /**
-   * Set the value of the text editor.
-   *
-   * @param {String} value
-   */
-  setValue(value) {
-    this.$.val(value).trigger('input');
-
-    this.el.dispatchEvent(new CustomEvent('input', { bubbles: true, cancelable: true }));
-  }
-
-  /**
-   * Focus the textarea and place the cursor at the given index.
-   *
-   * @param {number} position
-   */
-  moveCursorTo(position) {
-    this.setSelectionRange(position, position);
-  }
-
-  /**
-   * Get the selected range of the textarea.
-   *
-   * @return {Array}
-   */
-  getSelectionRange() {
-    return [this.el.selectionStart, this.el.selectionEnd];
-  }
-
-  /**
-   * Insert content into the textarea at the position of the cursor.
-   *
-   * @param {String} text
-   */
-  insertAtCursor(text) {
-    this.insertAt(this.el.selectionStart, text);
-  }
-
-  /**
-   * Insert content into the textarea at the given position.
-   *
-   * @param {number} pos
-   * @param {String} text
-   */
-  insertAt(pos, text) {
-    this.insertBetween(pos, pos, text);
-  }
-
-  /**
-   * Insert content into the textarea between the given positions.
-   *
-   * If the start and end positions are different, any text between them will be
-   * overwritten.
-   *
-   * @param start
-   * @param end
-   * @param text
-   */
-  insertBetween(start, end, text) {
-    const value = this.el.value;
-
-    const before = value.slice(0, start);
-    const after = value.slice(end);
-
-    this.setValue(`${before}${text}${after}`);
-
-    // Move the textarea cursor to the end of the content we just inserted.
-    this.moveCursorTo(start + text.length);
-  }
-
-  /**
-   * Replace existing content from the start to the current cursor position.
-   *
-   * @param start
-   * @param text
-   */
-  replaceBeforeCursor(start, text) {
-    this.insertBetween(start, this.el.selectionStart, text);
-  }
-
-  /**
-   * Set the selected range of the textarea.
-   *
-   * @param {number} start
-   * @param {number} end
-   * @private
-   */
-  setSelectionRange(start, end) {
-    this.el.setSelectionRange(start, end);
-    this.$.focus();
-  }
-}

js/src/common/utils/abbreviateNumber.js

@@ -4,13 +4,16 @@
  * @example
  * abbreviateNumber(1234);
  * // "1.2K"
+ *
+ * @param {Integer} number
+ * @return {String}
  */
-export default function abbreviateNumber(number: number): string {
+export default function abbreviateNumber(number) {
   // TODO: translation
   if (number >= 1000000) {
     return Math.floor(number / 1000000) + app.translator.trans('core.lib.number_suffix.mega_text');
   } else if (number >= 1000) {
-    return (number / 1000).toFixed(1) + app.translator.trans('core.lib.number_suffix.kilo_text');
+    return Math.floor(number / 1000) + app.translator.trans('core.lib.number_suffix.kilo_text');
   } else {
     return number.toString();
   }

js/src/common/utils/extract.js

@@ -0,0 +1,15 @@
+/**
+ * The `extract` utility deletes a property from an object and returns its
+ * value.
+ *
+ * @param {Object} object The object that owns the property
+ * @param {String} property The name of the property to extract
+ * @return {*} The value of the property
+ */
+export default function extract(object, property) {
+  const value = object[property];
+
+  delete object[property];
+
+  return value;
+}

js/src/common/utils/extract.ts

@@ -1,15 +0,0 @@
-/**
- * The `extract` utility deletes a property from an object and returns its
- * value.
- *
- * @param object The object that owns the property
- * @param property The name of the property to extract
- * @return The value of the property
- */
-export default function extract<T, K extends keyof T>(object: T, property: K): T[K] {
-  const value = object[property];
-
-  delete object[property];
-
-  return value;
-}

js/src/common/utils/extractText.js

@@ -8,7 +8,7 @@ export default function extractText(vdom) {
   if (vdom instanceof Array) {
     return vdom.map((element) => extractText(element)).join('');
   } else if (typeof vdom === 'object' && vdom !== null) {
-    return vdom.children ? extractText(vdom.children) : vdom.text;
+    return extractText(vdom.children);
   } else {
     return vdom;
   }

js/src/common/utils/formatNumber.js

@@ -5,7 +5,10 @@
  * @example
  * formatNumber(1234);
  * // 1,234
+ *
+ * @param {Number} number
+ * @return {String}
  */
-export default function formatNumber(number: number): string {
+export default function formatNumber(number) {
   return number.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
 }

js/src/common/utils/humanTime.js

@@ -1,32 +1,35 @@
 /**
  * The `humanTime` utility converts a date to a localized, human-readable time-
  * ago string.
+ *
+ * @param {Date} time
+ * @return {String}
  */
-export default function humanTime(time: Date): string {
+export default function humanTime(time) {
-  let d = dayjs(time);
+  let m = moment(time);
-  const now = dayjs();
+  const now = moment();
 
   // To prevent showing things like "in a few seconds" due to small offsets
   // between client and server time, we always reset future dates to the
   // current time. This will result in "just now" being shown instead.
-  if (d.isAfter(now)) {
+  if (m.isAfter(now)) {
-    d = now;
+    m = now;
   }
 
   const day = 864e5;
-  const diff = d.diff(dayjs());
+  const diff = m.diff(moment());
-  let ago: string;
+  let ago = null;
 
   // If this date was more than a month ago, we'll show the name of the month
   // in the string. If it wasn't this year, we'll show the year as well.
   if (diff < -30 * day) {
-    if (d.year() === dayjs().year()) {
+    if (m.year() === moment().year()) {
-      ago = d.format('D MMM');
+      ago = m.format('D MMM');
     } else {
-      ago = d.format('ll');
+      ago = m.format('ll');
     }
   } else {
-    ago = d.fromNow();
+    ago = m.fromNow();
   }
 
   return ago;

js/src/common/utils/liveHumanTimes.js

@@ -1,18 +1,18 @@
-import humanTime from './humanTime';
+import humanTimeUtil from './humanTime';
 
 function updateHumanTimes() {
   $('[data-humantime]').each(function () {
     const $this = $(this);
-    const ago = humanTime($this.attr('datetime'));
+    const ago = humanTimeUtil($this.attr('datetime'));
 
     $this.html(ago);
   });
 }
 
 /**
- * The `liveHumanTimes` initializer sets up a loop every 1 second to update
+ * The `humanTime` initializer sets up a loop every 1 second to update
  * timestamps rendered with the `humanTime` helper.
  */
-export default function liveHumanTimes() {
+export default function humanTime() {
   setInterval(updateHumanTimes, 10000);
 }

js/src/common/utils/mapRoutes.js

@@ -2,7 +2,7 @@
  * The `mapRoutes` utility converts a map of named application routes into a
  * format that can be understood by Mithril.
  *
- * @see https://mithril.js.org/route.html#signature
+ * @see https://lhorie.github.io/mithril/mithril.route.html#defining-routes
  * @param {Object} routes
  * @param {String} [basePath]
  * @return {Object}
@@ -13,11 +13,9 @@ export default function mapRoutes(routes, basePath = '') {
   for (const key in routes) {
     const route = routes[key];
 
-    map[basePath + route.path] = {
+    if (route.component) route.component.props.routeName = key;
-      render() {
+
-        return m(route.component, { routeName: key });
+    map[basePath + route.path] = route.component;
-      },
-    };
   }
 
   return map;

js/src/common/utils/patchMithril.js

@@ -1,44 +1,45 @@
-import withAttr from './withAttr';
+import Component from '../Component';
-import Stream from './Stream';
-
-let deprecatedMPropWarned = false;
-let deprecatedMWithAttrWarned = false;
 
 export default function patchMithril(global) {
-  const defaultMithril = global.m;
+  const mo = global.m;
 
-  const modifiedMithril = function (comp, ...args) {
+  const m = function (comp, ...args) {
-    const node = defaultMithril.apply(this, arguments);
+    if (comp.prototype && comp.prototype instanceof Component) {
+      let children = args.slice(1);
+      if (children.length === 1 && Array.isArray(children[0])) {
+        children = children[0];
+      }
 
-    if (!node.attrs) node.attrs = {};
+      return comp.component(args[0], children);
+    }
+
+    const node = mo.apply(this, arguments);
 
-    // Allows the use of the bidi attr.
     if (node.attrs.bidi) {
-      modifiedMithril.bidi(node, node.attrs.bidi);
+      m.bidi(node, node.attrs.bidi);
+    }
+
+    if (node.attrs.route) {
+      node.attrs.href = node.attrs.route;
+      node.attrs.config = m.route;
+
+      delete node.attrs.route;
     }
 
     return node;
   };
 
-  Object.keys(defaultMithril).forEach((key) => (modifiedMithril[key] = defaultMithril[key]));
+  Object.keys(mo).forEach((key) => (m[key] = mo[key]));
 
-  // BEGIN DEPRECATED MITHRIL 2 BC LAYER
+  /**
-  modifiedMithril.prop = function (...args) {
+   * Redraw only if not in the middle of a computation (e.g. a route change).
-    if (!deprecatedMPropWarned) {
+   *
-      deprecatedMPropWarned = true;
+   * @return {void}
-      console.warn('m.prop() is deprecated, please use the Stream util (flarum/utils/Streams) instead.');
+   */
-    }
+  m.lazyRedraw = function () {
-    return Stream.bind(this)(...args);
+    m.startComputation();
+    m.endComputation();
   };
 
-  modifiedMithril.withAttr = function (...args) {
+  global.m = m;
-    if (!deprecatedMWithAttrWarned) {
-      deprecatedMWithAttrWarned = true;
-      console.warn("m.withAttr() is deprecated, please use flarum's withAttr util (flarum/utils/withAttr) instead.");
-    }
-    return withAttr.bind(this)(...args);
-  };
-  // END DEPRECATED MITHRIL 2 BC LAYER
-
-  global.m = modifiedMithril;
 }

js/src/common/utils/setRouteWithForcedRefresh.ts

@@ -1,15 +0,0 @@
-import Mithril from 'mithril';
-
-/**
- * Mithril 2 does not completely rerender the page if a route change leads to the same route
- * (or the same component handling a different route). This util calls m.route.set, forcing a reonit.
- *
- * @see https://mithril.js.org/route.html#key-parameter
- */
-export default function setRouteWithForcedRefresh(route: string, params = null, options: Mithril.RouteOptions = {}) {
-  const newOptions = { ...options };
-  newOptions.state = newOptions.state || {};
-  newOptions.state.key = Date.now();
-
-  m.route.set(route, params, newOptions);
-}

js/src/common/utils/string.js

@@ -1,7 +1,12 @@
 /**
  * Truncate a string to the given length, appending ellipses if necessary.
+ *
+ * @param {String} string
+ * @param {Number} length
+ * @param {Number} [start=0]
+ * @return {String}
  */
-export function truncate(string: string, length: number, start: number = 0): string {
+export function truncate(string, length, start = 0) {
   return (start > 0 ? '...' : '') + string.substring(start, start + length) + (string.length > start + length ? '...' : '');
 }
 
@@ -12,8 +17,11 @@ export function truncate(string: string, length: number, start: number = 0): str
  * NOTE: This method does not use the comparably sophisticated transliteration
  * mechanism that is employed in the backend. Therefore, it should only be used
  * to *suggest* slugs that can be overridden by the user.
+ *
+ * @param {String} string
+ * @return {String}
  */
-export function slug(string: string): string {
+export function slug(string) {
   return string
     .toLowerCase()
     .replace(/[^a-z0-9]/gi, '-')
@@ -24,8 +32,11 @@ export function slug(string: string): string {
 /**
  * Strip HTML tags and quotes out of the given string, replacing them with
  * meaningful punctuation.
+ *
+ * @param {String} string
+ * @return {String}
  */
-export function getPlainContent(string: string): string {
+export function getPlainContent(string) {
   const html = string.replace(/(<\/p>|<br>)/g, '$1 &nbsp;').replace(/<img\b[^>]*>/gi, ' ');
 
   const dom = $('<div/>').html(html);
@@ -44,7 +55,10 @@ getPlainContent.removeSelectors = ['blockquote', 'script'];
 
 /**
  * Make a string's first character uppercase.
+ *
+ * @param {String} string
+ * @return {String}
  */
-export function ucfirst(string: string): string {
+export function ucfirst(string) {
   return string.substr(0, 1).toUpperCase() + string.substr(1);
 }

js/src/common/utils/stringToColor.js

@@ -1,6 +1,4 @@
-type RGB = { r: number; g: number; b: number };
+function hsvToRgb(h, s, v) {
-
-function hsvToRgb(h: number, s: number, v: number): RGB {
   let r;
   let g;
   let b;
@@ -53,8 +51,11 @@ function hsvToRgb(h: number, s: number, v: number): RGB {
 
 /**
  * Convert the given string to a unique color.
+ *
+ * @param {String} string
+ * @return {String}
  */
-export default function stringToColor(string: string): string {
+export default function stringToColor(string) {
   let num = 0;
 
   // Convert the username into a number based on the ASCII value of each

js/src/common/utils/withAttr.ts

@@ -1,15 +0,0 @@
-/**
- * An event handler factory that makes it simpler to implement data binding
- * for component event listeners.
- *
- * The handler created by this factory passes the DOM element's attribute
- * identified by the first argument to the callback (usually a bidirectional
- * Mithril stream: https://mithril.js.org/stream.html#bidirectional-bindings).
- *
- * Replaces m.withAttr for Mithril 2.0.
- * @see https://mithril.js.org/archive/v0.2.5/mithril.withAttr.html
- */
-export default (key: string, cb: Function) =>
-  function (this: Element) {
-    cb(this.getAttribute(key) || this[key]);
-  };

js/src/forum/ForumApplication.js

@@ -1,5 +1,6 @@
 import History from './utils/History';
 import Pane from './utils/Pane';
+import ReplyComposer from './components/ReplyComposer';
 import DiscussionPage from './components/DiscussionPage';
 import SignUpModal from './components/SignUpModal';
 import HeaderPrimary from './components/HeaderPrimary';
@@ -14,8 +15,7 @@ import Application from '../common/Application';
 import Navigation from '../common/components/Navigation';
 import NotificationListState from './states/NotificationListState';
 import GlobalSearchState from './states/GlobalSearchState';
-import DiscussionListState from './states/DiscussionListState';
+import DiscussionListState from './state/DiscussionListState';
-import ComposerState from './states/ComposerState';
 
 export default class ForumApplication extends Application {
   /**
@@ -73,11 +73,6 @@ export default class ForumApplication extends Application {
    */
   search = new GlobalSearchState();
 
-  /*
-   * An object which controls the state of the composer.
-   */
-  composer = new ComposerState();
-
   constructor() {
     super();
 
@@ -89,7 +84,7 @@ export default class ForumApplication extends Application {
      *
      * @type {DiscussionListState}
      */
-    this.discussions = new DiscussionListState({}, this);
+    this.discussions = new DiscussionListState({ forumApp: this });
 
     /**
      * @deprecated beta 14, remove in beta 15.
@@ -115,15 +110,15 @@ export default class ForumApplication extends Application {
     this.routes[defaultAction].path = '/';
     this.history.push(defaultAction, this.translator.trans('core.forum.header.back_to_index_tooltip'), '/');
 
-    m.mount(document.getElementById('app-navigation'), { view: () => Navigation.component({ className: 'App-backControl', drawer: true }) });
+    m.mount(document.getElementById('app-navigation'), Navigation.component({ className: 'App-backControl', drawer: true }));
-    m.mount(document.getElementById('header-navigation'), Navigation);
+    m.mount(document.getElementById('header-navigation'), Navigation.component());
-    m.mount(document.getElementById('header-primary'), HeaderPrimary);
+    m.mount(document.getElementById('header-primary'), HeaderPrimary.component());
-    m.mount(document.getElementById('header-secondary'), HeaderSecondary);
+    m.mount(document.getElementById('header-secondary'), HeaderSecondary.component());
-    m.mount(document.getElementById('composer'), { view: () => Composer.component({ state: this.composer }) });
 
     this.pane = new Pane(document.getElementById('app'));
+    this.composer = m.mount(document.getElementById('composer'), Composer.component());
 
-    m.route.prefix = '';
+    m.route.mode = 'pathname';
     super.mount(this.forum.attribute('basePath'));
 
     alertEmailConfirmation(this);
@@ -143,6 +138,21 @@ export default class ForumApplication extends Application {
     });
   }
 
+  /**
+   * Check whether or not the user is currently composing a reply to a
+   * discussion.
+   *
+   * @param {Discussion} discussion
+   * @return {Boolean}
+   */
+  composingReplyTo(discussion) {
+    return (
+      this.composer.component instanceof ReplyComposer &&
+      this.composer.component.props.discussion === discussion &&
+      this.composer.position !== Composer.PositionEnum.HIDDEN
+    );
+  }
+
   /**
    * Check whether or not the user is currently viewing a discussion.
    *
@@ -161,8 +171,8 @@ export default class ForumApplication extends Application {
    * will be reloaded. Otherwise, a SignUpModal will be opened, prefilled
    * with the provided details.
    *
-   * @param {Object} payload A dictionary of attrs to pass into the sign up
+   * @param {Object} payload A dictionary of props to pass into the sign up
-   *     modal. A truthy `loggedIn` attr indicates that the user has logged
+   *     modal. A truthy `loggedIn` prop indicates that the user has logged
    *     in, and thus the page is reloaded.
    * @public
    */
@@ -170,7 +180,8 @@ export default class ForumApplication extends Application {
     if (payload.loggedIn) {
       window.location.reload();
     } else {
-      this.modal.show(SignUpModal, payload);
+      const modal = new SignUpModal(payload);
+      this.modal.show(modal);
     }
   }
 }

js/src/forum/compat.js

@@ -3,18 +3,12 @@ import compat from '../common/compat';
 import PostControls from './utils/PostControls';
 import KeyboardNavigatable from './utils/KeyboardNavigatable';
 import slidable from './utils/slidable';
+import affixSidebar from './utils/affixSidebar';
 import History from './utils/History';
 import DiscussionControls from './utils/DiscussionControls';
 import alertEmailConfirmation from './utils/alertEmailConfirmation';
 import UserControls from './utils/UserControls';
 import Pane from './utils/Pane';
-import ComposerState from './states/ComposerState';
-import DiscussionListState from './states/DiscussionListState';
-import GlobalSearchState from './states/GlobalSearchState';
-import NotificationListState from './states/NotificationListState';
-import PostStreamState from './states/PostStreamState';
-import SearchState from './states/SearchState';
-import AffixedSidebar from './components/AffixedSidebar';
 import DiscussionPage from './components/DiscussionPage';
 import LogInModal from './components/LogInModal';
 import ComposerBody from './components/ComposerBody';
@@ -61,7 +55,6 @@ import NotificationList from './components/NotificationList';
 import WelcomeHero from './components/WelcomeHero';
 import SignUpModal from './components/SignUpModal';
 import CommentPost from './components/CommentPost';
-import ComposerPostPreview from './components/ComposerPostPreview';
 import ReplyComposer from './components/ReplyComposer';
 import NotificationsPage from './components/NotificationsPage';
 import PostStreamScrubber from './components/PostStreamScrubber';
@@ -78,18 +71,12 @@ export default Object.assign(compat, {
   'utils/PostControls': PostControls,
   'utils/KeyboardNavigatable': KeyboardNavigatable,
   'utils/slidable': slidable,
+  'utils/affixSidebar': affixSidebar,
   'utils/History': History,
   'utils/DiscussionControls': DiscussionControls,
   'utils/alertEmailConfirmation': alertEmailConfirmation,
   'utils/UserControls': UserControls,
   'utils/Pane': Pane,
-  'states/ComposerState': ComposerState,
-  'states/DiscussionListState': DiscussionListState,
-  'states/GlobalSearchState': GlobalSearchState,
-  'states/NotificationListState': NotificationListState,
-  'states/PostStreamState': PostStreamState,
-  'states/SearchState': SearchState,
-  'components/AffixedSidebar': AffixedSidebar,
   'components/DiscussionPage': DiscussionPage,
   'components/LogInModal': LogInModal,
   'components/ComposerBody': ComposerBody,
@@ -136,7 +123,6 @@ export default Object.assign(compat, {
   'components/WelcomeHero': WelcomeHero,
   'components/SignUpModal': SignUpModal,
   'components/CommentPost': CommentPost,
-  'components/ComposerPostPreview': ComposerPostPreview,
   'components/ReplyComposer': ReplyComposer,
   'components/NotificationsPage': NotificationsPage,
   'components/PostStreamScrubber': PostStreamScrubber,

js/src/forum/components/AffixedSidebar.js

@@ -1,51 +0,0 @@
-import Component from '../../common/Component';
-
-/**
- * The `AffixedSidebar` component uses Bootstrap's "affix" plugin to keep a
- * sidebar navigation at the top of the viewport when scrolling.
- *
- * ### Children
- *
- * The component must wrap an element that itself wraps an <ul> element, which
- * will be "affixed".
- *
- * @see https://getbootstrap.com/docs/3.4/javascript/#affix
- */
-export default class AffixedSidebar extends Component {
-  view(vnode) {
-    return vnode.children[0];
-  }
-
-  oncreate(vnode) {
-    super.oncreate(vnode);
-
-    // Register the affix plugin to execute on every window resize (and trigger)
-    this.boundOnresize = this.onresize.bind(this);
-    $(window).on('resize', this.boundOnresize).resize();
-  }
-
-  onremove() {
-    $(window).off('resize', this.boundOnresize);
-  }
-
-  onresize() {
-    const $sidebar = this.$();
-    const $header = $('#header');
-    const $footer = $('#footer');
-    const $affixElement = $sidebar.find('> ul');
-
-    $(window).off('.affix');
-    $affixElement.removeClass('affix affix-top affix-bottom').removeData('bs.affix');
-
-    // Don't affix the sidebar if it is taller than the viewport (otherwise
-    // there would be no way to scroll through its content).
-    if ($sidebar.outerHeight(true) > $(window).height() - $header.outerHeight(true)) return;
-
-    $affixElement.affix({
-      offset: {
-        top: () => $sidebar.offset().top - $header.outerHeight(true) - parseInt($sidebar.css('margin-top'), 10),
-        bottom: () => (this.bottom = $footer.outerHeight(true)),
-      },
-    });
-  }
-}

js/src/forum/components/AvatarEditor.js

@@ -3,7 +3,6 @@ import avatar from '../../common/helpers/avatar';
 import icon from '../../common/helpers/icon';
 import listItems from '../../common/helpers/listItems';
 import ItemList from '../../common/utils/ItemList';
-import classList from '../../common/utils/classList';
 import Button from '../../common/components/Button';
 import LoadingIndicator from '../../common/components/LoadingIndicator';
 
@@ -11,15 +10,13 @@ import LoadingIndicator from '../../common/components/LoadingIndicator';
  * The `AvatarEditor` component displays a user's avatar along with a dropdown
  * menu which allows the user to upload/remove the avatar.
  *
- * ### Attrs
+ * ### Props
  *
  * - `className`
  * - `user`
  */
 export default class AvatarEditor extends Component {
-  oninit(vnode) {
+  init() {
-    super.oninit(vnode);
-
     /**
      * Whether or not an avatar upload is in progress.
      *
@@ -35,11 +32,17 @@ export default class AvatarEditor extends Component {
     this.isDraggedOver = false;
   }
 
+  static initProps(props) {
+    super.initProps(props);
+
+    props.className = props.className || '';
+  }
+
   view() {
-    const user = this.attrs.user;
+    const user = this.props.user;
 
     return (
-      <div className={classList(['AvatarEditor', 'Dropdown', this.attrs.className, this.loading && 'loading', this.isDraggedOver && 'dragover'])}>
+      <div className={'AvatarEditor Dropdown ' + this.props.className + (this.loading ? ' loading' : '') + (this.isDraggedOver ? ' dragover' : '')}>
         {avatar(user)}
         <a
           className={user.avatarUrl() ? 'Dropdown-toggle' : 'Dropdown-toggle AvatarEditor--noAvatar'}
@@ -52,7 +55,7 @@ export default class AvatarEditor extends Component {
           ondragend={this.disableDragover.bind(this)}
           ondrop={this.dropUpload.bind(this)}
         >
-          {this.loading ? <LoadingIndicator /> : user.avatarUrl() ? icon('fas fa-pencil-alt') : icon('fas fa-plus-circle')}
+          {this.loading ? LoadingIndicator.component() : user.avatarUrl() ? icon('fas fa-pencil-alt') : icon('fas fa-plus-circle')}
         </a>
         <ul className="Dropdown-menu Menu">{listItems(this.controlItems().toArray())}</ul>
       </div>
@@ -69,16 +72,20 @@ export default class AvatarEditor extends Component {
 
     items.add(
       'upload',
-      <Button icon="fas fa-upload" onclick={this.openPicker.bind(this)}>
+      Button.component({
-        {app.translator.trans('core.forum.user.avatar_upload_button')}
+        icon: 'fas fa-upload',
-      </Button>
+        children: app.translator.trans('core.forum.user.avatar_upload_button'),
+        onclick: this.openPicker.bind(this),
+      })
     );
 
     items.add(
       'remove',
-      <Button icon="fas fa-times" onclick={this.remove.bind(this)}>
+      Button.component({
-        {app.translator.trans('core.forum.user.avatar_remove_button')}
+        icon: 'fas fa-times',
-      </Button>
+        children: app.translator.trans('core.forum.user.avatar_remove_button'),
+        onclick: this.remove.bind(this),
+      })
     );
 
     return items;
@@ -127,7 +134,7 @@ export default class AvatarEditor extends Component {
    * @param {Event} e
    */
   quickUpload(e) {
-    if (!this.attrs.user.avatarUrl()) {
+    if (!this.props.user.avatarUrl()) {
       e.preventDefault();
       e.stopPropagation();
       this.openPicker();
@@ -142,6 +149,7 @@ export default class AvatarEditor extends Component {
 
     // Create a hidden HTML input element and click on it so the user can select
     // an avatar file. Once they have, we will upload it via the API.
+    const user = this.props.user;
     const $input = $('<input type="file">');
 
     $input
@@ -161,7 +169,7 @@ export default class AvatarEditor extends Component {
   upload(file) {
     if (this.loading) return;
 
-    const user = this.attrs.user;
+    const user = this.props.user;
     const data = new FormData();
     data.append('avatar', file);
 
@@ -171,9 +179,9 @@ export default class AvatarEditor extends Component {
     app
       .request({
         method: 'POST',
-        url: `${app.forum.attribute('apiUrl')}/users/${user.id()}/avatar`,
+        url: app.forum.attribute('apiUrl') + '/users/' + user.id() + '/avatar',
         serialize: (raw) => raw,
-        body: data,
+        data,
       })
       .then(this.success.bind(this), this.failure.bind(this));
   }
@@ -182,7 +190,7 @@ export default class AvatarEditor extends Component {
    * Remove the user's avatar.
    */
   remove() {
-    const user = this.attrs.user;
+    const user = this.props.user;
 
     this.loading = true;
     m.redraw();
@@ -190,7 +198,7 @@ export default class AvatarEditor extends Component {
     app
       .request({
         method: 'DELETE',
-        url: `${app.forum.attribute('apiUrl')}/users/${user.id()}/avatar`,
+        url: app.forum.attribute('apiUrl') + '/users/' + user.id() + '/avatar',
       })
       .then(this.success.bind(this), this.failure.bind(this));
   }
@@ -204,7 +212,7 @@ export default class AvatarEditor extends Component {
    */
   success(response) {
     app.store.pushPayload(response);
-    delete this.attrs.user.avatarColor;
+    delete this.props.user.avatarColor;
 
     this.loading = false;
     m.redraw();

js/src/forum/components/ChangeEmailModal.js

@@ -1,14 +1,13 @@
 import Modal from '../../common/components/Modal';
 import Button from '../../common/components/Button';
-import Stream from '../../common/utils/Stream';
 
 /**
  * The `ChangeEmailModal` component shows a modal dialog which allows the user
  * to change their email address.
  */
 export default class ChangeEmailModal extends Modal {
-  oninit(vnode) {
+  init() {
-    super.oninit(vnode);
+    super.init();
 
     /**
      * Whether or not the email has been changed successfully.
@@ -22,14 +21,14 @@ export default class ChangeEmailModal extends Modal {
      *
      * @type {function}
      */
-    this.email = Stream(app.session.user.email());
+    this.email = m.prop(app.session.user.email());
 
     /**
      * The value of the password input.
      *
      * @type {function}
      */
-    this.password = Stream('');
+    this.password = m.prop('');
   }
 
   className() {
@@ -82,14 +81,12 @@ export default class ChangeEmailModal extends Modal {
             />
           </div>
           <div className="Form-group">
-            {Button.component(
+            {Button.component({
-              {
+              className: 'Button Button--primary Button--block',
-                className: 'Button Button--primary Button--block',
+              type: 'submit',
-                type: 'submit',
+              loading: this.loading,
-                loading: this.loading,
+              children: app.translator.trans('core.forum.change_email.submit_button'),
-              },
+            })}
-              app.translator.trans('core.forum.change_email.submit_button')
-            )}
           </div>
         </div>
       </div>
@@ -125,7 +122,7 @@ export default class ChangeEmailModal extends Modal {
 
   onerror(error) {
     if (error.status === 401) {
-      error.alert.content = app.translator.trans('core.forum.change_email.incorrect_password_message');
+      error.alert.props.children = app.translator.trans('core.forum.change_email.incorrect_password_message');
     }
 
     super.onerror(error);

js/src/forum/components/ChangePasswordModal.js

@@ -20,14 +20,12 @@ export default class ChangePasswordModal extends Modal {
         <div className="Form Form--centered">
           <p className="helpText">{app.translator.trans('core.forum.change_password.text')}</p>
           <div className="Form-group">
-            {Button.component(
+            {Button.component({
-              {
+              className: 'Button Button--primary Button--block',
-                className: 'Button Button--primary Button--block',
+              type: 'submit',
-                type: 'submit',
+              loading: this.loading,
-                loading: this.loading,
+              children: app.translator.trans('core.forum.change_password.send_button'),
-              },
+            })}
-              app.translator.trans('core.forum.change_password.send_button')
-            )}
           </div>
         </div>
       </div>
@@ -43,7 +41,7 @@ export default class ChangePasswordModal extends Modal {
       .request({
         method: 'POST',
         url: app.forum.attribute('apiUrl') + '/forgot',
-        body: { email: app.session.user.email() },
+        data: { email: app.session.user.email() },
       })
       .then(this.hide.bind(this), this.loaded.bind(this));
   }

js/src/forum/components/CommentPost.js

@@ -1,3 +1,5 @@
+/*global s9e, hljs*/
+
 import Post from './Post';
 import classList from '../../common/utils/classList';
 import PostUser from './PostUser';
@@ -7,20 +9,19 @@ import EditPostComposer from './EditPostComposer';
 import ItemList from '../../common/utils/ItemList';
 import listItems from '../../common/helpers/listItems';
 import Button from '../../common/components/Button';
-import ComposerPostPreview from './ComposerPostPreview';
 
 /**
  * The `CommentPost` component displays a standard `comment`-typed post. This
  * includes a number of item lists (controls, header, and footer) surrounding
  * the post's HTML content.
  *
- * ### Attrs
+ * ### Props
  *
  * - `post`
  */
 export default class CommentPost extends Post {
-  oninit(vnode) {
+  init() {
-    super.oninit(vnode);
+    super.init();
 
     /**
      * If the post has been hidden, then this flag determines whether or not its
@@ -30,56 +31,47 @@ export default class CommentPost extends Post {
      */
     this.revealContent = false;
 
-    /**
+    this.subtree.check(() => this.isEditing());
-     * Whether or not the user hover card inside of PostUser is visible.
-     * The property must be managed in CommentPost to be able to use it in the subtree check
-     *
-     * @type {Boolean}
-     */
-    this.cardVisible = false;
-
-    this.subtree.check(
-      () => this.cardVisible,
-      () => this.isEditing(),
-      () => this.revealContent
-    );
   }
 
   content() {
-    return super.content().concat([
+    // Note: we avoid using JSX for the <ul> below because it results in some
-      <header className="Post-header">
+    // weirdness in Mithril.js 0.1.x (see flarum/core#975). This workaround can
-        <ul>{listItems(this.headerItems().toArray())}</ul>
+    // be reverted when we upgrade to Mithril 1.0.
-      </header>,
+    return super
-      <div className="Post-body">
+      .content()
-        {this.isEditing() ? <ComposerPostPreview className="Post-preview" composer={app.composer} /> : m.trust(this.attrs.post.contentHtml())}
+      .concat([
-      </div>,
+        <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)} /> : m.trust(this.props.post.contentHtml())}
+        </div>,
+      ]);
   }
 
-  onupdate(vnode) {
+  config(isInitialized, context) {
-    super.onupdate();
+    super.config(...arguments);
 
-    const contentHtml = this.isEditing() ? '' : this.attrs.post.contentHtml();
+    const contentHtml = this.isEditing() ? '' : this.props.post.contentHtml();
 
     // If the post content has changed since the last render, we'll run through
     // all of the <script> tags in the content and evaluate them. This is
     // necessary because TextFormatter outputs them for e.g. syntax highlighting.
-    if (this.contentHtml !== contentHtml) {
+    if (context.contentHtml !== contentHtml) {
       this.$('.Post-body script').each(function () {
         eval.call(window, $(this).text());
       });
     }
 
-    this.contentHtml = contentHtml;
+    context.contentHtml = contentHtml;
   }
 
   isEditing() {
-    return app.composer.bodyMatches(EditPostComposer, { post: this.attrs.post });
+    return app.composer.component instanceof EditPostComposer && app.composer.component.props.post === this.props.post;
   }
 
-  elementAttrs() {
+  attrs() {
-    const post = this.attrs.post;
+    const post = this.props.post;
-    const attrs = super.elementAttrs();
+    const attrs = super.attrs();
 
     attrs.className =
       (attrs.className || '') +
@@ -95,6 +87,27 @@ export default class CommentPost extends Post {
     return attrs;
   }
 
+  configPreview(element, isInitialized, context) {
+    if (isInitialized) return;
+
+    // Every 50ms, if the composer content has changed, then update the post's
+    // body with a preview.
+    let preview;
+    const updatePreview = () => {
+      const content = app.composer.component.content();
+
+      if (preview === content) return;
+
+      preview = content;
+
+      s9e.TextFormatter.preview(preview || '', element);
+    };
+    updatePreview();
+
+    const updateInterval = setInterval(updatePreview, 50);
+    context.onunload = () => clearInterval(updateInterval);
+  }
+
   /**
    * Toggle the visibility of a hidden post's content.
    */
@@ -109,24 +122,9 @@ export default class CommentPost extends Post {
    */
   headerItems() {
     const items = new ItemList();
-    const post = this.attrs.post;
+    const post = this.props.post;
 
-    items.add(
+    items.add('user', PostUser.component({ post }), 100);
-      'user',
-      PostUser.component({
-        post,
-        cardVisible: this.cardVisible,
-        oncardshow: () => {
-          this.cardVisible = true;
-          m.redraw();
-        },
-        oncardhide: () => {
-          this.cardVisible = false;
-          m.redraw();
-        },
-      }),
-      100
-    );
     items.add('meta', PostMeta.component({ post }));
 
     if (post.isEdited() && !post.isHidden()) {

js/src/forum/components/Composer.js

@@ -3,23 +3,28 @@ import ItemList from '../../common/utils/ItemList';
 import ComposerButton from './ComposerButton';
 import listItems from '../../common/helpers/listItems';
 import classList from '../../common/utils/classList';
-import ComposerState from '../states/ComposerState';
 
 /**
  * The `Composer` component displays the composer. It can be loaded with a
  * content component with `load` and then its position/state can be altered with
  * `show`, `hide`, `close`, `minimize`, `fullScreen`, and `exitFullScreen`.
  */
-export default class Composer extends Component {
+class Composer extends Component {
-  oninit(vnode) {
+  init() {
-    super.oninit(vnode);
+    /**
+     * The composer's current position.
+     *
+     * @type {Composer.PositionEnum}
+     */
+    this.position = Composer.PositionEnum.HIDDEN;
 
     /**
-     * The composer's "state".
+     * The composer's intended height, which can be modified by the user
+     * (by dragging the composer handle).
      *
-     * @type {ComposerState}
+     * @type {Integer}
      */
-    this.state = this.attrs.state;
+    this.height = null;
 
     /**
      * Whether or not the composer currently has focus.
@@ -27,52 +32,48 @@ export default class Composer extends Component {
      * @type {Boolean}
      */
     this.active = false;
-
-    // Store the initial position so that we can trigger animations correctly.
-    this.prevPosition = this.state.position;
   }
 
   view() {
-    const body = this.state.body;
     const classes = {
-      normal: this.state.position === ComposerState.Position.NORMAL,
+      normal: this.position === Composer.PositionEnum.NORMAL,
-      minimized: this.state.position === ComposerState.Position.MINIMIZED,
+      minimized: this.position === Composer.PositionEnum.MINIMIZED,
-      fullScreen: this.state.position === ComposerState.Position.FULLSCREEN,
+      fullScreen: this.position === Composer.PositionEnum.FULLSCREEN,
       active: this.active,
-      visible: this.state.isVisible(),
     };
+    classes.visible = classes.normal || classes.minimized || classes.fullScreen;
 
-    // Set up a handler so that clicks on the content will show the composer.
+    // If the composer is minimized, tell the composer's content component that
-    const showIfMinimized = this.state.position === ComposerState.Position.MINIMIZED ? this.state.show.bind(this.state) : undefined;
+    // it shouldn't let the user interact with it. Set up a handler so that if
+    // the content IS clicked, the composer will be shown.
+    if (this.component) this.component.props.disabled = classes.minimized;
+
+    const showIfMinimized = this.position === Composer.PositionEnum.MINIMIZED ? this.show.bind(this) : undefined;
 
     return (
       <div className={'Composer ' + classList(classes)}>
-        <div className="Composer-handle" oncreate={this.configHandle.bind(this)} />
+        <div className="Composer-handle" config={this.configHandle.bind(this)} />
         <ul className="Composer-controls">{listItems(this.controlItems().toArray())}</ul>
         <div className="Composer-content" onclick={showIfMinimized}>
-          {body.componentClass ? body.componentClass.component({ ...body.attrs, composer: this.state, disabled: classes.minimized }) : ''}
+          {this.component ? this.component.render() : ''}
         </div>
       </div>
     );
   }
 
-  onupdate() {
+  config(isInitialized, context) {
-    if (this.state.position === this.prevPosition) {
+    // Set the height of the Composer element and its contents on each redraw,
-      // Set the height of the Composer element and its contents on each redraw,
+    // so that they do not lose it if their DOM elements are recreated.
-      // so that they do not lose it if their DOM elements are recreated.
+    this.updateHeight();
-      this.updateHeight();
-    } else {
-      this.animatePositionChange();
 
-      this.prevPosition = this.state.position;
+    if (isInitialized) return;
-    }
-  }
 
-  oncreate(vnode) {
+    // Since this component is a part of the global UI that persists between
-    super.oncreate(vnode);
+    // routes, we will flag the DOM to be retained across route changes.
+    context.retain = true;
 
     this.initializeHeight();
-    this.$().hide().css('bottom', -this.state.computedHeight());
+    this.$().hide().css('bottom', -this.computedHeight());
 
     // Whenever any of the inputs inside the composer are have focus, we want to
     // add a class to the composer to draw attention to it.
@@ -82,33 +83,45 @@ export default class Composer extends Component {
     });
 
     // When the escape key is pressed on any inputs, close the composer.
-    this.$().on('keydown', ':input', 'esc', () => this.state.close());
+    this.$().on('keydown', ':input', 'esc', () => this.close());
 
-    this.handlers = {};
+    // Don't let the user leave the page without first giving the composer's
+    // component a chance to scream at the user to make sure they don't
+    // unintentionally lose any contnet.
+    window.onbeforeunload = () => {
+      return (this.component && this.component.preventExit()) || undefined;
+    };
+
+    const handlers = {};
 
     $(window)
-      .on('resize', (this.handlers.onresize = this.updateHeight.bind(this)))
+      .on('resize', (handlers.onresize = this.updateHeight.bind(this)))
       .resize();
 
     $(document)
-      .on('mousemove', (this.handlers.onmousemove = this.onmousemove.bind(this)))
+      .on('mousemove', (handlers.onmousemove = this.onmousemove.bind(this)))
-      .on('mouseup', (this.handlers.onmouseup = this.onmouseup.bind(this)));
+      .on('mouseup', (handlers.onmouseup = this.onmouseup.bind(this)));
-  }
 
-  onremove() {
+    context.onunload = () => {
-    $(window).off('resize', this.handlers.onresize);
+      $(window).off('resize', handlers.onresize);
 
-    $(document).off('mousemove', this.handlers.onmousemove).off('mouseup', this.handlers.onmouseup);
+      $(document).off('mousemove', handlers.onmousemove).off('mouseup', handlers.onmouseup);
+    };
   }
 
   /**
    * Add the necessary event handlers to the composer's handle so that it can
    * be used to resize the composer.
+   *
+   * @param {DOMElement} element
+   * @param {Boolean} isInitialized
    */
-  configHandle(vnode) {
+  configHandle(element, isInitialized) {
+    if (isInitialized) return;
+
     const composer = this;
 
-    $(vnode.dom)
+    $(element)
       .css('cursor', 'row-resize')
       .bind('dragstart mousedown', (e) => e.preventDefault())
       .mousedown(function (e) {
@@ -153,20 +166,13 @@ export default class Composer extends Component {
     $('body').css('cursor', '');
   }
 
-  /**
-   * Draw focus to the first focusable content element (the text editor).
-   */
-  focus() {
-    this.$('.Composer-content :input:enabled:visible:first').focus();
-  }
-
   /**
    * Update the DOM to reflect the composer's current height. This involves
    * setting the height of the composer's root element, and adjusting the height
    * of any flexible elements inside the composer's body.
    */
   updateHeight() {
-    const height = this.state.computedHeight();
+    const height = this.computedHeight();
     const $flexible = this.$('.Composer-flexible');
 
     this.$().height(height);
@@ -187,59 +193,109 @@ export default class Composer extends Component {
    */
   updateBodyPadding() {
     const visible =
-      this.state.position !== ComposerState.Position.HIDDEN && this.state.position !== ComposerState.Position.MINIMIZED && app.screen() !== 'phone';
+      this.position !== Composer.PositionEnum.HIDDEN && this.position !== Composer.PositionEnum.MINIMIZED && this.$().css('position') !== 'absolute';
 
-    const paddingBottom = visible ? this.state.computedHeight() - parseInt($('#app').css('padding-bottom'), 10) : 0;
+    const paddingBottom = visible ? this.computedHeight() - parseInt($('#app').css('padding-bottom'), 10) : 0;
 
     $('#content').css({ paddingBottom });
   }
 
   /**
-   * Trigger the right animation depending on the desired new position.
+   * Determine whether or not the Composer is covering the screen.
+   *
+   * This will be true if the Composer is in full-screen mode on desktop, or
+   * if the Composer is positioned absolutely as on mobile devices.
+   *
+   * @return {Boolean}
+   * @public
    */
-  animatePositionChange() {
+  isFullScreen() {
-    // When exiting full-screen mode: focus content
+    return this.position === Composer.PositionEnum.FULLSCREEN || this.$().css('position') === 'absolute';
-    if (this.prevPosition === ComposerState.Position.FULLSCREEN) {
+  }
-      this.focus();
-      return;
-    }
 
-    switch (this.state.position) {
+  /**
-      case ComposerState.Position.HIDDEN:
+   * Confirm with the user that they want to close the composer and lose their
-        return this.hide();
+   * content.
-      case ComposerState.Position.MINIMIZED:
+   *
-        return this.minimize();
+   * @return {Boolean} Whether or not the exit was cancelled.
-      case ComposerState.Position.FULLSCREEN:
+   */
-        return this.focus();
+  preventExit() {
-      case ComposerState.Position.NORMAL:
+    if (this.component) {
-        return this.show();
+      const preventExit = this.component.preventExit();
+
+      if (preventExit) {
+        return !confirm(preventExit);
+      }
     }
   }
 
   /**
-   * Animate the Composer into the new position by changing the height.
+   * Load a content component into the composer.
+   *
+   * @param {Component} component
+   * @public
    */
-  animateHeightChange() {
+  load(component) {
+    if (this.preventExit()) return;
+
+    // If we load a similar component into the composer, then Mithril will be
+    // able to diff the old/new contents and some DOM-related state from the
+    // old composer will remain. To prevent this from happening, we clear the
+    // component and force a redraw, so that the new component will be working
+    // on a blank slate.
+    if (this.component) {
+      this.clear();
+      m.redraw(true);
+    }
+
+    this.component = component;
+  }
+
+  /**
+   * Clear the composer's content component.
+   *
+   * @public
+   */
+  clear() {
+    this.component = null;
+  }
+
+  /**
+   * Animate the Composer into the given position.
+   *
+   * @param {Composer.PositionEnum} position
+   */
+  animateToPosition(position) {
+    // Before we redraw the composer to its new state, we need to save the
+    // current height of the composer, as well as the page's scroll position, so
+    // that we can smoothly transition from the old to the new state.
+    const oldPosition = this.position;
     const $composer = this.$().stop(true);
     const oldHeight = $composer.outerHeight();
     const scrollTop = $(window).scrollTop();
 
+    this.position = position;
+
+    m.redraw(true);
+
+    // Now that we've redrawn and the composer's DOM has been updated, we want
+    // to update the composer's height. Once we've done that, we'll capture the
+    // real value to use as the end point for our animation later on.
     $composer.show();
     this.updateHeight();
 
     const newHeight = $composer.outerHeight();
 
-    if (this.prevPosition === ComposerState.Position.HIDDEN) {
+    if (oldPosition === Composer.PositionEnum.HIDDEN) {
       $composer.css({ bottom: -newHeight, height: newHeight });
     } else {
       $composer.css({ height: oldHeight });
     }
 
-    const animation = $composer.animate({ bottom: 0, height: newHeight }, 'fast').promise();
+    $composer.animate({ bottom: 0, height: newHeight }, 'fast', () => this.component.focus());
 
     this.updateBodyPadding();
     $(window).scrollTop(scrollTop);
-    return animation;
   }
 
   /**
@@ -257,30 +313,40 @@ export default class Composer extends Component {
   }
 
   /**
-   * Animate the composer sliding up from the bottom to take its normal height.
+   * Show the composer.
    *
-   * @private
+   * @public
    */
   show() {
-    this.animateHeightChange().then(() => this.focus());
+    if (this.position === Composer.PositionEnum.NORMAL || this.position === Composer.PositionEnum.FULLSCREEN) {
+      return;
+    }
 
-    if (app.screen() === 'phone') {
+    this.animateToPosition(Composer.PositionEnum.NORMAL);
+
+    if (this.isFullScreen()) {
       this.$().css('top', $(window).scrollTop());
       this.showBackdrop();
+      this.component.focus();
     }
   }
 
   /**
-   * Animate closing the composer.
+   * Close the composer.
    *
-   * @private
+   * @public
    */
   hide() {
     const $composer = this.$();
 
     // Animate the composer sliding down off the bottom edge of the viewport.
-    // Only when the animation is completed, update other elements on the page.
+    // Only when the animation is completed, update the Composer state flag and
+    // other elements on the page.
     $composer.stop(true).animate({ bottom: -$composer.height() }, 'fast', () => {
+      this.position = Composer.PositionEnum.HIDDEN;
+      this.clear();
+      m.redraw();
+
       $composer.hide();
       this.hideBackdrop();
       this.updateBodyPadding();
@@ -288,17 +354,60 @@ export default class Composer extends Component {
   }
 
   /**
-   * Shrink the composer until only its title is visible.
+   * Confirm with the user so they don't lose their content, then close the
+   * composer.
    *
-   * @private
+   * @public
+   */
+  close() {
+    if (!this.preventExit()) {
+      this.hide();
+    }
+  }
+
+  /**
+   * Minimize the composer. Has no effect if the composer is hidden.
+   *
+   * @public
    */
   minimize() {
-    this.animateHeightChange();
+    if (this.position === Composer.PositionEnum.HIDDEN) return;
+
+    this.animateToPosition(Composer.PositionEnum.MINIMIZED);
 
     this.$().css('top', 'auto');
     this.hideBackdrop();
   }
 
+  /**
+   * Take the composer into fullscreen mode. Has no effect if the composer is
+   * hidden.
+   *
+   * @public
+   */
+  fullScreen() {
+    if (this.position !== Composer.PositionEnum.HIDDEN) {
+      this.position = Composer.PositionEnum.FULLSCREEN;
+      m.redraw();
+      this.updateHeight();
+      this.component.focus();
+    }
+  }
+
+  /**
+   * Exit fullscreen mode.
+   *
+   * @public
+   */
+  exitFullScreen() {
+    if (this.position === Composer.PositionEnum.FULLSCREEN) {
+      this.position = Composer.PositionEnum.NORMAL;
+      m.redraw();
+      this.updateHeight();
+      this.component.focus();
+    }
+  }
+
   /**
    * Build an item list for the composer's controls.
    *
@@ -307,23 +416,23 @@ export default class Composer extends Component {
   controlItems() {
     const items = new ItemList();
 
-    if (this.state.position === ComposerState.Position.FULLSCREEN) {
+    if (this.position === Composer.PositionEnum.FULLSCREEN) {
       items.add(
         'exitFullScreen',
         ComposerButton.component({
           icon: 'fas fa-compress',
           title: app.translator.trans('core.forum.composer.exit_full_screen_tooltip'),
-          onclick: this.state.exitFullScreen.bind(this.state),
+          onclick: this.exitFullScreen.bind(this),
         })
       );
     } else {
-      if (this.state.position !== ComposerState.Position.MINIMIZED) {
+      if (this.position !== Composer.PositionEnum.MINIMIZED) {
         items.add(
           'minimize',
           ComposerButton.component({
             icon: 'fas fa-minus minimize',
             title: app.translator.trans('core.forum.composer.minimize_tooltip'),
-            onclick: this.state.minimize.bind(this.state),
+            onclick: this.minimize.bind(this),
             itemClassName: 'App-backControl',
           })
         );
@@ -333,7 +442,7 @@ export default class Composer extends Component {
           ComposerButton.component({
             icon: 'fas fa-expand',
             title: app.translator.trans('core.forum.composer.full_screen_tooltip'),
-            onclick: this.state.fullScreen.bind(this.state),
+            onclick: this.fullScreen.bind(this),
           })
         );
       }
@@ -343,7 +452,7 @@ export default class Composer extends Component {
         ComposerButton.component({
           icon: 'fas fa-times',
           title: app.translator.trans('core.forum.composer.close_tooltip'),
-          onclick: this.state.close.bind(this.state),
+          onclick: this.close.bind(this),
         })
       );
     }
@@ -355,10 +464,10 @@ export default class Composer extends Component {
    * Initialize default Composer height.
    */
   initializeHeight() {
-    this.state.height = localStorage.getItem('composerHeight');
+    this.height = localStorage.getItem('composerHeight');
 
-    if (!this.state.height) {
+    if (!this.height) {
-      this.state.height = this.defaultHeight();
+      this.height = this.defaultHeight();
     }
   }
 
@@ -370,14 +479,60 @@ export default class Composer extends Component {
     return this.$().height();
   }
 
+  /**
+   * Minimum height of the Composer.
+   * @returns {Integer}
+   */
+  minimumHeight() {
+    return 200;
+  }
+
+  /**
+   * Maxmimum height of the Composer.
+   * @returns {Integer}
+   */
+  maximumHeight() {
+    return $(window).height() - $('#header').outerHeight();
+  }
+
+  /**
+   * Computed the composer's current height, based on the intended height, and
+   * the composer's current state. This will be applied to the composer's
+   * content's DOM element.
+   * @returns {Integer|String}
+   */
+  computedHeight() {
+    // If the composer is minimized, then we don't want to set a height; we'll
+    // let the CSS decide how high it is. If it's fullscreen, then we need to
+    // make it as high as the window.
+    if (this.position === Composer.PositionEnum.MINIMIZED) {
+      return '';
+    } else if (this.position === Composer.PositionEnum.FULLSCREEN) {
+      return $(window).height();
+    }
+
+    // Otherwise, if it's normal or hidden, then we use the intended height.
+    // We don't let the composer get too small or too big, though.
+    return Math.max(this.minimumHeight(), Math.min(this.height, this.maximumHeight()));
+  }
+
   /**
    * Save a new Composer height and update the DOM.
    * @param {Integer} height
    */
   changeHeight(height) {
-    this.state.height = height;
+    this.height = height;
     this.updateHeight();
 
-    localStorage.setItem('composerHeight', this.state.height);
+    localStorage.setItem('composerHeight', this.height);
   }
 }
+
+Composer.PositionEnum = {
+  HIDDEN: 'hidden',
+  NORMAL: 'normal',
+  MINIMIZED: 'minimized',
+  FULLSCREEN: 'fullScreen',
+};
+
+export default Composer;

js/src/forum/components/ComposerBody.js

@@ -1,6 +1,5 @@
 import Component from '../../common/Component';
 import LoadingIndicator from '../../common/components/LoadingIndicator';
-import ConfirmDocumentUnload from '../../common/components/ConfirmDocumentUnload';
 import TextEditor from './TextEditor';
 import avatar from '../../common/helpers/avatar';
 import listItems from '../../common/helpers/listItems';
@@ -11,9 +10,8 @@ import ItemList from '../../common/utils/ItemList';
  * composer. Subclasses should implement the `onsubmit` method and override
  * `headerTimes`.
  *
- * ### Attrs
+ * ### Props
  *
- * - `composer`
  * - `originalContent`
  * - `submitLabel`
  * - `placeholder`
@@ -24,11 +22,7 @@ import ItemList from '../../common/utils/ItemList';
  * @abstract
  */
 export default class ComposerBody extends Component {
-  oninit(vnode) {
+  init() {
-    super.oninit(vnode);
-
-    this.composer = this.attrs.composer;
-
     /**
      * Whether or not the component is loading.
      *
@@ -36,57 +30,60 @@ export default class ComposerBody extends Component {
      */
     this.loading = false;
 
-    // Let the composer state know to ask for confirmation under certain
+    /**
-    // circumstances, if the body supports / requires it and has a corresponding
+     * The content of the text editor.
-    // confirmation question to ask.
+     *
-    if (this.attrs.confirmExit) {
+     * @type {Function}
-      this.composer.preventClosingWhen(() => this.hasChanges(), this.attrs.confirmExit);
+     */
-    }
+    this.content = m.prop(this.props.originalContent);
-
-    this.composer.fields.content(this.attrs.originalContent || '');
 
     /**
-     * @deprecated BC layer, remove in Beta 15.
+     * The text editor component instance.
+     *
+     * @type {TextEditor}
      */
-    this.content = this.composer.fields.content;
+    this.editor = new TextEditor({
-    this.editor = this.composer;
+      submitLabel: this.props.submitLabel,
+      placeholder: this.props.placeholder,
+      onchange: this.content,
+      onsubmit: this.onsubmit.bind(this),
+      value: this.content(),
+    });
   }
 
   view() {
+    // If the component is loading, we should disable the text editor.
+    this.editor.props.disabled = this.loading;
+
     return (
-      <ConfirmDocumentUnload when={this.hasChanges.bind(this)}>
+      <div className={'ComposerBody ' + (this.props.className || '')}>
-        <div className={'ComposerBody ' + (this.attrs.className || '')}>
+        {avatar(this.props.user, { className: 'ComposerBody-avatar' })}
-          {avatar(this.attrs.user, { className: 'ComposerBody-avatar' })}
+        <div className="ComposerBody-content">
-          <div className="ComposerBody-content">
+          <ul className="ComposerBody-header">{listItems(this.headerItems().toArray())}</ul>
-            <ul className="ComposerBody-header">{listItems(this.headerItems().toArray())}</ul>
+          <div className="ComposerBody-editor">{this.editor.render()}</div>
-            <div className="ComposerBody-editor">
-              {TextEditor.component({
-                submitLabel: this.attrs.submitLabel,
-                placeholder: this.attrs.placeholder,
-                disabled: this.loading || this.attrs.disabled,
-                composer: this.composer,
-                preview: this.jumpToPreview && this.jumpToPreview.bind(this),
-                onchange: this.composer.fields.content,
-                onsubmit: this.onsubmit.bind(this),
-                value: this.composer.fields.content(),
-              })}
-            </div>
-          </div>
-          {LoadingIndicator.component({ className: 'ComposerBody-loading' + (this.loading ? ' active' : '') })}
         </div>
-      </ConfirmDocumentUnload>
+        {LoadingIndicator.component({ className: 'ComposerBody-loading' + (this.loading ? ' active' : '') })}
+      </div>
     );
   }
 
   /**
-   * Check if there is any unsaved data.
+   * Draw focus to the text editor.
+   */
+  focus() {
+    this.$(':input:enabled:visible:first').focus();
+  }
+
+  /**
+   * Check if there is any unsaved data – if there is, return a confirmation
+   * message to prompt the user with.
    *
    * @return {String}
    */
-  hasChanges() {
+  preventExit() {
-    const content = this.composer.fields.content();
+    const content = this.content();
 
-    return content && content !== this.attrs.originalContent;
+    return content && content !== this.props.originalContent && this.props.confirmExit;
   }
 
   /**

js/src/forum/components/ComposerButton.js

@@ -5,9 +5,9 @@ import Button from '../../common/components/Button';
  * controls.
  */
 export default class ComposerButton extends Button {
-  static initAttrs(attrs) {
+  static initProps(props) {
-    super.initAttrs(attrs);
+    super.initProps(props);
 
-    attrs.className = attrs.className || 'Button Button--icon Button--link';
+    props.className = props.className || 'Button Button--icon Button--link';
   }
 }