Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions js/viewer-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/viewer-main.js.map

Large diffs are not rendered by default.

77 changes: 38 additions & 39 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@nextcloud/logger": "^2.1.0",
"@nextcloud/paths": "^2.1.0",
"@nextcloud/router": "^2.0.0",
"@nextcloud/vue": "^4.3.0",
"@nextcloud/vue": "^5.0.0",
"@skjnldsv/vue-plyr": "^7.0.1-alpha.0",
"camelcase": "^6.3.0",
"debounce": "^1.2.1",
Expand Down
1 change: 0 additions & 1 deletion src/components/Videos.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<VuePlyr ref="plyr"
:options="options"
:style="{
height: height + 'px',
width: width + 'px'
}">
<video ref="video"
Expand Down
30 changes: 5 additions & 25 deletions src/views/Viewer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<template>
<Modal v-if="initiated || currentFile.modal"
id="viewer"
size="large"
Copy link
Member

Choose a reason for hiding this comment

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

This should have been full, this is a regression

Before After
2022-04-29_08-43 2022-04-29_08-43_1

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh I see. Do you want to create a pr with a fix or shall I?

Copy link
Member

Choose a reason for hiding this comment

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

I'm on it, there are lots of issues we missed :)

:class="{'icon-loading': !currentFile.loaded && !currentFile.failed,
'theme--undefined': theme === null, 'theme--dark': theme === 'dark', 'theme--light': theme === 'light', 'theme--default': theme === 'default'}"
:clear-view-delay="-1 /* disable fade-out because of accessibility reasons */"
Expand All @@ -32,7 +33,6 @@
:enable-swipe="canSwipe"
:has-next="hasNext && (canLoop ? true : !isEndOfList)"
:has-previous="hasPrevious && (canLoop ? true : !isStartOfList)"
:size="isMobile ? 'full' : 'large'"
:spread-navigation="true"
:style="{width: isSidebarShown ? `calc(100% - ${sidebarWidth}px)` : null}"
:title="currentFile.basename"
Expand Down Expand Up @@ -124,7 +124,6 @@ import { subscribe, unsubscribe } from '@nextcloud/event-bus'
import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
import ActionLink from '@nextcloud/vue/dist/Components/ActionLink'
import isFullscreen from '@nextcloud/vue/dist/Mixins/isFullscreen'
import isMobile from '@nextcloud/vue/dist/Mixins/isMobile'
import Modal from '@nextcloud/vue/dist/Components/Modal'

import { extractFilePaths, sortCompare } from '../utils/fileUtils'
Expand Down Expand Up @@ -152,7 +151,7 @@ export default {
Download,
},

mixins: [isMobile, isFullscreen],
mixins: [isFullscreen],

data() {
return {
Expand Down Expand Up @@ -790,37 +789,18 @@ export default {
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
cursor: pointer;
}

::v-deep .modal-wrapper {
.modal-container {
border-radius: 0;
// let the mime components manage their own background-color
background-color: transparent;
width: 900px; // same as max-width
height: 80%; // same as max-height
}

// Always set max and height/width simultaneously here
// to allow children to contain themselves properly
&--full .modal-container {
width: 100%; // same as max-width
height: 100%; // same as max-height
box-shadow: none;
}
&--large .modal-container {
width: 85%; // same as max-width
height: 90%; // same as max-height
box-shadow: none;
}
}

&__content {
width: 100%;
height: 100%;
cursor: pointer;
}

&__file {
transition: height 100ms ease,
width 100ms ease;
Expand Down