diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2020-01-16 16:51:47 +0100 |
|---|---|---|
| committer | npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com> | 2020-01-22 09:45:57 +0000 |
| commit | 2e52bdda210dbce59a65854792e83ee8fbd182b2 (patch) | |
| tree | a12c4cea8ba237984fe455bd16e35cbd8a4b8baa /apps/files/src | |
| parent | 6201b0b5b19490ec78ee4c41a6bfeeb6b767a46b (diff) | |
| download | nextcloud-server-2e52bdda210dbce59a65854792e83ee8fbd182b2.tar.gz nextcloud-server-2e52bdda210dbce59a65854792e83ee8fbd182b2.zip | |
Close handling
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
Diffstat (limited to 'apps/files/src')
| -rw-r--r-- | apps/files/src/services/Sidebar.js | 9 | ||||
| -rw-r--r-- | apps/files/src/sidebar.js | 1 | ||||
| -rw-r--r-- | apps/files/src/views/Sidebar.vue | 17 |
3 files changed, 12 insertions, 15 deletions
diff --git a/apps/files/src/services/Sidebar.js b/apps/files/src/services/Sidebar.js index 917302df610..42243b9de82 100644 --- a/apps/files/src/services/Sidebar.js +++ b/apps/files/src/services/Sidebar.js @@ -76,15 +76,6 @@ export default class Sidebar { } /** - * Close the sidebar - * - * @memberof Sidebar - */ - close() { - this.#state.file = '' - } - - /** * Return current opened file * * @memberof Sidebar diff --git a/apps/files/src/sidebar.js b/apps/files/src/sidebar.js index f0f6fef6b9c..258f2313657 100644 --- a/apps/files/src/sidebar.js +++ b/apps/files/src/sidebar.js @@ -57,4 +57,5 @@ window.addEventListener('DOMContentLoaded', () => { }) AppSidebar.$mount('#app-sidebar') window.OCA.Files.Sidebar.open = AppSidebar.open + window.OCA.Files.Sidebar.close = AppSidebar.close }) diff --git a/apps/files/src/views/Sidebar.vue b/apps/files/src/views/Sidebar.vue index 4bc56075970..5f07138ea80 100644 --- a/apps/files/src/views/Sidebar.vue +++ b/apps/files/src/views/Sidebar.vue @@ -26,7 +26,7 @@ ref="sidebar" v-bind="appSidebar" :force-menu="true" - @close="onClose" + @close="close" @update:active="setActiveTab" @update:starred="toggleStarred" @[defaultActionListener].stop.prevent="onDefaultAction"> @@ -250,10 +250,6 @@ export default { canDisplay(tab) { return tab.isEnabled(this.fileInfo) }, - onClose() { - this.resetData() - OCA.Files.Sidebar.close() - }, resetData() { this.error = null this.fileInfo = null @@ -381,8 +377,9 @@ export default { /** * Open the sidebar for the given file * - * @memberof Sidebar * @param {string} path the file path to load + * @returns {Promise} + * @throws {Error} loading failure */ async open(path) { // update current opened file @@ -415,6 +412,14 @@ export default { } } }, + + /** + * Close the sidebar + */ + close() { + this.Sidebar.file = '' + this.resetData() + }, }, } </script> |