diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-03-24 21:11:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-24 21:11:42 +0100 |
| commit | c628095edeb7abde943810554d1d4de81454290c (patch) | |
| tree | 3ce6d8b0bf2d364eb4f54765d20c32b297a29eea | |
| parent | 84b6b1807fc446adbb4689fb3ad3b119bc846920 (diff) | |
| parent | 4d68324ba61ed4bb7f6add67187bf3542e147614 (diff) | |
| download | nextcloud-server-c628095edeb7abde943810554d1d4de81454290c.tar.gz nextcloud-server-c628095edeb7abde943810554d1d4de81454290c.zip | |
Merge pull request #4042 from nextcloud/merge-js-forsharing-code
Merge sharing backend JS
| -rw-r--r-- | core/js/merged-share-backend.json | 11 | ||||
| -rw-r--r-- | lib/private/Share/Share.php | 11 |
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; |