Skip to content

Commit 2e52bdd

Browse files
skjnldsvnpmbuildbot[bot]
authored andcommitted
Close handling
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
1 parent 6201b0b commit 2e52bdd

5 files changed

Lines changed: 22 additions & 25 deletions

File tree

apps/files/js/dist/sidebar.js

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files/js/dist/sidebar.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files/src/services/Sidebar.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,6 @@ export default class Sidebar {
7575
return false
7676
}
7777

78-
/**
79-
* Close the sidebar
80-
*
81-
* @memberof Sidebar
82-
*/
83-
close() {
84-
this.#state.file = ''
85-
}
86-
8778
/**
8879
* Return current opened file
8980
*

apps/files/src/sidebar.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,5 @@ window.addEventListener('DOMContentLoaded', () => {
5757
})
5858
AppSidebar.$mount('#app-sidebar')
5959
window.OCA.Files.Sidebar.open = AppSidebar.open
60+
window.OCA.Files.Sidebar.close = AppSidebar.close
6061
})

apps/files/src/views/Sidebar.vue

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
ref="sidebar"
2727
v-bind="appSidebar"
2828
:force-menu="true"
29-
@close="onClose"
29+
@close="close"
3030
@update:active="setActiveTab"
3131
@update:starred="toggleStarred"
3232
@[defaultActionListener].stop.prevent="onDefaultAction">
@@ -250,10 +250,6 @@ export default {
250250
canDisplay(tab) {
251251
return tab.isEnabled(this.fileInfo)
252252
},
253-
onClose() {
254-
this.resetData()
255-
OCA.Files.Sidebar.close()
256-
},
257253
resetData() {
258254
this.error = null
259255
this.fileInfo = null
@@ -381,8 +377,9 @@ export default {
381377
/**
382378
* Open the sidebar for the given file
383379
*
384-
* @memberof Sidebar
385380
* @param {string} path the file path to load
381+
* @returns {Promise}
382+
* @throws {Error} loading failure
386383
*/
387384
async open(path) {
388385
// update current opened file
@@ -415,6 +412,14 @@ export default {
415412
}
416413
}
417414
},
415+
416+
/**
417+
* Close the sidebar
418+
*/
419+
close() {
420+
this.Sidebar.file = ''
421+
this.resetData()
422+
},
418423
},
419424
}
420425
</script>

0 commit comments

Comments
 (0)