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