From ac01d40b9a4f45fca5289c553725a9b467552a74 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Tue, 16 Jan 2018 23:17:23 +0100 Subject: [PATCH] Adapt new bootstrap format, use Asset extender --- extensions/akismet/bootstrap.php | 15 +++++-- .../akismet/src/Listener/AddClientAssets.php | 43 ------------------- 2 files changed, 11 insertions(+), 47 deletions(-) delete mode 100644 extensions/akismet/src/Listener/AddClientAssets.php diff --git a/extensions/akismet/bootstrap.php b/extensions/akismet/bootstrap.php index 90a4d068c..6e0b76e52 100644 --- a/extensions/akismet/bootstrap.php +++ b/extensions/akismet/bootstrap.php @@ -12,7 +12,14 @@ use Flarum\Akismet\Listener; use Illuminate\Contracts\Events\Dispatcher; -return function (Dispatcher $events) { - $events->subscribe(Listener\AddClientAssets::class); - $events->subscribe(Listener\FilterNewPosts::class); -}; +return [ + (new \Flarum\Extend\Assets('forum')) + ->asset(__DIR__.'/js/forum/dist/extension.js') + ->bootstrapper('flarum/akismet/main'), + (new \Flarum\Extend\Assets('admin')) + ->asset(__DIR__.'/js/admin/dist/extension.js') + ->bootstrapper('flarum/akismet/main'), + function (Dispatcher $events) { + $events->subscribe(Listener\FilterNewPosts::class); + } +]; diff --git a/extensions/akismet/src/Listener/AddClientAssets.php b/extensions/akismet/src/Listener/AddClientAssets.php deleted file mode 100644 index 4bb68152e..000000000 --- a/extensions/akismet/src/Listener/AddClientAssets.php +++ /dev/null @@ -1,43 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Flarum\Akismet\Listener; - -use Flarum\Frontend\Event\Rendering; -use Illuminate\Contracts\Events\Dispatcher; - -class AddClientAssets -{ - /** - * @param Dispatcher $events - */ - public function subscribe(Dispatcher $events) - { - $events->listen(Rendering::class, [$this, 'addAssets']); - } - - public function addAssets(Rendering $event) - { - if ($event->isForum()) { - $event->addAssets([ - __DIR__.'/../../js/forum/dist/extension.js' - ]); - $event->addBootstrapper('flarum/akismet/main'); - } - - if ($event->isAdmin()) { - $event->addAssets([ - __DIR__.'/../../js/admin/dist/extension.js' - ]); - $event->addBootstrapper('flarum/akismet/main'); - } - } -}