From ea3035aa0e2d4b58532a127c7f3dbe0b41470a33 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 15 Jul 2016 14:39:57 +0200 Subject: Move JS inclusion to Controller * This way we can easier load files conditionally --- .../lib/Controllers/ShareController.php | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'apps/files_sharing/lib/Controllers/ShareController.php') diff --git a/apps/files_sharing/lib/Controllers/ShareController.php b/apps/files_sharing/lib/Controllers/ShareController.php index 11359e5f2f2..124d633b99f 100644 --- a/apps/files_sharing/lib/Controllers/ShareController.php +++ b/apps/files_sharing/lib/Controllers/ShareController.php @@ -353,6 +353,29 @@ class ShareController extends Controller { $shareTmpl['previewMaxX'] = $this->config->getSystemValue('preview_max_x', 1024); $shareTmpl['previewMaxY'] = $this->config->getSystemValue('preview_max_y', 1024); + // Load files we need + OCP\Util::addScript('files', 'file-upload'); + OCP\Util::addStyle('files_sharing', 'public'); + OCP\Util::addStyle('files_sharing', 'mobile'); + OCP\Util::addScript('files_sharing', 'public'); + OCP\Util::addScript('files', 'fileactions'); + OCP\Util::addScript('files', 'fileactionsmenu'); + OCP\Util::addScript('files', 'jquery.fileupload'); + OCP\Util::addScript('files_sharing', 'files_drop'); + + if (isset($shareTmpl['folder'])) { + // JS required for folders + OCP\Util::addStyle('files', 'files'); + OCP\Util::addStyle('files', 'upload'); + OCP\Util::addScript('files', 'filesummary'); + OCP\Util::addScript('files', 'breadcrumb'); + OCP\Util::addScript('files', 'fileinfomodel'); + OCP\Util::addScript('files', 'newfilemenu'); + OCP\Util::addScript('files', 'files'); + OCP\Util::addScript('files', 'filelist'); + OCP\Util::addscript('files', 'keyboardshortcuts'); + } + $csp = new OCP\AppFramework\Http\ContentSecurityPolicy(); $csp->addAllowedFrameDomain('\'self\''); $response = new TemplateResponse($this->appName, 'public', $shareTmpl, 'base'); -- cgit v1.2.3