diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2017-03-22 14:47:07 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-03-24 10:58:10 +0100 |
| commit | 8e89ad21a2dfa8f4f147225ae35cab83db4de2f9 (patch) | |
| tree | 5c991eec18452d8da40ddedd6c8e372b77428223 /lib/private/TemplateLayout.php | |
| parent | 35d3a082f2a7256c104894faf6820a1410a0a38e (diff) | |
| download | nextcloud-server-8e89ad21a2dfa8f4f147225ae35cab83db4de2f9.tar.gz nextcloud-server-8e89ad21a2dfa8f4f147225ae35cab83db4de2f9.zip | |
[PoC] JS Combiner
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'lib/private/TemplateLayout.php')
| -rw-r--r-- | lib/private/TemplateLayout.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 3206a1d3ba8..064e590b20a 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -35,6 +35,7 @@ */ namespace OC; +use OC\Template\JSCombiner; use OC\Template\JSConfigHelper; use OC\Template\SCSSCacher; @@ -249,7 +250,12 @@ class TemplateLayout extends \OC_Template { \OC::$server->getLogger(), $theme, array( \OC::$SERVERROOT => \OC::$WEBROOT ), - array( \OC::$SERVERROOT => \OC::$WEBROOT )); + array( \OC::$SERVERROOT => \OC::$WEBROOT ), + new JSCombiner( + \OC::$server->getAppDataDir('js'), + \OC::$server->getURLGenerator() + ) + ); $locator->find($scripts); return $locator->getResources(); } |