summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-03-24 21:11:58 +0100
committerGitHub <noreply@github.com>2017-03-24 21:11:58 +0100
commit3623431ac372b10e6613def018beb22d44a2e0d0 (patch)
tree418d5a2dc66a63aaba235b444e6f4e3f6767d746
parentc628095edeb7abde943810554d1d4de81454290c (diff)
parent0ed56589cccbb9421da24a60b7ab575df7a5a40e (diff)
downloadnextcloud-server-3623431ac372b10e6613def018beb22d44a2e0d0.tar.gz
nextcloud-server-3623431ac372b10e6613def018beb22d44a2e0d0.zip
Merge pull request #4040 from nextcloud/merge-js-for-versions
Merge JS for files_versions
-rw-r--r--apps/files_versions/js/merged.json6
-rw-r--r--apps/files_versions/lib/Hooks.php5
2 files changed, 7 insertions, 4 deletions
diff --git a/apps/files_versions/js/merged.json b/apps/files_versions/js/merged.json
new file mode 100644
index 00000000000..1a7fbad298b
--- /dev/null
+++ b/apps/files_versions/js/merged.json
@@ -0,0 +1,6 @@
+[
+ "versionmodel.js",
+ "versioncollection.js",
+ "versionstabview.js",
+ "filesplugin.js"
+]
diff --git a/apps/files_versions/lib/Hooks.php b/apps/files_versions/lib/Hooks.php
index 5181bb1b1ab..3753d8b5016 100644
--- a/apps/files_versions/lib/Hooks.php
+++ b/apps/files_versions/lib/Hooks.php
@@ -163,9 +163,6 @@ class Hooks {
* Load additional scripts when the files app is visible
*/
public static function onLoadFilesAppScripts() {
- \OCP\Util::addScript('files_versions', 'versionmodel');
- \OCP\Util::addScript('files_versions', 'versioncollection');
- \OCP\Util::addScript('files_versions', 'versionstabview');
- \OCP\Util::addScript('files_versions', 'filesplugin');
+ \OCP\Util::addScript('files_versions', 'merged');
}
}