Skip to content

Make inline javascript compatible with CSP #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
irkallacz wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Make inline javascript compatible with CSP #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
89a54d6
Make javascript compatible with CSP
irkallacz Nov 24, 2018
55efc24
Merge pull request #1 from irkallacz/irkallacz-nonce-patch
irkallacz Nov 24, 2018
6c25e5e
Replace class with factory
irkallacz Jul 13, 2019
71600a9
Extension nette 3.0 compatible
irkallacz Jul 13, 2019
149f3bf
Update composer.json
irkallacz Jul 21, 2019
ad9f16b
TYPO
irkallacz Jul 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"name": "echo511/plupload",
"name": "irkallacz/plupload",
"type": "library",
"description": "Plupload component for Nette Framework.",
"keywords": [
"echo511",
"keywords": [
"nette",
"plupload"
],
Expand Down
4 changes: 1 addition & 3 deletions src/Echo511/Plupload/DI/PluploadExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ class PluploadExtension extends CompilerExtension
*/
public function loadConfiguration()
{
$builder = $this->getContainerBuilder();
$config = $this->loadFromFile(__DIR__ . '/../config/plupload.neon');
$namespace = 'Echo511.Plupload.DI';
$this->compiler->parseServices($builder, $config, $namespace);
$this->compiler->loadDefinitionsFromConfig($config['services']);
}


Expand Down
10 changes: 5 additions & 5 deletions src/Echo511/Plupload/config/plupload.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
services:
control:
class: Echo511\Plupload\Control\PluploadControl
factory: Echo511\Plupload\Control\PluploadControl
implement: Echo511\Plupload\Control\IPluploadControlFactory

uploader:
class: Echo511\Plupload\Service\Uploader(%tempDir%/echo511.plupload)
factory: Echo511\Plupload\Service\Uploader(%tempDir%/echo511.plupload)

uploadQueue:
class: Echo511\Plupload\Entity\UploadQueue
factory: Echo511\Plupload\Entity\UploadQueue
implement: Echo511\Plupload\Entity\IUploadQueueFactory
parameters: [id]
arguments: [%id%]

upload:
class: Echo511\Plupload\Entity\Upload
factory: Echo511\Plupload\Entity\Upload
implement: Echo511\Plupload\Entity\IUploadFactory
parameters: [filename, name]
arguments: [%filename%, %name%]
arguments: [%filename%, %name%]
4 changes: 2 additions & 2 deletions src/Echo511/Plupload/templates/control/plupload.latte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<p>Your browser doesn't have Flash, Silverlight or HTML5 support.</p>
</div>

<script type="text/javascript">
<script type="text/javascript" n:nonce>
$(function() {
$("#{$id|noescape}uploader").plupload({
runtimes : 'html5',
Expand Down Expand Up @@ -46,4 +46,4 @@ $(function() {
});

});
</script>
</script>