From a9c3692a9a11445b6efd7c986ed655b74990faa3 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Fri, 24 Mar 2017 20:08:27 +0100 Subject: [PATCH] Merge systemtags JS Shaves off 7 requests. Signed-off-by: Lukas Reschke --- apps/systemtags/appinfo/app.php | 11 ++--------- apps/systemtags/js/merged.json | 6 ++++++ core/js/systemtags/merged.json | 7 +++++++ 3 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 apps/systemtags/js/merged.json create mode 100644 core/js/systemtags/merged.json diff --git a/apps/systemtags/appinfo/app.php b/apps/systemtags/appinfo/app.php index bb2930e919..099ce7f9b9 100644 --- a/apps/systemtags/appinfo/app.php +++ b/apps/systemtags/appinfo/app.php @@ -30,15 +30,8 @@ $eventDispatcher->addListener( function() { // FIXME: no public API for these ? \OCP\Util::addScript('oc-backbone-webdav'); - \OCP\Util::addScript('systemtags/systemtags'); - \OCP\Util::addScript('systemtags/systemtagmodel'); - \OCP\Util::addScript('systemtags/systemtagsmappingcollection'); - \OCP\Util::addScript('systemtags/systemtagscollection'); - \OCP\Util::addScript('systemtags/systemtagsinputfield'); - \OCP\Util::addScript('systemtags', 'app'); - \OCP\Util::addScript('systemtags', 'systemtagsfilelist'); - \OCP\Util::addScript('systemtags', 'filesplugin'); - \OCP\Util::addScript('systemtags', 'systemtagsinfoview'); + \OCP\Util::addScript('systemtags/merged'); + \OCP\Util::addScript('systemtags', 'merged'); \OCP\Util::addStyle('systemtags'); \OCP\Util::addStyle('systemtags', 'systemtagsfilelist'); } diff --git a/apps/systemtags/js/merged.json b/apps/systemtags/js/merged.json new file mode 100644 index 0000000000..0262077498 --- /dev/null +++ b/apps/systemtags/js/merged.json @@ -0,0 +1,6 @@ +[ + "app.js", + "systemtagsfilelist.js", + "filesplugin.js", + "systemtagsinfoview.js" +] diff --git a/core/js/systemtags/merged.json b/core/js/systemtags/merged.json new file mode 100644 index 0000000000..846ba967ed --- /dev/null +++ b/core/js/systemtags/merged.json @@ -0,0 +1,7 @@ +[ + "systemtags.js", + "systemtagmodel.js", + "systemtagsmappingcollection.js", + "systemtagscollection.js", + "systemtagsinputfield.js" +]