Skip to content
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.

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

Do not switch to root folder if filelist is already shown #12554

Merged
merged 1 commit into from
Nov 22, 2018

Conversation

juliusknorr
Copy link
Member

Navigating to the root folder is already handled by OCA.Files.Navigation.setActiveItem in case the view doesn't change.

Fixes #12493 since there was a race condition between the root folder loading for falling back when clicking the All files sidebar entry and the actual view that should be loaded.

@juliusknorr
Copy link
Member Author

/backport to stable14

Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense

@MorrisJobke
Copy link
Member

JSUnit fails:

PhantomJS 2.1.1 (Linux 0.0.0) OCA.Files.FileList tests loading file list reloads the list when leaving hidden state FAILED
	Expected false to equal true.
	apps/files/tests/js/filelistSpec.js:1717:41

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Nov 20, 2018
@MorrisJobke
Copy link
Member

@juliushaertl Mind to look into this to get the fix shipped in the RC 1

@MorrisJobke MorrisJobke mentioned this pull request Nov 22, 2018
7 tasks
@MorrisJobke MorrisJobke added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Nov 22, 2018
@juliusknorr
Copy link
Member Author

juliusknorr commented Nov 22, 2018

@MorrisJobke I'm on it, the test actually catched a bug of this solution, so I'll need to do some adjustments to the fix.

Navigating to the root folder is already handled by
OCA.Files.Navigation.setActiveItem in case the view doesn't change.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr juliusknorr force-pushed the bugfix/12493/root-folder-switch branch from 2b1d43c to a90b4bc Compare November 22, 2018 13:03
@juliusknorr
Copy link
Member Author

@MorrisJobke I think I found a way to stop triggering the reload without interfering with existing behaviour. Please give this another test @ChristophWurst @skjnldsv since the logic changed a bit to work around the crazy event passing happening in the files app.

@juliusknorr juliusknorr added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Nov 22, 2018
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Nov 22, 2018
Copy link

@JanDragon JanDragon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks Good.

@MorrisJobke MorrisJobke merged commit 2e52ea5 into master Nov 22, 2018
@MorrisJobke MorrisJobke deleted the bugfix/12493/root-folder-switch branch November 22, 2018 15:10
@MorrisJobke
Copy link
Member

/backport to stable14

@backportbot-nextcloud
Copy link

backport to stable14 in #12593

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants