Slideshow working 'well enough' for Christmas
Signed-off-by: James Ketrenos <james.p.ketrenos@intel.com>
This commit is contained in:
parent
8cbf34c13e
commit
69f4d24f56
@ -24,9 +24,25 @@
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
pointer-events: all;
|
pointer-events: all;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#image {
|
||||||
|
display: inline-block;
|
||||||
|
position: absolute;
|
||||||
|
top: 0px;
|
||||||
|
left: 0px;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
background-size: contain;
|
||||||
|
background-position: center center;
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
transition: opacity 0.5s ease-in-out;
|
||||||
|
-webkit-transition: opacity 0.5s ease-in-out;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<img id="image">
|
<div id="image">
|
||||||
|
</div>
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -83,10 +99,9 @@
|
|||||||
|
|
||||||
this.showImage();
|
this.showImage();
|
||||||
|
|
||||||
this.$.image.src = this.image.src;
|
this.$.image.style.backgroundImage = 'url(' + this.image.src + ')';
|
||||||
this.$.image.style.opacity = 1;
|
this.$.image.style.opacity = 1;
|
||||||
this.image = undefined;
|
this.image = undefined;
|
||||||
this.setActive(true);
|
|
||||||
}, remaining);
|
}, remaining);
|
||||||
}.bind(this, path);
|
}.bind(this, path);
|
||||||
|
|
||||||
|
@ -1245,10 +1245,19 @@
|
|||||||
delete this.slideshowTimeout;
|
delete this.slideshowTimeout;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.slideshowTimeout = window.setTimeout(this.slideshowNext.bind(this), 24 * 1000);
|
|
||||||
|
if (this.slideshowTimeout) {
|
||||||
|
window.cancelTimeout(this.slideshowTimeout);
|
||||||
|
delete this.slideshowTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
if (!this.thumbnails.length) {
|
if (!this.thumbnails.length) {
|
||||||
|
this.slideshowTimeout = window.setTimeout(this.slideshowNext.bind(this), 150);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.slideshowTimeout = window.setTimeout(this.slideshowNext.bind(this), 24 * 1000);
|
||||||
|
|
||||||
var photo = this.thumbnails[Math.floor(this.thumbnails.length * Math.random())].item;
|
var photo = this.thumbnails[Math.floor(this.thumbnails.length * Math.random())].item;
|
||||||
this.$.kenBurns.item = photo;
|
this.$.kenBurns.item = photo;
|
||||||
this.$.kenBurns.src = this.base + photo.path + "thumbs/scaled/" + photo.filename;
|
this.$.kenBurns.src = this.base + photo.path + "thumbs/scaled/" + photo.filename;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user