Inline oc.js when possible! #1917
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@rullzer, thanks for your PR! By analyzing the history of the files in this pull request, we identified @LukasReschke, @DeepDiver1975 and @icewind1991 to be potential reviewers. |
LukasReschke
requested changes
Oct 25, 2016
| /** @var JSConfigHelper */ | ||
| private $helper; | ||
|
|
||
| public function __construct($appName, |
| @@ -18,6 +18,11 @@ | |||
| <?php foreach($_['printcssfiles'] as $cssfile): ?> | |||
| <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print"> | |||
| <?php endforeach; ?> | |||
| <?php if (isset($_['inline_ocjs'])): ?> | |||
| <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" type="text/javascript"> | |||
| <?php echo($_['inline_ocjs']); ?> | |||
| @@ -19,6 +19,11 @@ | |||
| <?php foreach($_['printcssfiles'] as $cssfile): ?> | |||
| <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print"> | |||
| <?php endforeach; ?> | |||
| <?php if (isset($_['inline_ocjs'])): ?> | |||
| <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" type="text/javascript"> | |||
| <?php echo($_['inline_ocjs']); ?> | |||
| @@ -26,6 +26,11 @@ | |||
| <?php foreach($_['printcssfiles'] as $cssfile): ?> | |||
| <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print"> | |||
| <?php endforeach; ?> | |||
| <?php if (isset($_['inline_ocjs'])): ?> | |||
| <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" type="text/javascript"> | |||
| <?php echo($_['inline_ocjs']); ?> | |||
| @@ -102,7 +105,8 @@ public function __construct(IRequest $request, | |||
| $isLoggedIn, | |||
| $isAdminUser, | |||
| ContentSecurityPolicyManager $contentSecurityPolicyManager, | |||
| CsrfTokenManager $csrfTokenManager) { | |||
| CsrfTokenManager $csrfTokenManager, | |||
| ContentSecurityPolicyNonceManager $cspNonceManager) { | |||
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
@LukasReschke fixed |
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
LukasReschke
approved these changes
Oct 25, 2016
|
Good stuff! 👍 |
Current coverage is 57.34% (diff: 3.01%)@@ master #1917 diff @@
==========================================
Files 1076 1078 +2
Lines 61310 61498 +188
Methods 6871 6875 +4
Messages 0 0
Branches 0 0
==========================================
- Hits 35266 35265 -1
- Misses 26044 26233 +189
Partials 0 0
|
|
Code looks good and I tested this in Firefox, Safari, Chrome, IE and Edge. 👍 |
|
Small addition: #1920 :) |
|
Please also delete the old file, just cost björn and me some minutes to figure out, why the break point didn't stop... |
This was referenced Oct 31, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With #1871 in we can now do fancy pancy stuff. Like inline javascript safely.
This PR bring you the inlining of oc.js. This file was loaded on each pageload separatly and was a blocking call! Now if your browser support CSPv3 it will inline the file saving you a blocking (non cacheable request!).
@LukasReschke as discussed!
CC: @MorrisJobke @nickvergessen @icewind1991