jketreno/ketr.photos
1
0
Fork 0
Code Issues 1 Activity

Don't load albums / photos for old path request

Browse Source 
Signed-off-by: James Ketrenos <james_git@ketrenos.com>
This commit is contained in:
James Ketr 2018-09-10 09:42:27 -07:00
parent d5cf769e8c
commit e9a9142f87
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
frontend/src/ketr-photos/ketr-photos.html
View File

@ -734,9 +734,17 @@
query += key + "=" + encodeURIComponent(params[key]);
}
var path = this.path || "";
console.log("Requesting " + this.limit + " photos.");
window.fetch("api/v1/photos" + (this.path || "") + query, function(error, xhr) {
window.fetch("api/v1/photos" + path + query, function(path, error, xhr) {
this.loading = false;
if (path != (this.path || "")) {
console.log("Skipping results for old query. Triggering re-fetch of photos for new path.");
this._loadPhotos();
return;
}
if (error) {
console.error(JSON.stringify(error, null, 2));
return;
@ -770,7 +778,7 @@
this._loadPhotos(cursor.taken.toString().replace(/T.*/, "") + "_" + cursor.id, true, this.limit * 2);
}
}.bind(this));
}.bind(this, path));
},
_loadAlbums: function() {
@ -779,8 +787,15 @@
}
this.loadingAlbums = true;
window.fetch("api/v1/albums" + (this.path || ""), function(error, xhr) {
var path = this.path || "";
window.fetch("api/v1/albums" + path, function(path, error, xhr) {
this.loadingAlbums = false;
if (path != (this.path || "")) {
console.log("Skipping results for old query. Triggering re-fetch of albums for new path.");
this._loadAlbums();
return;
}
if (error) {
console.log("Error loading album: " + (this.path || ""));
console.error(JSON.stringify(error, null, 2));
@ -800,7 +815,7 @@
}
this.albums = results;
}.bind(this));
}.bind(this, path));
},
onResize: function(event) {