From 55cbfd01a2e473e7846e914810e3b9dca26e21e2 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 24 Mar 2017 21:06:43 +0100
Subject: [PATCH] Merges JS

Removes 31 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
---
 appinfo/app.php              |  9 +--------
 js/merged.json               | 27 +++++++++++++++++++++++++++
 js/scripts-for-file-app.json | 10 ++++++++++
 templates/part.content.php   | 28 +---------------------------
 4 files changed, 39 insertions(+), 35 deletions(-)
 create mode 100644 js/merged.json
 create mode 100644 js/scripts-for-file-app.json

diff --git a/appinfo/app.php b/appinfo/app.php
index 27e8116b7..f28abd0a0 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -63,14 +63,7 @@ function () use ($c, $appName) {
 	/**
 	 * Scripts for the Files app
 	 */
-	Util::addScript($appName, 'vendor/bigshot/bigshot-compressed');
-	Util::addScript($appName, 'vendor/dompurify/src/purify');
-	Util::addScript($appName, 'galleryutility');
-	Util::addScript($appName, 'galleryfileaction');
-	Util::addScript($appName, 'slideshow');
-	Util::addScript($appName, 'slideshowcontrols');
-	Util::addScript($appName, 'slideshowzoomablepreview');
-	Util::addScript($appName, 'gallerybutton');
+	Util::addScript($appName, 'scripts-for-file-app');
 
 	/**
 	 * Styles for the Files app
diff --git a/js/merged.json b/js/merged.json
new file mode 100644
index 000000000..077a16a8c
--- /dev/null
+++ b/js/merged.json
@@ -0,0 +1,27 @@
+[
+  "app.js",
+  "vendor/jquery-touch-events/src/1.0.1/jquery.mobile-events.min.js",
+  "vendor/jquery.ui.touch-punch-custom.js",
+  "gallery.js",
+  "galleryutility.js",
+  "galleryconfig.js",
+  "galleryinfobox.js",
+  "galleryview.js",
+  "breadcrumb.js",
+  "galleryalbum.js",
+  "galleryrow.js",
+  "galleryimage.js",
+  "thumbnail.js",
+  "vendor/modified-eventsource-polyfill/eventsource-polyfill.js",
+  "eventsource.js",
+  "vendor/nextcloud/share.js",
+  "vendor/commonmark/dist/commonmark.min.js",
+  "vendor/dompurify/src/purify.js",
+  "vendor/bigshot/bigshot-compressed.js",
+  "slideshow.js",
+  "slideshowcontrols.js",
+  "slideshowzoomablepreview.js",
+  "upload-helper.js",
+  "vendor/nextcloud/newfilemenu.js",
+  "newfilemenuplugins.js"
+]
diff --git a/js/scripts-for-file-app.json b/js/scripts-for-file-app.json
new file mode 100644
index 000000000..2e6802e5d
--- /dev/null
+++ b/js/scripts-for-file-app.json
@@ -0,0 +1,10 @@
+[
+  "vendor/bigshot/bigshot-compressed.js",
+  "vendor/dompurify/src/purify.js",
+  "galleryutility.js",
+  "galleryfileaction.js",
+  "slideshow.js",
+  "slideshowcontrols.js",
+  "slideshowzoomablepreview.js",
+  "gallerybutton.js"
+]
diff --git a/templates/part.content.php b/templates/part.content.php
index 7962d42e2..2dd58c8a7 100644
--- a/templates/part.content.php
+++ b/templates/part.content.php
@@ -7,33 +7,7 @@
  */
 script(
 	$_['appName'],
-	[
-		'app',
-		'vendor/jquery-touch-events/src/1.0.1/jquery.mobile-events.min',
-		'vendor/jquery.ui.touch-punch-custom',
-		'gallery',
-		'galleryutility',
-		'galleryconfig',
-		'galleryinfobox',
-		'galleryview',
-		'breadcrumb',
-		'galleryalbum',
-		'galleryrow',
-		'galleryimage',
-		'thumbnail',
-		'vendor/modified-eventsource-polyfill/eventsource-polyfill',
-		'eventsource',
-		'vendor/nextcloud/share',
-		'vendor/commonmark/dist/commonmark.min',
-		'vendor/dompurify/src/purify',
-		'vendor/bigshot/bigshot-compressed',
-		'slideshow',
-		'slideshowcontrols',
-		'slideshowzoomablepreview',
-		'upload-helper',
-		'vendor/nextcloud/newfilemenu',
-		'newfilemenuplugins'
-	]
+	'merged'
 );
 script(
 	'files',