From 89a54d6a5bb9c39b0f96791a82abe6211216a8e2 Mon Sep 17 00:00:00 2001 From: irkallacz Date: Sat, 24 Nov 2018 20:26:05 +0100 Subject: [PATCH 1/5] Make javascript compatible with CSP n:nonce macro is important when CSP is used and only way that direct JS is gona work is with nonce attribute (witch macro provide). It harmless otherwise. --- src/Echo511/Plupload/templates/control/plupload.latte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Echo511/Plupload/templates/control/plupload.latte b/src/Echo511/Plupload/templates/control/plupload.latte index b41de23..44808c0 100644 --- a/src/Echo511/Plupload/templates/control/plupload.latte +++ b/src/Echo511/Plupload/templates/control/plupload.latte @@ -2,7 +2,7 @@

Your browser doesn't have Flash, Silverlight or HTML5 support.

- \ No newline at end of file + From 6c25e5e388ae11cfdfbbedff220c8de5d476fab8 Mon Sep 17 00:00:00 2001 From: irkallacz Date: Sat, 13 Jul 2019 21:22:27 +0200 Subject: [PATCH 2/5] Replace class with factory In nette 3.0 services should be specified with factory not class attribute --- src/Echo511/Plupload/config/plupload.neon | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Echo511/Plupload/config/plupload.neon b/src/Echo511/Plupload/config/plupload.neon index 9e94dd9..89e07ff 100644 --- a/src/Echo511/Plupload/config/plupload.neon +++ b/src/Echo511/Plupload/config/plupload.neon @@ -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%] \ No newline at end of file + arguments: [%filename%, %name%] From 71600a9081a14ac5f83f67b94bb950b130a8c6d0 Mon Sep 17 00:00:00 2001 From: irkallacz Date: Sat, 13 Jul 2019 21:25:01 +0200 Subject: [PATCH 3/5] Extension nette 3.0 compatible Replace parseServices, with loadDefinitionsFromConfig method --- src/Echo511/Plupload/DI/PluploadExtension.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Echo511/Plupload/DI/PluploadExtension.php b/src/Echo511/Plupload/DI/PluploadExtension.php index 3881cab..17da326 100644 --- a/src/Echo511/Plupload/DI/PluploadExtension.php +++ b/src/Echo511/Plupload/DI/PluploadExtension.php @@ -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']); } From 149f3bf8d1c7389920ecc26ad00cedf189dca5e9 Mon Sep 17 00:00:00 2001 From: irkallacz Date: Sun, 21 Jul 2019 20:41:53 +0200 Subject: [PATCH 4/5] Update composer.json --- composer.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 7e0f201..c25e6f9 100644 --- a/composer.json +++ b/composer.json @@ -1,9 +1,8 @@ { - "name": "echo511/plupload", + "name": "irkallacz/plupload", "type": "library", "description": "Plupload component for Nette Framework.", - "keywords": [ - "echo511", + "keywords": "nette", "plupload" ], From ad9f16b031d1387b27bd13069dcc2495f112acf2 Mon Sep 17 00:00:00 2001 From: irkallacz Date: Sun, 21 Jul 2019 20:42:26 +0200 Subject: [PATCH 5/5] TYPO --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c25e6f9..40fc62b 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "irkallacz/plupload", "type": "library", "description": "Plupload component for Nette Framework.", - "keywords": + "keywords": [ "nette", "plupload" ],