diff options
| -rw-r--r-- | apps/files/composer/composer/autoload_classmap.php | 1 | ||||
| -rw-r--r-- | apps/files/composer/composer/autoload_static.php | 1 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 9 | ||||
| -rw-r--r-- | apps/files/lib/Controller/ViewController.php | 4 | ||||
| -rw-r--r-- | apps/files/lib/Event/LoadSidebar.php | 31 | ||||
| -rw-r--r-- | apps/files_sharing/src/share.js | 31 |
6 files changed, 45 insertions, 32 deletions
diff --git a/apps/files/composer/composer/autoload_classmap.php b/apps/files/composer/composer/autoload_classmap.php index 3aa59c88b74..e241d34225c 100644 --- a/apps/files/composer/composer/autoload_classmap.php +++ b/apps/files/composer/composer/autoload_classmap.php @@ -33,6 +33,7 @@ return array( 'OCA\\Files\\Controller\\ApiController' => $baseDir . '/../lib/Controller/ApiController.php', 'OCA\\Files\\Controller\\ViewController' => $baseDir . '/../lib/Controller/ViewController.php', 'OCA\\Files\\Event\\LoadAdditionalScriptsEvent' => $baseDir . '/../lib/Event/LoadAdditionalScriptsEvent.php', + 'OCA\\Files\\Event\\LoadSidebar' => $baseDir . '/../lib/Event/LoadSidebar.php', 'OCA\\Files\\Helper' => $baseDir . '/../lib/Helper.php', 'OCA\\Files\\Listener\\LegacyLoadAdditionalScriptsAdapter' => $baseDir . '/../lib/Listener/LegacyLoadAdditionalScriptsAdapter.php', 'OCA\\Files\\Service\\TagService' => $baseDir . '/../lib/Service/TagService.php', diff --git a/apps/files/composer/composer/autoload_static.php b/apps/files/composer/composer/autoload_static.php index 07df2f173f8..c4944e7b980 100644 --- a/apps/files/composer/composer/autoload_static.php +++ b/apps/files/composer/composer/autoload_static.php @@ -48,6 +48,7 @@ class ComposerStaticInitFiles 'OCA\\Files\\Controller\\ApiController' => __DIR__ . '/..' . '/../lib/Controller/ApiController.php', 'OCA\\Files\\Controller\\ViewController' => __DIR__ . '/..' . '/../lib/Controller/ViewController.php', 'OCA\\Files\\Event\\LoadAdditionalScriptsEvent' => __DIR__ . '/..' . '/../lib/Event/LoadAdditionalScriptsEvent.php', + 'OCA\\Files\\Event\\LoadSidebar' => __DIR__ . '/..' . '/../lib/Event/LoadSidebar.php', 'OCA\\Files\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php', 'OCA\\Files\\Listener\\LegacyLoadAdditionalScriptsAdapter' => __DIR__ . '/..' . '/../lib/Listener/LegacyLoadAdditionalScriptsAdapter.php', 'OCA\\Files\\Service\\TagService' => __DIR__ . '/..' . '/../lib/Service/TagService.php', diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 8cca43d5749..0424ba2006b 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -636,9 +636,14 @@ fileName = '' } + // this is the old (terrible) way of getting the context. + // don't use it anywhere else. Just provide the full path + // of the file to the sidebar service + var tr = this.findFileEl(fileName) + var model = this.getModelForFile(tr) + var path = model.attributes.path + '/' + model.attributes.name + // open sidebar and set file - const dir = `${this.dirInfo.path}/${this.dirInfo.name}` - const path = `${dir}/${fileName}` OCA.Files.Sidebar.file = path.replace('//', '/') }, diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index 518bbc1bf08..17caf06b480 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -9,6 +9,7 @@ * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * @author Felix Nüsse <felix.nuesse@t-online.de> + * @author John Molakvoæ <skjnldsv@protonmail.com> * * @license AGPL-3.0 * @@ -30,6 +31,7 @@ namespace OCA\Files\Controller; use OCA\Files\Activity\Helper; use OCA\Files\Event\LoadAdditionalScriptsEvent; +use OCA\Files\Event\LoadSidebar; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\ContentSecurityPolicy; use OCP\AppFramework\Http\RedirectResponse; @@ -269,6 +271,8 @@ class ViewController extends Controller { $event = new LoadAdditionalScriptsEvent(); $this->eventDispatcher->dispatch(LoadAdditionalScriptsEvent::class, $event); + $this->eventDispatcher->dispatch(LoadSidebar::class, new LoadSidebar()); + $params = []; $params['usedSpacePercent'] = (int) $storageInfo['relative']; $params['owner'] = $storageInfo['owner']; diff --git a/apps/files/lib/Event/LoadSidebar.php b/apps/files/lib/Event/LoadSidebar.php new file mode 100644 index 00000000000..8892bbe0f5b --- /dev/null +++ b/apps/files/lib/Event/LoadSidebar.php @@ -0,0 +1,31 @@ +<?php +declare(strict_types=1); +/** + * @copyright Copyright (c) 2019, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCA\Files\Event; + +use OCP\EventDispatcher\Event; + +class LoadSidebar extends Event { + +} diff --git a/apps/files_sharing/src/share.js b/apps/files_sharing/src/share.js index 46e46e37552..c7ef39897d0 100644 --- a/apps/files_sharing/src/share.js +++ b/apps/files_sharing/src/share.js @@ -209,37 +209,8 @@ } }) + // register share breadcrumbs component var shareTab = new OCA.Sharing.ShareTabView('sharing', {order: -20}) - // // detect changes and change the matching list entry - // shareTab.on('sharesChanged', function(shareModel) { - // var fileInfoModel = shareModel.fileInfoModel - // var $tr = fileList.findFileEl(fileInfoModel.get('name')) - - // // We count email shares as link share - // var hasLinkShares = shareModel.hasLinkShares(); - // shareModel.get('shares').forEach(function (share) { - // if (share.share_type === OC.Share.SHARE_TYPE_EMAIL) { - // hasLinkShares = true; - // } - // }) - - // OCA.Sharing.Util._updateFileListDataAttributes(fileList, $tr, shareModel); - // if (!OCA.Sharing.Util._updateFileActionIcon($tr, shareModel.hasUserShares(), hasLinkShares)) { - // // remove icon, if applicable - // OC.Share.markFileAsShared($tr, false, false) - // } - - // // FIXME: this is too convoluted. We need to get rid of the above updates - // // and only ever update the model and let the events take care of rerendering - // fileInfoModel.set({ - // shareTypes: shareModel.getShareTypes(), - // // in case markFileAsShared decided to change the icon, - // // we need to modify the model - // // (FIXME: yes, this is hacky) - // icon: $tr.attr('data-icon') - // }) - // }) - // fileList.registerTabView(shareTab) var breadCrumbSharingDetailView = new OCA.Sharing.ShareBreadCrumbView({ shareTab: shareTab }) fileList.registerBreadCrumbDetailView(breadCrumbSharingDetailView) |