Merge branch 'master' into stable24
commit
76b7120ae6
29
src/App.vue
29
src/App.vue
|
@ -310,15 +310,21 @@ body {
|
||||||
// Nextcloud 25+: get rid of gap and border radius at right
|
// Nextcloud 25+: get rid of gap and border radius at right
|
||||||
#content-vue.remove-gap {
|
#content-vue.remove-gap {
|
||||||
// was var(--body-container-radius)
|
// was var(--body-container-radius)
|
||||||
border-top-right-radius: 0;
|
// now set on #app-navigation-vue
|
||||||
border-bottom-right-radius: 0;
|
border-radius: 0;
|
||||||
|
|
||||||
width: calc(100% - var(--body-container-margin) * 1); // was *2
|
width: calc(100% - var(--body-container-margin) * 1); // was *2
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prevent content overflow on NC <25
|
// Prevent content overflow on NC <25
|
||||||
#content-vue {
|
#content-vue {
|
||||||
max-height: 100vh;
|
max-height: 100vh;
|
||||||
|
|
||||||
|
// https://bugs.webkit.org/show_bug.cgi?id=160953
|
||||||
|
overflow: visible;
|
||||||
|
#app-navigation-vue {
|
||||||
|
border-top-left-radius: var(--body-container-radius);
|
||||||
|
border-bottom-left-radius: var(--body-container-radius);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Top bar is above everything else on mobile
|
// Top bar is above everything else on mobile
|
||||||
|
@ -331,23 +337,6 @@ body.has-viewer header {
|
||||||
z-index: 0 !important;
|
z-index: 0 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Patch viewer to remove the title and
|
|
||||||
// make the image fill the entire screen
|
|
||||||
.viewer {
|
|
||||||
.modal-title {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
.modal-wrapper .modal-container {
|
|
||||||
top: 0 !important;
|
|
||||||
bottom: 0 !important;
|
|
||||||
|
|
||||||
.viewer__image-editor {
|
|
||||||
top: 0 !important;
|
|
||||||
bottom: 0 !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Hide horizontal scrollbar on mobile
|
// Hide horizontal scrollbar on mobile
|
||||||
// For the padding removal above
|
// For the padding removal above
|
||||||
#app-content-vue {
|
#app-content-vue {
|
||||||
|
|
|
@ -277,8 +277,9 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Clicking on photo */
|
/** Clicking on photo */
|
||||||
public clickPhoto(photo: IPhoto, event: any, rowIdx: number) {
|
public clickPhoto(photo: IPhoto, event: PointerEvent, rowIdx: number) {
|
||||||
if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
|
if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
|
||||||
|
if (event.pointerType === "touch") return; // let touch events handle this
|
||||||
|
|
||||||
if (this.has()) {
|
if (this.has()) {
|
||||||
if (event.shiftKey) {
|
if (event.shiftKey) {
|
||||||
|
@ -292,7 +293,7 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Tap on */
|
/** Tap on */
|
||||||
protected touchstartPhoto(photo: IPhoto, event: any, rowIdx: number) {
|
protected touchstartPhoto(photo: IPhoto, event: TouchEvent, rowIdx: number) {
|
||||||
if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
|
if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
|
||||||
this.rows[rowIdx].virtualSticky = true;
|
this.rows[rowIdx].virtualSticky = true;
|
||||||
|
|
||||||
|
@ -311,9 +312,11 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Tap off */
|
/** Tap off */
|
||||||
protected touchendPhoto(photo: IPhoto, event: any, rowIdx: number) {
|
protected touchendPhoto(photo: IPhoto, event: TouchEvent, rowIdx: number) {
|
||||||
if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
|
if (photo.flag & this.c.FLAG_PLACEHOLDER) return;
|
||||||
delete this.rows[rowIdx].virtualSticky;
|
delete this.rows[rowIdx].virtualSticky;
|
||||||
|
|
||||||
|
if (this.touchTimer) this.clickPhoto(photo, {} as any, rowIdx);
|
||||||
this.resetTouchParams();
|
this.resetTouchParams();
|
||||||
|
|
||||||
window.setTimeout(() => {
|
window.setTimeout(() => {
|
||||||
|
@ -337,7 +340,7 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
|
||||||
* Tap over
|
* Tap over
|
||||||
* photo and rowIdx are that of the *anchor*
|
* photo and rowIdx are that of the *anchor*
|
||||||
*/
|
*/
|
||||||
protected touchmovePhoto(anchor: IPhoto, event: any, rowIdx: number) {
|
protected touchmovePhoto(anchor: IPhoto, event: TouchEvent, rowIdx: number) {
|
||||||
if (anchor.flag & this.c.FLAG_PLACEHOLDER) return;
|
if (anchor.flag & this.c.FLAG_PLACEHOLDER) return;
|
||||||
|
|
||||||
if (this.touchTimer) {
|
if (this.touchTimer) {
|
||||||
|
|
Loading…
Reference in New Issue