Skip to content

Merge sharing backend JS #4042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukasReschke merged 1 commit into from
Mar 24, 2017
Merged

Merge sharing backend JS #4042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions core/js/merged-share-backend.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[
"shareconfigmodel.js",
"shareitemmodel.js",
"sharesocialmanager.js",
"sharedialogresharerinfoview.js",
"sharedialoglinkshareview.js",
"sharedialogexpirationview.js",
"sharedialogshareelistview.js",
"sharedialogview.js",
"share.js"
]
11 changes: 2 additions & 9 deletions lib/private/Share/Share.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
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.
Expand Down Expand Up @@ -92,15 +93,7 @@ public static function registerBackend($itemType, $class, $collectionOf = null,
'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;
Expand Down