diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2016-08-11 19:37:17 +0200 |
---|---|---|
committer | Lukas Reschke <lukas@statuscode.ch> | 2016-08-11 19:37:17 +0200 |
commit | 8261ccce1be32c1467874d537240585c0d841600 (patch) | |
tree | 2b654700b2069eafbc2562e89621c748632c0e31 /apps/theming/appinfo | |
parent | 225eb27bcac1e710a4aba723483745bb3677460f (diff) | |
parent | f68f1d5f37e248aa7e5ac56e34fe79ce184ce149 (diff) | |
download | nextcloud-server-8261ccce1be32c1467874d537240585c0d841600.tar.gz nextcloud-server-8261ccce1be32c1467874d537240585c0d841600.zip |
Merge branch 'master' into implement_712
Diffstat (limited to 'apps/theming/appinfo')
-rw-r--r-- | apps/theming/appinfo/app.php | 12 | ||||
-rw-r--r-- | apps/theming/appinfo/routes.php | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/apps/theming/appinfo/app.php b/apps/theming/appinfo/app.php index fc64c2452ba..f558c35e61f 100644 --- a/apps/theming/appinfo/app.php +++ b/apps/theming/appinfo/app.php @@ -37,3 +37,15 @@ $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, + ], '' +); diff --git a/apps/theming/appinfo/routes.php b/apps/theming/appinfo/routes.php index e062a68d69d..4a8d4bac5bc 100644 --- a/apps/theming/appinfo/routes.php +++ b/apps/theming/appinfo/routes.php @@ -55,5 +55,10 @@ return ['routes' => [ 'url' => '/loginbackground', 'verb' => 'GET', ], + [ + 'name' => 'Theming#getJavascript', + 'url' => '/js/theming', + 'verb' => 'GET', + ], ]]; |