Skip to content

Fix files app LoadSidebar event #18213

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
skjnldsv merged 3 commits into from
Dec 4, 2019
Merged

Fix files app LoadSidebar event #18213

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
241aac9
Fix files app LoadSidebar event
skjnldsv Dec 3, 2019
c1277ea
Use own getIconUrl method
skjnldsv Dec 4, 2019
46ce797
Properly query files
skjnldsv Dec 4, 2019
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
Prev Previous commit
Properly query files 
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Dec 4, 2019
commit 46ce797197571f2cf873ca116e31165ea6a395bc
3 changes: 3 additions & 0 deletions apps/files/appinfo/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
*/

use OC\Search\Provider\File;
use OCA\Files\AppInfo\Application;

$app = \OC::$server->query(Application::class);

// required for translation purpose
// t('Files')
Expand Down
2 changes: 1 addition & 1 deletion apps/files/js/dist/sidebar.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/files/src/sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ Vue.use(VueClipboard)
Vue.prototype.t = t

window.addEventListener('DOMContentLoaded', () => {

// Init Sidebar Service
if (!window.OCA.Files) {
window.OCA.Files = {}
}

Object.assign(window.OCA.Files, { Sidebar: new Sidebar() })
Object.assign(window.OCA.Files.Sidebar, { Tab })

Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/js/dist/files_sharing_tab.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/files_sharing/js/dist/files_sharing_tab.js.map
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 5 additions & 7 deletions apps/files_sharing/src/files_sharing_tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,12 @@ import ExternalLinkActions from './services/ExternalLinkActions'

import TabSections from './services/TabSections'

if (window.OCA && window.OCA.Sharing) {
Object.assign(window.OCA.Sharing, { ShareSearch: new ShareSearch() })
// Init Sharing Tab Service
if (!window.OCA.Sharing) {
window.OCA.Sharing = {}
}

if (window.OCA && window.OCA.Sharing) {
Object.assign(window.OCA.Sharing, { ExternalLinkActions: new ExternalLinkActions() })
}

Object.assign(window.OCA.Sharing, { ShareSearch: new ShareSearch() })
Object.assign(window.OCA.Sharing, { ExternalLinkActions: new ExternalLinkActions() })
Object.assign(window.OCA.Sharing, { ShareTabSections: new TabSections() })

window.addEventListener('DOMContentLoaded', () => {
Expand Down