diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2019-10-17 10:27:13 +0200 |
|---|---|---|
| committer | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2019-10-17 18:22:54 +0200 |
| commit | 5c7c30822067ce99ecfa7cff803b28a86b8554c1 (patch) | |
| tree | 62b884b30f86a38f9e47056a6a7b54ffcf62ab12 | |
| parent | bd5189f29fc5b4340298f98f2f7a49aa3a157131 (diff) | |
| download | nextcloud-server-5c7c30822067ce99ecfa7cff803b28a86b8554c1.tar.gz nextcloud-server-5c7c30822067ce99ecfa7cff803b28a86b8554c1.zip | |
Include the share in the Files_Sharing::loadAdditionalScripts event
This provides a better context for apps using the event, for example to
load one script or another depending on whether the share is a file or a
folder.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| -rw-r--r-- | apps/files_sharing/lib/Controller/ShareController.php | 3 | ||||
| -rw-r--r-- | apps/files_sharing/tests/Controller/ShareControllerTest.php | 14 |
2 files changed, 14 insertions, 3 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index 0725e520b2d..f5cbb63e083 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -445,7 +445,8 @@ class ShareController extends AuthPublicShareController { \OCP\Util::addHeader('meta', ['property' => "og:type", 'content' => "object"]); \OCP\Util::addHeader('meta', ['property' => "og:image", 'content' => $ogPreview]); - $this->eventDispatcher->dispatch('OCA\Files_Sharing::loadAdditionalScripts'); + $event = new GenericEvent(null, ['share' => $share]); + $this->eventDispatcher->dispatch('OCA\Files_Sharing::loadAdditionalScripts', $event); $csp = new \OCP\AppFramework\Http\ContentSecurityPolicy(); $csp->addAllowedFrameDomain('\'self\''); diff --git a/apps/files_sharing/tests/Controller/ShareControllerTest.php b/apps/files_sharing/tests/Controller/ShareControllerTest.php index ea9bd8316e2..97e234ca22c 100644 --- a/apps/files_sharing/tests/Controller/ShareControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareControllerTest.php @@ -254,7 +254,12 @@ class ShareControllerTest extends \Test\TestCase { $this->eventDispatcher->expects($this->once()) ->method('dispatch') - ->with('OCA\Files_Sharing::loadAdditionalScripts'); + ->with( + 'OCA\Files_Sharing::loadAdditionalScripts', + $this->callback(function($event) use ($share) { + return $event->getArgument('share') === $share; + }) + ); $this->l10n->expects($this->any()) ->method('t') @@ -374,7 +379,12 @@ class ShareControllerTest extends \Test\TestCase { $this->eventDispatcher->expects($this->once()) ->method('dispatch') - ->with('OCA\Files_Sharing::loadAdditionalScripts'); + ->with( + 'OCA\Files_Sharing::loadAdditionalScripts', + $this->callback(function($event) use ($share) { + return $event->getArgument('share') === $share; + }) + ); $this->l10n->expects($this->any()) ->method('t') |