diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-01-27 11:05:25 -0500 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-01-27 11:05:25 -0500 |
| commit | 48bbc1932503d9134f483354a2ead029df03a36c (patch) | |
| tree | d06cee1d142508285795087e9adba0b81b774ce9 | |
| parent | ca03105f8473f911732e04a20daccb609929d976 (diff) | |
#155 - more tweaks
Former-commit-id: c1c82ad64cef58e422e801aefdf5585ecfd1bf2c
| -rw-r--r-- | www/index.html | 2 | ||||
| -rw-r--r-- | www/js/MontageHistoryCtrl.js | 5 | ||||
| -rw-r--r-- | www/js/app.js | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/www/index.html b/www/index.html index 18d5c82a..13f2076d 100644 --- a/www/index.html +++ b/www/index.html @@ -162,7 +162,7 @@ <ion-item href="#/montage-history" menu-close> <span class=" item-icon-left"> <i class="icon ion-calendar"></i> - </span>Montage History + </span>Event Montage </ion-item> <ion-item href="#/timeline" menu-close> 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(); |