mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-21 15:52:44 +02:00
Code Issues Releases Wiki Activity

Adapt new bootstrap format, use Asset extender

Browse Source
This commit is contained in:
Franz Liedke
2018-01-16 23:20:25 +01:00
parent 5931decedf
commit dd9907a26b
2 changed files with 24 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/tags/bootstrap.php
View File

@@ -9,11 +9,19 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
use Flarum\Extend;
use Flarum\Tags\Access; use Flarum\Tags\Access;
use Flarum\Tags\Listener; use Flarum\Tags\Listener;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
return function (Dispatcher $events) { return [
(new Extend\Assets('forum'))
->defaultAssets(__DIR__)
->bootstrapper('flarum/tags/main'),
(new Extend\Assets('admin'))
->defaultAssets(__DIR__)
->bootstrapper('flarum/tags/main'),
function (Dispatcher $events) {
$events->subscribe(Listener\AddClientAssets::class); $events->subscribe(Listener\AddClientAssets::class);
$events->subscribe(Listener\AddDiscussionTagsRelationship::class); $events->subscribe(Listener\AddDiscussionTagsRelationship::class);
$events->subscribe(Listener\AddForumTagsRelationship::class); $events->subscribe(Listener\AddForumTagsRelationship::class);
@@ -28,4 +36,5 @@ return function (Dispatcher $events) {
$events->subscribe(Access\DiscussionPolicy::class); $events->subscribe(Access\DiscussionPolicy::class);
$events->subscribe(Access\TagPolicy::class); $events->subscribe(Access\TagPolicy::class);
$events->subscribe(Access\FlagPolicy::class); $events->subscribe(Access\FlagPolicy::class);
}; },
];

24
extensions/tags/src/Listener/AddClientAssets.php
View File

@@ -12,7 +12,6 @@
namespace Flarum\Tags\Listener; namespace Flarum\Tags\Listener;
use Flarum\Event\ConfigureForumRoutes; use Flarum\Event\ConfigureForumRoutes;
use Flarum\Frontend\Event\Rendering;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
class AddClientAssets class AddClientAssets
@@ -22,32 +21,9 @@ class AddClientAssets
*/ */
public function subscribe(Dispatcher $events) public function subscribe(Dispatcher $events)
{ {
$events->listen(Rendering::class, [$this, 'addAssets']);
$events->listen(ConfigureForumRoutes::class, [$this, 'addRoutes']); $events->listen(ConfigureForumRoutes::class, [$this, 'addRoutes']);
} }
/**
* @param Rendering $app
*/
public function addAssets(Rendering $app)
{
if ($app->isForum()) {
$app->addAssets([
__DIR__.'/../../js/forum/dist/extension.js',
__DIR__.'/../../less/forum/extension.less'
]);
$app->addBootstrapper('flarum/tags/main');
}
if ($app->isAdmin()) {
$app->addAssets([
__DIR__.'/../../js/admin/dist/extension.js',
__DIR__.'/../../less/admin/extension.less'
]);
$app->addBootstrapper('flarum/tags/main');
}
}
/** /**
* @param ConfigureForumRoutes $routes * @param ConfigureForumRoutes $routes
*/ */