luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

UX: Fix photo viewer loading #1438

Browse source
This commit is contained in:
Michael Mayer 2022-03-31 12:27:30 +02:00
parent 7c58f87c9f
commit 47e8a22897
3 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
frontend/src/pages/album/photos.vue
View file

@ -198,9 +198,9 @@ export default {
// Reuse existing viewer result if possible.
const i = this.viewer.results.findIndex(p => p.uid === selected.UID);
if (i > -1 && (
(this.complete && this.viewer.results.length === this.results.length) ||
(this.viewer.complete && this.viewer.results.length > this.results.length) ||
(this.viewer.results.length - i < this.viewer.batchSize))
(this.complete && this.viewer.results.length >= this.results.length) ||
(this.viewer.complete && this.viewer.results.length >= this.results.length) ||
((i + this.viewer.batchSize) <= this.viewer.results.length))
) {
this.$viewer.show(this.viewer.results, i);
return;
@ -220,11 +220,13 @@ export default {
if (count > 0) {
// Process response.
if (response.headers && response.headers["x-count"]) {
count = parseInt(response.headers["x-count"]);
const c = parseInt(response.headers["x-count"]);
const l = parseInt(response.headers["x-limit"]);
this.viewer.complete = c < l;
}
const i = response.data.findIndex(p => p.uid === selected.UID);
this.viewer.results = Thumb.wrap(response.data);
this.viewer.complete = (count < this.batchSize);
const i = this.viewer.results.findIndex(p => p.uid === selected.UID);
// Show photos.
this.$viewer.show(this.viewer.results, i);

14
frontend/src/pages/photos.vue
View file

@ -244,9 +244,9 @@ export default {
// Reuse existing viewer result if possible.
const i = this.viewer.results.findIndex(p => p.uid === selected.UID);
if (i > -1 && (
(this.complete && this.viewer.results.length === this.results.length) ||
(this.viewer.complete && this.viewer.results.length > this.results.length) ||
(this.viewer.results.length - i < this.viewer.batchSize))
(this.complete && this.viewer.results.length >= this.results.length) ||
(this.viewer.complete && this.viewer.results.length >= this.results.length) ||
((i + this.viewer.batchSize) <= this.viewer.results.length))
) {
this.$viewer.show(this.viewer.results, i);
return;
@ -266,11 +266,13 @@ export default {
if (count > 0) {
// Process response.
if (response.headers && response.headers["x-count"]) {
count = parseInt(response.headers["x-count"]);
const c = parseInt(response.headers["x-count"]);
const l = parseInt(response.headers["x-limit"]);
this.viewer.complete = c < l;
}
const i = response.data.findIndex(p => p.uid === selected.UID);
this.viewer.results = Thumb.wrap(response.data);
this.viewer.complete = (count < this.batchSize);
const i = this.viewer.results.findIndex(p => p.uid === selected.UID);
// Show photos.
this.$viewer.show(this.viewer.results, i);

14
frontend/src/share/photos.vue
View file

@ -254,9 +254,9 @@ export default {
// Reuse existing viewer result if possible.
const i = this.viewer.results.findIndex(p => p.uid === selected.UID);
if (i > -1 && (
(this.complete && this.viewer.results.length === this.results.length) ||
(this.viewer.complete && this.viewer.results.length > this.results.length) ||
(this.viewer.results.length - i < this.viewer.batchSize))
(this.complete && this.viewer.results.length >= this.results.length) ||
(this.viewer.complete && this.viewer.results.length >= this.results.length) ||
((i + this.viewer.batchSize) <= this.viewer.results.length))
) {
this.$viewer.show(this.viewer.results, i);
return;
@ -276,11 +276,13 @@ export default {
if (count > 0) {
// Process response.
if (response.headers && response.headers["x-count"]) {
count = parseInt(response.headers["x-count"]);
const c = parseInt(response.headers["x-count"]);
const l = parseInt(response.headers["x-limit"]);
this.viewer.complete = c < l;
}
const i = response.data.findIndex(p => p.uid === selected.UID);
this.viewer.results = Thumb.wrap(response.data);
this.viewer.complete = (count < this.batchSize);
const i = this.viewer.results.findIndex(p => p.uid === selected.UID);
// Show photos.
this.$viewer.show(this.viewer.results, i);