Skip to content

Always replace the app sidebar view when switching from a different file list #10509

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
rullzer merged 3 commits into from
Aug 3, 2018
Merged

Always replace the app sidebar view when switching from a different file list #10509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcdbc4e
Fix return value of change directory
juliusknorr Aug 2, 2018
16f6c07
Always call render to replace the app-sidebar if the detail view is u…
juliusknorr Aug 3, 2018
1b4d502
Adjust acceptance test to check if the correct sidebar view is shown
juliusknorr Aug 3, 2018
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
7 changes: 5 additions & 2 deletions apps/files/js/detailsview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,13 @@
*/
render: function() {
// remove old instances
if ($('#app-sidebar').length === 0) {
var $appSidebar = $('#app-sidebar');
if ($appSidebar.length === 0) {
this.$el.insertAfter($('#app-content'));
} else {
$('#app-sidebar').replaceWith(this.$el)
if ($appSidebar[0] !== this.el) {
$appSidebar.replaceWith(this.$el)
}
}

var templateVars = {
Expand Down
4 changes: 2 additions & 2 deletions apps/files/js/filelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
}

this._currentFileModel = model;

this._detailsView.render();
this._detailsView.setFileInfo(model);
this._detailsView.$el.scrollTop(0);
},
Expand Down Expand Up @@ -1623,7 +1623,7 @@

// discard finished uploads list, we'll get it through a regular reload
this._uploads = {};
this.reload().then(function(success){
return this.reload().then(function(success){
if (!success) {
self.changeDirectory(currentDir, true);
}
Expand Down
14 changes: 11 additions & 3 deletions tests/acceptance/features/app-files.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
Feature: app-files

Scenario: viewing a favorite file in its folder closes the details view
Scenario: viewing a favorite file in its folder shows the correct sidebar view
Given I am logged in
And I create a new folder named "other"
And I mark "other" as favorite
And I mark "welcome.txt" as favorite
And I see that "other" is marked as favorite
And I see that "welcome.txt" is marked as favorite
And I open the "Favorites" section
And I open the details view for "welcome.txt"
And I open the details view for "other"
And I see that the details view is open
And I see that the file name shown in the details view is "other"
When I view "welcome.txt" in folder
Then I see that the current section is "All files"
And I see that the details view is closed
And I see that the details view is open
And I see that the file name shown in the details view is "welcome.txt"
When I open the details view for "other"
And I see that the file name shown in the details view is "other"


Scenario: viewing a favorite file in its folder does not prevent opening the details view in "All files" section
Given I am logged in
Expand Down