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

Added sidebar to the viewer #418

Merged
merged 2 commits into from
Jul 15, 2020
Merged

Added sidebar to the viewer #418

merged 2 commits into from
Jul 15, 2020

Conversation

tacruc
Copy link
Collaborator

@tacruc tacruc commented Jul 9, 2020

Signed-off-by: Arne Hamann [email protected]

Signed-off-by: Arne Hamann <[email protected]>
@tacruc tacruc requested review from wronny, julien-nc and gary-kim July 9, 2020 14:23
Copy link
Member

@julien-nc julien-nc left a comment

Choose a reason for hiding this comment

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

Very nice! I didn't know it was possible to embed the Files sidebar!

Just a few minor changes and we can merge.

Oh and also, we get 3 Javascript errors on page load:

Uncaught TypeError: can't access property "extend", OCA.Files.DetailTabView is undefined
Uncaught TypeError: can't access property "Client", t.Files is undefined
Uncaught TypeError: can't access property "extend", OCA.Files.DetailTabView is undefined

templates/index.php Outdated Show resolved Hide resolved
src/contactsController.js Show resolved Hide resolved
@@ -205,7 +207,7 @@ PhotosController.prototype = {
iconUrl = _app.getImageIconUrl();
}
var label = cluster.getChildCount();
if( availZoomLevels == 0 && label > 1){
if( availZoomLevels == 0 && label > 1){
Copy link
Member

Choose a reason for hiding this comment

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

Could you also remove those changes on trailing white spaces? Or maybe fix the code style in this file?

This line could be:

if (availZoomLevels === 0 && label > 1) {

@tacruc
Copy link
Collaborator Author

tacruc commented Jul 9, 2020

Uncaught TypeError: can't access property "extend", OCA.Files.DetailTabView is undefined
Uncaught TypeError: can't access property "Client", t.Files is undefined
Uncaught TypeError: can't access property "extend", OCA.Files.DetailTabView is undefined

I thing the errors are a problem we are not going to solve now. They happen for the photos app, too. I think it is related to different tabs which are not yet migrated.

@julien-nc
Copy link
Member

Ok so ready to merge after having removed the mockupFilesApp script. Tell me if you don't have time to do it, I'll do it.

Signed-off-by: Arne Hamann <[email protected]>
@tacruc tacruc requested a review from julien-nc July 9, 2020 18:58
@julien-nc julien-nc merged commit 8b5478e into master Jul 15, 2020
@julien-nc julien-nc deleted the sidebar branch July 15, 2020 07:29
@skjnldsv
Copy link
Member

I thing the errors are a problem we are not going to solve now. They happen for the photos app, too. I think it is related to different tabs which are not yet migrated.

Yep, you can ignore those :)

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

Successfully merging this pull request may close these issues.

3 participants