Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2020-06-04 17:31:36 +0300
committerChristoph Wurst <christoph@winzerhof-wurst.at>2020-06-05 12:01:49 +0300
commit3f1b6e2ce903dc53633adb09527b6977bd2e930b (patch)
treeed26b345d56c51ac1679878839111af29285ddc1 /apps/theming/appinfo
parent81f83d3c1f9be926bf1898212e2445aa9c292dc1 (diff)
Move theming js to initial state
A bit more elegant. Plus it will allow us to also write a proper @nextcloud/theming package. To make life easier down the line for all. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'apps/theming/appinfo')
-rw-r--r--apps/theming/appinfo/app.php14
-rw-r--r--apps/theming/appinfo/routes.php5
2 files changed, 1 insertions, 18 deletions
diff --git a/apps/theming/appinfo/app.php b/apps/theming/appinfo/app.php
index bc8d009063a..784dad7d945 100644
--- a/apps/theming/appinfo/app.php
+++ b/apps/theming/appinfo/app.php
@@ -46,16 +46,4 @@ $linkToCSS = \OC::$server->getURLGenerator()->linkToRoute(
]
);
-$linkToJs = \OC::$server->getURLGenerator()->linkToRoute(
- 'theming.Theming.getJavascript',
- [
- 'v' => \OC::$server->getConfig()->getAppValue('theming', 'cachebuster', '0'),
- ]
-);
-\OCP\Util::addHeader(
- 'script',
- [
- 'src' => $linkToJs,
- 'nonce' => \OC::$server->getContentSecurityPolicyNonceManager()->getNonce()
- ], ''
-);
+\OCP\Util::addScript('theming', 'theming');
diff --git a/apps/theming/appinfo/routes.php b/apps/theming/appinfo/routes.php
index 13196662eb0..527397be985 100644
--- a/apps/theming/appinfo/routes.php
+++ b/apps/theming/appinfo/routes.php
@@ -55,11 +55,6 @@ return ['routes' => [
'verb' => 'GET',
],
[
- 'name' => 'Theming#getJavascript',
- 'url' => '/js/theming',
- 'verb' => 'GET',
- ],
- [
'name' => 'Theming#getManifest',
'url' => '/manifest/{app}',
'verb' => 'GET',