From ca03105f8473f911732e04a20daccb609929d976 Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Wed, 27 Jan 2016 08:44:39 -0500
Subject: #155 more tweaks

Former-commit-id: aca2e26558a75cc2071971f5c83f0b32eab054de
---
 www/js/DataModel.js          |  6 +++---
 www/js/MontageHistoryCtrl.js | 30 +++++++++++++++++++++++++-----
 www/js/app.js                |  3 ++-
 3 files changed, 30 insertions(+), 9 deletions(-)

(limited to 'www/js')

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index b1d5b578..8e3915f5 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -63,7 +63,7 @@ angular.module('zmApp.controllers')
          'montageSize':'3',
          'useNphZms':true,
          'packMontage':true,
-         'exitOnSleep':true,
+         'exitOnSleep':false,
          
         
     };
@@ -246,8 +246,8 @@ angular.module('zmApp.controllers')
                 
                 if (typeof loginData.exitOnSleep == 'undefined')
                 {
-                    zmDebug ("exitOnSleep does not exist. Setting to true");
-                    loginData.exitOnSleep  = true;
+                    zmDebug ("exitOnSleep does not exist. Setting to false");
+                    loginData.exitOnSleep  = false;
                 }
                 
                 zmLog ("DataModel init recovered this loginData as " + JSON.stringify(loginData));
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 9d2d4857..ee13f06c 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -88,6 +88,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
         
             $http.get(apiurl)
             .success( function(data) {
+                
+                
                 ZMDataModel.zmDebug ("Got new history events:"+ JSON.stringify(data));
                 var eid, mid;
                 for (i=0; i<data.events.length; i++)
@@ -101,9 +103,17 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
                        // that's the earliest match and play gapless from there
                        if ($scope.MontageMonitors[j].Monitor.Id == mid)
                        {
-                       if ($scope.MontageMonitors[j].eventUrl == 'img/noevent.png')    
-                           $scope.MontageMonitors[j].eventUrl=ld.streamingurl+"/nph-zms?source=event&mode=jpeg&event="+eid+"&frame=1&replay="+($scope.sliderVal.enableGapless?"gapless":"single");
-                        
+                       if ($scope.MontageMonitors[j].eventUrl == 'img/noevent.png')
+                           
+                           if (!ZMDataModel.isBackground())
+                           {
+                                $scope.MontageMonitors[j].eventUrl=ld.streamingurl+"/nph-zms?source=event&mode=jpeg&event="+eid+"&frame=1&replay="+($scope.sliderVal.enableGapless?"gapless":"single");
+                           }
+                           else 
+                           {
+                               ZMDataModel.zmLog ("Setting img src to null as we are in background");
+                               $scope.MontageMonitors[j].eventUrl="";
+                           }
                        }
                     }
                 }
@@ -148,9 +158,19 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
                // console.log ("EXPANDED DATA FOR MONITOR " + i + JSON.stringify(data));
                 if (data.events.length > 0 )
                 {
-                    $scope.MontageMonitors[i].eventUrl=ld.streamingurl+"/nph-zms?source=event&mode=jpeg&event="+data.events[0].Event.Id+"&frame=1&replay="+($scope.sliderVal.enableGapless?"gapless":"single");
                     
-                    ZMDataModel.zmLog ("Found expanded event "+data.events[0].Event.Id+" for monitor " + $scope.MontageMonitors[i].Monitor.Id);
+                    if (!ZMDataModel.isBackground())
+                    {
+
+                        $scope.MontageMonitors[i].eventUrl=ld.streamingurl+"/nph-zms?source=event&mode=jpeg&event="+data.events[0].Event.Id+"&frame=1&replay="+($scope.sliderVal.enableGapless?"gapless":"single");
+
+                        ZMDataModel.zmLog ("Found expanded event "+data.events[0].Event.Id+" for monitor " + $scope.MontageMonitors[i].Monitor.Id);
+                    }
+                    else
+                    {
+                        $scope.MontageMonitors[i].eventUrl="";
+                        ZMDataModel.zmLog ("Setting img src to null as data received in background");
+                    }
                 }
                 
             })
diff --git a/www/js/app.js b/www/js/app.js
index 0322d456..d82c7fc2 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -954,6 +954,7 @@ angular.module('zmApp', [
                 console.log("****The application is going into  background");
                 ZMDataModel.zmLog("ROOT APP:App is going into background");
 
+                ZMDataModel.setBackground(true);
                 ZMDataModel.zmLog("Stopping network pull...");
                 window.stop();
             
@@ -970,7 +971,7 @@ angular.module('zmApp', [
                     //  ZMDataModel.zmDebug("sending enable push to Event Server");
                     //EventServer.sendMessage('push', {type:'control',enablepush:'1'});
                 }
-                ZMDataModel.setBackground(true);
+                
 
                 zmAutoLogin.stop();
                 if ($rootScope.zmPopup)
-- 
cgit v1.2.3