From 48bbc1932503d9134f483354a2ead029df03a36c Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Wed, 27 Jan 2016 11:05:25 -0500 Subject: #155 - more tweaks Former-commit-id: c1c82ad64cef58e422e801aefdf5585ecfd1bf2c --- www/js/MontageHistoryCtrl.js | 5 +++++ www/js/app.js | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'www/js') diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index ee13f06c..563dbcc3 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -564,6 +564,11 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc }; + $scope.isBackground = function() + { + return ZMDataModel.isBackground(); + }; + //---------------------------------------------------------------- // Alarm emit handling //---------------------------------------------------------------- diff --git a/www/js/app.js b/www/js/app.js index d82c7fc2..3f07c1a0 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -951,11 +951,12 @@ angular.module('zmApp', [ document.addEventListener("pause", function () { - console.log("****The application is going into background"); + ZMDataModel.setBackground(true); + ZMDataModel.zmLog("ROOT APP:App is going into background"); ZMDataModel.setBackground(true); - ZMDataModel.zmLog("Stopping network pull..."); + ZMDataModel.zmLog("ROOT APP: Stopping network pull..."); window.stop(); -- cgit v1.2.3