aboutsummaryrefslogtreecommitdiff
path: root/viewer
diff options
context:
space:
mode:
authorpacien2023-07-26 01:12:17 +0200
committerpacien2023-07-26 01:12:17 +0200
commit8951f65d116b020bc95ba509c1ecf69b24bec1f0 (patch)
tree07ec167ecb1589b74fd93418196256edad9a2f0d /viewer
parent46cd42de44e402fbf33522d999fa2649729ffaa8 (diff)
parentf187b6f2653092d4034ec1561280d286f956c36e (diff)
downloadldgallery-master.tar.gz
Merge branch 'develop': release v2.3HEADv2.3masterdevelop
Diffstat (limited to 'viewer')
-rw-r--r--viewer/ldgallery-viewer.7.md2
-rw-r--r--viewer/package.json6
-rw-r--r--viewer/src/views/MainLayout.vue8
-rw-r--r--viewer/src/views/item_handlers/PictureViewer.vue2
-rw-r--r--viewer/src/views/item_handlers/PlainTextViewer.vue29
-rw-r--r--viewer/yarn.lock8
6 files changed, 25 insertions, 30 deletions
diff --git a/viewer/ldgallery-viewer.7.md b/viewer/ldgallery-viewer.7.md
index ad36f7f..da0839b 100644
--- a/viewer/ldgallery-viewer.7.md
+++ b/viewer/ldgallery-viewer.7.md
@@ -2,7 +2,7 @@
2pagetitle: Viewer user manual - ldgallery 2pagetitle: Viewer user manual - ldgallery
3title: LDGALLERY-VIEWER(7) ldgallery 3title: LDGALLERY-VIEWER(7) ldgallery
4author: Pacien TRAN-GIRARD, Guillaume FOUET 4author: Pacien TRAN-GIRARD, Guillaume FOUET
5date: 2023-02-17 (v2.2) 5date: 2023-07-26 (v2.3)
6--- 6---
7 7
8 8
diff --git a/viewer/package.json b/viewer/package.json
index 36c35fb..af8948a 100644
--- a/viewer/package.json
+++ b/viewer/package.json
@@ -1,6 +1,6 @@
1{ 1{
2 "name": "ldgallery-viewer", 2 "name": "ldgallery-viewer",
3 "version": "2.2.0", 3 "version": "2.3.0",
4 "private": true, 4 "private": true,
5 "scripts": { 5 "scripts": {
6 "serve": "vue-cli-service serve", 6 "serve": "vue-cli-service serve",
@@ -21,7 +21,7 @@
21 "pinia": "2.0.23", 21 "pinia": "2.0.23",
22 "v-lazy-image": "2.1.1", 22 "v-lazy-image": "2.1.1",
23 "vue": "3.2.41", 23 "vue": "3.2.41",
24 "vue-dragscroll": "4.0.4", 24 "vue-dragscroll": "4.0.5",
25 "vue-i18n": "9.1.10", 25 "vue-i18n": "9.1.10",
26 "vue-router": "4.1.6" 26 "vue-router": "4.1.6"
27 }, 27 },
@@ -51,4 +51,4 @@
51 }, 51 },
52 "homepage": "https://ldgallery.pacien.org/", 52 "homepage": "https://ldgallery.pacien.org/",
53 "license": "AGPL-3.0-only" 53 "license": "AGPL-3.0-only"
54} 54} \ No newline at end of file
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue
index 30bfe97..5cac863 100644
--- a/viewer/src/views/MainLayout.vue
+++ b/viewer/src/views/MainLayout.vue
@@ -128,6 +128,14 @@ function validateSpashScreen() {
128 left: var(--layout-left); 128 left: var(--layout-left);
129 z-index: 3; 129 z-index: 3;
130 overflow-x: hidden; 130 overflow-x: hidden;
131
132 // Forbid overflow when resizing.
133 // Necessary for the resize handle to be selectable on qutebrowser.
134 max-width: calc(100% - var(--layout-left) - $scrollbar-width);
135 margin: 0 auto; // Center
136 resize: horizontal;
137 // ---
138
131 &:focus { 139 &:focus {
132 outline: none; 140 outline: none;
133 } 141 }
diff --git a/viewer/src/views/item_handlers/PictureViewer.vue b/viewer/src/views/item_handlers/PictureViewer.vue
index 74b978f..d091f19 100644
--- a/viewer/src/views/item_handlers/PictureViewer.vue
+++ b/viewer/src/views/item_handlers/PictureViewer.vue
@@ -18,12 +18,14 @@
18--> 18-->
19 19
20<template> 20<template>
21 <!-- @dragstart.prevent stops Drag 'n Drop of pictures on FireFox -->
21 <div 22 <div
22 ref="containerElement" 23 ref="containerElement"
23 v-dragscroll 24 v-dragscroll
24 class="scrollbar" 25 class="scrollbar"
25 :class="$style.pictureContainer" 26 :class="$style.pictureContainer"
26 @dblclick="uiStore.toggleFullscreen()" 27 @dblclick="uiStore.toggleFullscreen()"
28 @dragstart.prevent="false"
27 > 29 >
28 <img 30 <img
29 v-if="!error" 31 v-if="!error"
diff --git a/viewer/src/views/item_handlers/PlainTextViewer.vue b/viewer/src/views/item_handlers/PlainTextViewer.vue
index 2ab429a..96c4d4c 100644
--- a/viewer/src/views/item_handlers/PlainTextViewer.vue
+++ b/viewer/src/views/item_handlers/PlainTextViewer.vue
@@ -19,17 +19,12 @@
19--> 19-->
20 20
21<template> 21<template>
22 <!-- Outer div necessary for the resize handle to appear on Firefox. --> 22 <pre
23 <div 23 v-if="isFinished"
24 :class="$style.content" 24 :class="$style.content"
25 class="fill" 25 v-text="data"
26 > 26 />
27 <pre 27 <LdLoading v-else />
28 v-if="isFinished"
29 v-text="data"
30 />
31 <LdLoading v-else />
32 </div>
33</template> 28</template>
34 29
35<script setup lang="ts"> 30<script setup lang="ts">
@@ -51,19 +46,9 @@ const { isFinished, data } = useFetch(itemResourceUrl).text();
51@import "~@/assets/scss/theme"; 46@import "~@/assets/scss/theme";
52 47
53.content { 48.content {
54 display: flex; 49 margin: 1em;
55 justify-content: center;
56 background: $viewer-text-background; 50 background: $viewer-text-background;
57 color: $viewer-text; 51 color: $viewer-text;
58 52 white-space: pre-wrap;
59 > pre {
60 width: 100%;
61 max-width: 100%; // Forbid overflow when resizing.
62 margin: 1em; // Necessary for the resize handle to be selectable on qutebrowser.
63 border: none;
64 white-space: pre-wrap;
65 resize: horizontal; // Allow the user to adjust the width of the text view for easier column reading.
66 overflow: hidden; // Necessary for the resize handle to be shown in Chromium.
67 }
68} 53}
69</style> 54</style>
diff --git a/viewer/yarn.lock b/viewer/yarn.lock
index 5715dfe..b45d4a6 100644
--- a/viewer/yarn.lock
+++ b/viewer/yarn.lock
@@ -6821,10 +6821,10 @@ vue-demi@*:
6821 resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99" 6821 resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99"
6822 integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A== 6822 integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==
6823 6823
6824vue-dragscroll@4.0.4: 6824vue-dragscroll@4.0.5:
6825 version "4.0.4" 6825 version "4.0.5"
6826 resolved "https://registry.yarnpkg.com/vue-dragscroll/-/vue-dragscroll-4.0.4.tgz#761e77f787d78de321f905dfb44cd6fe10a09101" 6826 resolved "https://registry.yarnpkg.com/vue-dragscroll/-/vue-dragscroll-4.0.5.tgz#b07bbbc0300a5dee892bc48b000942a93d258cd8"
6827 integrity sha512-2VaDPzvVJKR0FxOwIt9ot53tpVG3K6Qcb7LFOHQ869WVBXWuVcJTXyBRKyrUACY82O3kIdPvj/Kzsw4ZeBkL0w== 6827 integrity sha512-1V4/2rUlNTM8vYC6/y2yfjKjOynuCfp1VRpj+IOGCcj8FWl4/3FMs9GBUJShd5mLoD4BvhY1xveezeuD+9i/mw==
6828 dependencies: 6828 dependencies:
6829 vue "^3.2.37" 6829 vue "^3.2.37"
6830 6830