diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-05-14 23:15:53 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-05-16 18:53:46 +0200 |
| commit | ce1e4425c2fc96f581428207edab040e42387bbc (patch) | |
| tree | f47242e46ef11b20867f283fa1906c87893c4a55 /core | |
| parent | f71fec8cdcb5d7d24b7dfa30dfaf24c5115e51c1 (diff) | |
| download | nextcloud-server-ce1e4425c2fc96f581428207edab040e42387bbc.tar.gz nextcloud-server-ce1e4425c2fc96f581428207edab040e42387bbc.zip | |
Combine and minimize core and default app js files
Diffstat (limited to 'core')
| -rw-r--r-- | core/minimizer.php | 13 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 3 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 3 |
3 files changed, 16 insertions, 3 deletions
diff --git a/core/minimizer.php b/core/minimizer.php index e4e6ff50e66..e5703053024 100644 --- a/core/minimizer.php +++ b/core/minimizer.php @@ -1,5 +1,12 @@ <?php -$minimizer = new OC_Minimizer_CSS(); -$files = $minimizer->findFiles(OC_Util::$core_styles); -$minimizer->output($files); +if ($service == 'core.css'){ + $minimizer = new OC_Minimizer_CSS(); + $files = $minimizer->findFiles(OC_Util::$core_styles); + $minimizer->output($files); +} +else if ($service == 'core.js'){ + $minimizer = new OC_Minimizer_JS(); + $files = $minimizer->findFiles(OC_Util::$core_scripts); + $minimizer->output($files); +} diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 37a74f46968..84422a10b18 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -15,6 +15,9 @@ var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>'; var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>'; </script> + <?php if (!defined('DEBUG') || !DEBUG): ?> + <script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script> + <?php endif ?> <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index e6fa910ce04..03b07c07283 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -15,6 +15,9 @@ var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>'; var oc_current_user = '<?php echo OC_User::getUser() ?>'; </script> + <?php if (!defined('DEBUG') || !DEBUG): ?> + <script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script> + <?php endif ?> <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> |