From 2cd649ccfb32ad6c5e1148a22bf59cf30ac92e57 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 11 Apr 2018 07:52:01 -0400
Subject: #606 proper cleanup

---
 www/templates/montage.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/montage.html b/www/templates/montage.html
index 5abf9b22..1a0b56df 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -33,6 +33,10 @@
             <br/>
             <div id="flyoutmenu" style="float:left">
                 <ul>
+                        <li>
+                                <a href="" ng-click="killAllImages()"> <i class="ion-ionic"></i></a>
+                            </li>
+
                     <li>
                         <a href="" ng-click="sliderChanged(1)"> <i class="ion-plus-circled"></i></a>
                     </li>
@@ -99,8 +103,8 @@
                             <!--<div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading">-->
                             <div ng-if="$root.authSession!='undefined' && !isBackground() ">
                                 <div ng-if = "!minimal" >
-
-                                    <img    class="{{monitor.Monitor.selectStyle}}" id="img-{{$index}}" image-spinner-src="{{monitor.Monitor.streamingURL}}/nph-zms?mode={{getMode()}}&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{randToAvoidCacheMem}}{{appendConnKey(monitor.Monitor.connKey)}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,monitor):toggleSelectItem(monitor.Monitor.Id);" image-spinner-loader="lines" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}"    />
+                    
+                                    <img    class="{{monitor.Monitor.selectStyle}}" id="img-{{$index}}" image-spinner-src="{{constructStream(monitor)}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,monitor):toggleSelectItem(monitor.Monitor.Id);" image-spinner-loader="lines" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}"    />
                                     
 
                                     </div> 
-- 
cgit v1.2.3