summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/js/merged-share-backend.json11
-rw-r--r--lib/private/Share/Share.php11
2 files changed, 13 insertions, 9 deletions
diff --git a/core/js/merged-share-backend.json b/core/js/merged-share-backend.json
new file mode 100644
index 00000000000..d39945b8f79
--- /dev/null
+++ b/core/js/merged-share-backend.json
@@ -0,0 +1,11 @@
+[
+ "shareconfigmodel.js",
+ "shareitemmodel.js",
+ "sharesocialmanager.js",
+ "sharedialogresharerinfoview.js",
+ "sharedialoglinkshareview.js",
+ "sharedialogexpirationview.js",
+ "sharedialogshareelistview.js",
+ "sharedialogview.js",
+ "share.js"
+]
diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php
index 51da2cae82f..924e2f68396 100644
--- a/lib/private/Share/Share.php
+++ b/lib/private/Share/Share.php
@@ -50,6 +50,7 @@ use OCP\IUserManager;
use OCP\IUserSession;
use OCP\IDBConnection;
use OCP\IConfig;
+use OCP\Util;
/**
* This class provides the ability for apps to share their content between users.
@@ -92,15 +93,7 @@ class Share extends Constants {
'supportedFileExtensions' => $supportedFileExtensions
);
if(count(self::$backendTypes) === 1) {
- \OC_Util::addScript('core', 'shareconfigmodel');
- \OC_Util::addScript('core', 'shareitemmodel');
- \OC_Util::addScript('core', 'sharesocialmanager');
- \OC_Util::addScript('core', 'sharedialogresharerinfoview');
- \OC_Util::addScript('core', 'sharedialoglinkshareview');
- \OC_Util::addScript('core', 'sharedialogexpirationview');
- \OC_Util::addScript('core', 'sharedialogshareelistview');
- \OC_Util::addScript('core', 'sharedialogview');
- \OC_Util::addScript('core', 'share');
+ Util::addScript('core', 'merged-share-backend');
\OC_Util::addStyle('core', 'share');
}
return true;