summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-03-24 20:08:27 +0100
committerLukas Reschke <lukas@statuscode.ch>2017-03-24 20:08:27 +0100
commita9c3692a9a11445b6efd7c986ed655b74990faa3 (patch)
tree7bbb6c2b19f3df75f63cf54bd5e59a94f8f218b2
parent2cd79a8d3d6c160b9458327b1429eed9ec1a25a2 (diff)
downloadnextcloud-server-a9c3692a9a11445b6efd7c986ed655b74990faa3.tar.gz
nextcloud-server-a9c3692a9a11445b6efd7c986ed655b74990faa3.zip
Merge systemtags JS
Shaves off 7 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
-rw-r--r--apps/systemtags/appinfo/app.php11
-rw-r--r--apps/systemtags/js/merged.json6
-rw-r--r--core/js/systemtags/merged.json7
3 files changed, 15 insertions, 9 deletions
diff --git a/apps/systemtags/appinfo/app.php b/apps/systemtags/appinfo/app.php
index bb2930e9197..099ce7f9b95 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 00000000000..0262077498a
--- /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 00000000000..846ba967ed5
--- /dev/null
+++ b/core/js/systemtags/merged.json
@@ -0,0 +1,7 @@
+[
+ "systemtags.js",
+ "systemtagmodel.js",
+ "systemtagsmappingcollection.js",
+ "systemtagscollection.js",
+ "systemtagsinputfield.js"
+]