Skip to content

Expose currently active file list though OCA.Files.App#17536

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 1 commit into from
Aug 26, 2020
Merged

Expose currently active file list though OCA.Files.App #17536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 25 additions & 0 deletions apps/files/js/app.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@
*/
fileList: null,

currentFileList: null,

/**
* Backbone model for storing files preferences
*/
Expand DownExpand Up@@ -112,6 +114,7 @@
maxChunkSize: OC.appConfig.files && OC.appConfig.files.max_chunk_size
}
);
this.updateCurrentFileList(this.fileList)
this.files.initialize();

// for backward compatibility, the global FileList will
Expand DownExpand Up@@ -160,6 +163,28 @@
}
},

/**
* Set the currently active file list
*
* Due to the file list implementations being registered after clicking the
* navigation item for the first time, OCA.Files.App is not aware of those until
* they have initialized themselves. Therefore the files list needs to call this
* method manually
*
* @param {OCA.Files.FileList} newFileList
*/
updateCurrentFileList: function(newFileList) {
this.currentFileList = newFileList;
},

/**
* Return the currently active file list
* @return {?OCA.Files.FileList}
*/
getCurrentFileList: function () {
return this.currentFileList;
},

/**
* Returns the container of the currently visible app.
*
Expand Down
3 changes: 3 additions & 0 deletions apps/files/js/filelist.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -434,6 +434,8 @@

OC.Plugins.attach('OCA.Files.FileList', this);

OCA.Files.App && OCA.Files.App.updateCurrentFileList(this);

this.initHeadersAndFooters()
},

Expand DownExpand Up@@ -738,6 +740,7 @@
* Event handler when leaving previously hidden state
*/
_onShow: function(e) {
OCA.Files.App && OCA.Files.App.updateCurrentFileList(this);
if (this.shown) {
if (e.itemId === this.id) {
this._setCurrentDir('/', false);
Expand Down