refactoring of asset loading

This commit is contained in:
Simon Vieille 2022-10-30 14:19:44 +01:00
parent 3e9a9fadf2
commit 58db21105f

View file

@ -8,13 +8,13 @@ use OC\User\User;
use OCA\SideMenu\Service\AppRepository; use OCA\SideMenu\Service\AppRepository;
use OCA\SideMenu\Service\CategoryRepository; use OCA\SideMenu\Service\CategoryRepository;
use OCA\SideMenu\Service\ConfigProxy; use OCA\SideMenu\Service\ConfigProxy;
use OCA\SideMenu\Util\AssetUtil;
use OCP\AppFramework\App; use OCP\AppFramework\App;
use OCP\AppFramework\Bootstrap\IBootContext; use OCP\AppFramework\Bootstrap\IBootContext;
use OCP\AppFramework\Bootstrap\IBootstrap; use OCP\AppFramework\Bootstrap\IBootstrap;
use OCP\AppFramework\Bootstrap\IRegistrationContext; use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCP\IUserSession; use OCP\IUserSession;
use OCP\Util; use OCP\Util;
use Psr\Container\ContainerInterface;
/** /**
* class Application. * class Application.
@ -72,21 +72,27 @@ class Application extends App implements IBootstrap
protected function addAssets() protected function addAssets()
{ {
Util::addScript(self::APP_ID, 'sideMenu'); AssetUtil::getInstance()
Util::addStyle(self::APP_ID, 'sideMenu'); // Add runtime.js
->addEntrypointAsset('menu', 'js', 0)
// Add menu.js
->addEntrypointAsset('menu', 'js', 1)
// Add menu.css
->addEntrypointAsset('menu', 'css', 0)
;
$assets = [ $assets = [
'stylesheet' => [ [
'route' => 'side_menu.Css.stylesheet',
'type' => 'link', 'type' => 'link',
'route' => 'side_menu.Css.stylesheet',
'route_attr' => 'href', 'route_attr' => 'href',
'attr' => [ 'attr' => [
'rel' => 'stylesheet', 'rel' => 'stylesheet',
], ],
], ],
'script' => [ [
'route' => 'side_menu.Js.script',
'type' => 'script', 'type' => 'script',
'route' => 'side_menu.Js.script',
'route_attr' => 'src', 'route_attr' => 'src',
'attr' => [ 'attr' => [
'nonce' => $this->cspnm->getNonce(), 'nonce' => $this->cspnm->getNonce(),
@ -99,7 +105,6 @@ class Application extends App implements IBootstrap
foreach ($assets as $value) { foreach ($assets as $value) {
$route = OC::$server->getURLGenerator()->linkToRoute($value['route'], ['v' => $cache]); $route = OC::$server->getURLGenerator()->linkToRoute($value['route'], ['v' => $cache]);
$value['attr'][$value['route_attr']] = $route; $value['attr'][$value['route_attr']] = $route;
Util::addHeader($value['type'], $value['attr'], ''); Util::addHeader($value['type'], $value['attr'], '');
} }
} }