From 99cd8bbe82ec968e6f28d24d98f32f96a554d44b Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 18 Apr 2018 17:34:56 -0400
Subject: #606 more montage cleanup

---
 www/templates/events-modal.html | 2 ++
 www/templates/montage.html      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'www/templates')

diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index c838f128..7d59995b 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -11,12 +11,14 @@
                         <div style="width:100vw; height:100vh;">
                             <img ng-if="!liveFeedMid" image-spinner-src="{{loginData.streamingurl}}/nph-zms?source=event&mode=jpeg&event={{eventId}}&frame=1&replay={{currentStreamMode}}&rate=100&connkey={{connKey}}&scale={{singleImageQuality}}{{$root.authSession}}" ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}" on-double-tap="closeModal();"
                             img-spinner-w="1024" img-spinner-h="768"
+                            onload="imageLoaded()"
                             />
 
 
                             <div ng-if="liveFeedMid">
                                 <img  image-spinner-src="{{loginData.streamingurl}}/nph-zms?mode=jpeg&monitor={{liveFeedMid}}&connkey={{connKey}}{{$root.authSession}}" ng-class="{'object-fit_cover':imageFit==false, 'object-fit_contain':imageFit==true}" on-double-tap="closeModal();"
                                 img-spinner-w="1024" img-spinner-h="768"
+                                onload="imageLoaded()"
                                 />
                                 <div class="events-range-modal-text"><span class="events-range-modal-warning-text">{{eventWarning}}</span> </div>
                             </div>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 4f341c5a..5952ad9e 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -98,7 +98,7 @@
                 </figure>-->
 
 
-                    <figure   class="{{dragBorder}}" ng-if="monitor.Monitor.listDisplay!='noshow'">
+                    <figure   class="{{dragBorder}}" ng-show="monitor.Monitor.listDisplay!='noshow'">
                     <!--<div ng-if="!isModalActive" >-->
                             <!--<div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading">-->
                             <div ng-if="$root.authSession!='undefined' && $root.authSession!=''">
-- 
cgit v1.2.3