diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-10-23 20:05:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 20:05:25 +0200 |
| commit | 3e8a38fc5706438528e675e2359bcaf1d710ccaa (patch) | |
| tree | bc56ed89fb55509aa6834bcf6f4c9cb28c6af009 /apps/files | |
| parent | 52c3285de4557c256aec05539a9c014fd13d6f1d (diff) | |
| parent | c1e37bb387471665e1cdc7096fe1773a206d76c2 (diff) | |
| download | nextcloud-server-3e8a38fc5706438528e675e2359bcaf1d710ccaa.tar.gz nextcloud-server-3e8a38fc5706438528e675e2359bcaf1d710ccaa.zip | |
Merge pull request #11995 from nextcloud/stable14-11967-fix-opening-a-section-again-in-the-files-app
[stable14] Fix opening a section again in the Files app
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/js/favoritesfilelist.js | 6 | ||||
| -rw-r--r-- | apps/files/js/favoritesplugin.js | 5 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 4 | ||||
| -rw-r--r-- | apps/files/js/recentplugin.js | 5 |
4 files changed, 14 insertions, 6 deletions
diff --git a/apps/files/js/favoritesfilelist.js b/apps/files/js/favoritesfilelist.js index 8c9c125d0a1..44adf5d7b5b 100644 --- a/apps/files/js/favoritesfilelist.js +++ b/apps/files/js/favoritesfilelist.js @@ -94,12 +94,6 @@ $(document).ready(function() { return OCA.Files.FileList.prototype.reloadCallback.call(this, status, result); }, - - _onUrlChanged: function (e) { - if (e && _.isString(e.dir)) { - this.changeDirectory(e.dir, false, true); - } - } }); OCA.Files.FavoritesFileList = FavoritesFileList; diff --git a/apps/files/js/favoritesplugin.js b/apps/files/js/favoritesplugin.js index 7294ef9461c..3ceadca826d 100644 --- a/apps/files/js/favoritesplugin.js +++ b/apps/files/js/favoritesplugin.js @@ -67,6 +67,11 @@ return new OCA.Files.FavoritesFileList( $el, { fileActions: fileActions, + // The file list is created when a "show" event is handled, + // so it should be marked as "shown" like it would have been + // done if handling the event with the file list already + // created. + shown: true } ); }, diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 8fb8a021811..42b80189287 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -226,6 +226,10 @@ return; } + if (options.shown) { + this.shown = options.shown; + } + if (options.config) { this._filesConfig = options.config; } else if (!_.isUndefined(OCA.Files) && !_.isUndefined(OCA.Files.App)) { diff --git a/apps/files/js/recentplugin.js b/apps/files/js/recentplugin.js index 524b556a517..c1b013ef1b8 100644 --- a/apps/files/js/recentplugin.js +++ b/apps/files/js/recentplugin.js @@ -67,6 +67,11 @@ return new OCA.Files.RecentFileList( $el, { fileActions: fileActions, + // The file list is created when a "show" event is handled, + // so it should be marked as "shown" like it would have been + // done if handling the event with the file list already + // created. + shown: true } ); }, |