From 60db2959bb13eb399c4f58d75954834ef745f241 Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Tue, 25 Dec 2018 13:39:36 -0800 Subject: [PATCH] Slightly improved Signed-off-by: James Ketrenos --- frontend/elements/ken-burns.html | 8 ++++---- frontend/src/ketr-photos/ketr-photos.html | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/elements/ken-burns.html b/frontend/elements/ken-burns.html index 02278f4..cd86693 100755 --- a/frontend/elements/ken-burns.html +++ b/frontend/elements/ken-burns.html @@ -149,10 +149,10 @@ }, showImage: function() { - var maxscale = 1.4; + var maxscale = 1.25; var minscale = 1.1; - var minMov = 5; - var maxMov = 10; + var minMov = 2; + var maxMov = 5; var scalar = this.randomizer(minscale,maxscale).toFixed(2); var moveX = this.randomizer(minMov,maxMov).toFixed(2); @@ -172,7 +172,7 @@ "#image { " + "animation: zoom 12s alternate infinite; " + "position: absolute; " + - "top: 0; left:-5%; width: 110%; height: 110%; " + + "top: -5%; left:-5%; width: 110%; height: 110%; " + "}" + "\n" + "@" + prefix + "keyframes burnseffect { " + diff --git a/frontend/src/ketr-photos/ketr-photos.html b/frontend/src/ketr-photos/ketr-photos.html index f9c5f8d..6724f7c 100755 --- a/frontend/src/ketr-photos/ketr-photos.html +++ b/frontend/src/ketr-photos/ketr-photos.html @@ -1241,16 +1241,16 @@ slideshowNext: function() { if (this.mode != "slideshow") { - window.cancelTimeout(this.slideshowTimeout); + window.clearTimeout(this.slideshowTimeout); delete this.slideshowTimeout; return; } if (this.slideshowTimeout) { - window.cancelTimeout(this.slideshowTimeout); + window.clearTimeout(this.slideshowTimeout); delete this.slideshowTimeout; } - + if (!this.thumbnails.length) { this.slideshowTimeout = window.setTimeout(this.slideshowNext.bind(this), 150); return;