Merge branch 'master' into new-folder-action

This commit is contained in:
Deep Tailor 2020-06-24 09:51:39 -07:00 committed by GitHub
commit c46e4c5dad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -24,14 +24,15 @@
</div> </div>
<div class="main-image s-image-main c-imagery__main-image" <div class="main-image s-image-main c-imagery__main-image"
:class="{'paused unnsynced': paused(),'stale':false }" :class="{'paused unnsynced': paused(),'stale':false }"
:style="{'background-image': `url(${getImageUrl()})`, :style="{'background-image': getImageUrl() ? `url(${getImageUrl()})` : 'none',
'filter': `brightness(${filters.brightness}%) contrast(${filters.contrast}%)`}" 'filter': `brightness(${filters.brightness}%) contrast(${filters.contrast}%)`}"
> >
</div> </div>
<div class="c-imagery__control-bar"> <div class="c-imagery__control-bar">
<div class="c-imagery__timestamp">{{ getTime() }}</div> <div class="c-imagery__timestamp">{{ getTime() }}</div>
<div class="h-local-controls flex-elem"> <div class="h-local-controls flex-elem">
<a class="c-button icon-pause pause-play" <a
class="c-button icon-pause pause-play"
:class="{'is-paused': paused()}" :class="{'is-paused': paused()}"
@click="paused(!paused())" @click="paused(!paused())"
></a> ></a>
@ -185,6 +186,10 @@ export default {
setSelectedImage(image) { setSelectedImage(image) {
// If we are paused and the current image IS selected, unpause // If we are paused and the current image IS selected, unpause
// Otherwise, set current image and pause // Otherwise, set current image and pause
if (!image) {
return;
}
if (this.isPaused && image.selected) { if (this.isPaused && image.selected) {
this.paused(false); this.paused(false);
this.unselectAllImages(); this.unselectAllImages();
@ -197,7 +202,7 @@ export default {
} }
}, },
boundsChange(bounds, isTick) { boundsChange(bounds, isTick) {
if(!isTick) { if (!isTick) {
this.requestHistory(); this.requestHistory();
} }
}, },