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

@juliushaertl
Copy link
Member

@juliushaertl juliushaertl commented Nov 20, 2018

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.

@juliushaertl
Copy link
Member Author

@juliushaertl juliushaertl commented Nov 20, 2018

/backport to stable14

@rullzer rullzer requested a review from ChristophWurst Nov 20, 2018
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Makes sense

@MorrisJobke
Copy link
Member

@MorrisJobke MorrisJobke commented Nov 20, 2018

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
Copy link
Member

@MorrisJobke MorrisJobke commented Nov 22, 2018

@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 of 7 tasks complete
@juliushaertl
Copy link
Member Author

@juliushaertl juliushaertl 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>
@juliushaertl juliushaertl force-pushed the bugfix/12493/root-folder-switch branch from 2b1d43c to a90b4bc Nov 22, 2018
@juliushaertl
Copy link
Member Author

@juliushaertl juliushaertl commented Nov 22, 2018

@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.

Copy link
Member

@MorrisJobke MorrisJobke left a comment

Tested and works 👍

Copy link

@JanDragon JanDragon left a comment

Looks Good.

@MorrisJobke MorrisJobke merged commit 2e52ea5 into master Nov 22, 2018
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/drone/pr the build failed
Details
@dco
DCO DCO
Details
@fixupbot
fixupbot No fixup commits found. The commit history is clean
Details
@MorrisJobke MorrisJobke deleted the bugfix/12493/root-folder-switch branch Nov 22, 2018
@MorrisJobke
Copy link
Member

@MorrisJobke MorrisJobke commented Nov 22, 2018

/backport to stable14

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Nov 22, 2018

backport to stable14 in #12593

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants