From c761a16bba25d79a5fab7247871a609c1a756de1 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Fri, 24 Mar 2017 20:49:25 +0100 Subject: [PATCH] Merge Javascript Removes 2 requests. Signed-off-by: Lukas Reschke --- appinfo/app.php | 4 +--- js/merged.json | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 js/merged.json diff --git a/appinfo/app.php b/appinfo/app.php index 4c209cbf..aa1d7ef9 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -5,9 +5,7 @@ $eventDispatcher = \OC::$server->getEventDispatcher(); $eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', function() { OCP\Util::addStyle('files_texteditor', 'merged'); - OCP\Util::addScript('files_texteditor', 'editor'); - OCP\Util::addScript('files_texteditor', 'sidebarpreview'); - OCP\Util::addScript('files_texteditor', 'core/vendor/ace-builds/src-noconflict/ace'); + OCP\Util::addScript('files_texteditor', 'merged'); $cspManager = \OC::$server->getContentSecurityPolicyManager(); $csp = new \OCP\AppFramework\Http\ContentSecurityPolicy(); diff --git a/js/merged.json b/js/merged.json new file mode 100644 index 00000000..edaf1175 --- /dev/null +++ b/js/merged.json @@ -0,0 +1,5 @@ +[ + "editor.js", + "sidebarpreview.js", + "core/vendor/ace-builds/src-noconflict/ace.js" +]