diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-05-20 16:53:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-20 16:53:30 -0500 |
| commit | 0dae4946cfec9124a8514af18f930c1361c55e71 (patch) | |
| tree | f6d1f95cd785b28d4e105ec9fca7c009a20eb4be /core | |
| parent | dfe944c27265c3cb1cdfb7afdacb2be9522c3873 (diff) | |
| parent | fb9f13d4c13d2ea3ba70095f36e73c8915fce47f (diff) | |
| download | nextcloud-server-0dae4946cfec9124a8514af18f930c1361c55e71.tar.gz nextcloud-server-0dae4946cfec9124a8514af18f930c1361c55e71.zip | |
Merge pull request #4854 from michaelletzgus/deferred-script-loading-v2
Make page loading faster, deferred script loading, now switchable:
Diffstat (limited to 'core')
| -rw-r--r-- | core/templates/layout.base.php | 9 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 9 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 9 |
3 files changed, 3 insertions, 24 deletions
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index e2e61e67e2c..7eb1cf5ffa4 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -12,20 +12,13 @@ <link rel="icon" href="<?php print_unescaped(image_path('', 'favicon.ico')); /* IE11+ supports png */ ?>"> <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>"> <link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path('', 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>"> - <?php if (isset($_['inline_ocjs'])): ?> - <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" type="text/javascript"> - <?php print_unescaped($_['inline_ocjs']); ?> - </script> - <?php endif; ?> <?php foreach ($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>"> <?php endforeach; ?> <?php foreach($_['printcssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print"> <?php endforeach; ?> - <?php foreach ($_['jsfiles'] as $jsfile): ?> - <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php print_unescaped($jsfile); ?>"></script> - <?php endforeach; ?> + <?php emit_script_loading_tags($_); ?> <?php print_unescaped($_['headers']); ?> </head> <body id="body-public"> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 2c2373d53aa..dc56edb0061 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -13,20 +13,13 @@ <link rel="icon" href="<?php print_unescaped(image_path('', 'favicon.ico')); /* IE11+ supports png */ ?>"> <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>"> <link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path('', 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>"> - <?php if (isset($_['inline_ocjs'])): ?> - <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" type="text/javascript"> - <?php print_unescaped($_['inline_ocjs']); ?> - </script> - <?php endif; ?> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>"> <?php endforeach; ?> <?php foreach($_['printcssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print"> <?php endforeach; ?> - <?php foreach($_['jsfiles'] as $jsfile): ?> - <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php print_unescaped($jsfile); ?>"></script> - <?php endforeach; ?> + <?php emit_script_loading_tags($_); ?> <?php print_unescaped($_['headers']); ?> </head> <body id="<?php p($_['bodyid']);?>"> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 978534b869c..aad9875f375 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -21,20 +21,13 @@ <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>"> <link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>"> <link rel="manifest" href="<?php print_unescaped(image_path($_['appid'], 'manifest.json')); ?>"> - <?php if (isset($_['inline_ocjs'])): ?> - <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" type="text/javascript"> - <?php print_unescaped($_['inline_ocjs']); ?> - </script> - <?php endif; ?> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>"> <?php endforeach; ?> <?php foreach($_['printcssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print"> <?php endforeach; ?> - <?php foreach($_['jsfiles'] as $jsfile): ?> - <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php print_unescaped($jsfile); ?>"></script> - <?php endforeach; ?> + <?php emit_script_loading_tags($_); ?> <?php print_unescaped($_['headers']); ?> </head> <body id="<?php p($_['bodyid']);?>"> |