diff options
| -rw-r--r-- | www/index.html | 2 | ||||
| -rw-r--r-- | www/js/EventCtrl.js | 20 | ||||
| -rw-r--r-- | www/js/EventsGraphsCtrl.js | 17 | ||||
| -rw-r--r-- | www/js/MonitorCtrl.js | 16 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 19 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 4 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 4 | ||||
| -rw-r--r-- | www/templates/monitors.html | 2 | ||||
| -rw-r--r-- | www/templates/montage.html | 2 |
9 files changed, 79 insertions, 7 deletions
diff --git a/www/index.html b/www/index.html index 2ddb0be2..009b0c8c 100644 --- a/www/index.html +++ b/www/index.html @@ -77,7 +77,7 @@ <ion-item href="#/montage" menu-close><span class=" item-icon-left"> <i class="icon ion-ios-eye"></i> - </span>View</ion-item> + </span>Montage View</ion-item> <ion-item href="#/events/0" menu-close><span class=" item-icon-left"> <i class="icon ion-ios-calendar-outline"></i> diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 0f24cead..cbb810f2 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -11,6 +11,26 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', function ($ion $ionicSideMenuDelegate.toggleLeft(); } + $scope.$on('$ionicView.loaded', function(){ + console.log("**VIEW ** Events Ctrl Loaded"); + }); + + $scope.$on('$ionicView.enter', function(){ + console.log("**VIEW ** Events Ctrl Entered"); + }); + + $scope.$on('$ionicView.leave', function(){ + console.log("**VIEW ** Events Ctrl Left"); + }); + + $scope.$on('$ionicView.unloaded', function(){ + console.log("**VIEW ** Events Ctrl Unloaded"); + console.log ("*** MODAL ** Destroying modal too"); + $scope.modal.remove(); + + }); + + // This is a modal to show the event footage $ionicModal.fromTemplateUrl('templates/events-modal.html', { scope: $scope, diff --git a/www/js/EventsGraphsCtrl.js b/www/js/EventsGraphsCtrl.js index 8a082db5..8523a5c7 100644 --- a/www/js/EventsGraphsCtrl.js +++ b/www/js/EventsGraphsCtrl.js @@ -8,6 +8,23 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', functio $ionicSideMenuDelegate.toggleLeft(); } + $scope.$on('$ionicView.loaded', function(){ + console.log("**VIEW ** Graph Ctrl Loaded"); + }); + + $scope.$on('$ionicView.enter', function(){ + console.log("**VIEW ** Graph Ctrl Entered"); + }); + + $scope.$on('$ionicView.leave', function(){ + console.log("**VIEW ** Graph Ctrl Left"); + }); + + $scope.$on('$ionicView.unloaded', function(){ + console.log("**VIEW ** Graph Ctrl Unloaded"); + }); + + $scope.navTitle = 'Tab Page'; $scope.leftButtons = [{ type: 'button-icon icon ion-navicon', diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js index ec919c1d..b6705854 100644 --- a/www/js/MonitorCtrl.js +++ b/www/js/MonitorCtrl.js @@ -9,6 +9,22 @@ $scope.openMenu = function () { $ionicSideMenuDelegate.toggleLeft(); } + $scope.$on('$ionicView.loaded', function(){ + console.log("**VIEW ** Monitor Ctrl Loaded"); + }); + + $scope.$on('$ionicView.enter', function(){ + console.log("**VIEW ** Monitor Ctrl Entered"); + }); + + $scope.$on('$ionicView.leave', function(){ + console.log("**VIEW ** Monitor Ctrl Left"); + }); + + $scope.$on('$ionicView.unloaded', function(){ + console.log("**VIEW ** Monitor Ctrl Unloaded"); + }); + $scope.openModal = function (mid) { console.log("Open Monitor Modal"); diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index ed7acc3d..698c586b 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -7,6 +7,25 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', function ($s $ionicSideMenuDelegate.toggleLeft(); } + + $scope.$on('$ionicView.loaded', function(){ + console.log("**VIEW ** Montage Ctrl Loaded"); + }); + + $scope.$on('$ionicView.enter', function(){ + console.log("**VIEW ** Montage Ctrl Entered"); + }); + + $scope.$on('$ionicView.leave', function(){ + console.log("**VIEW ** Montage Ctrl Left"); + }); + + $scope.$on('$ionicView.unloaded', function(){ + console.log("**VIEW ** Montage Ctrl Unloaded"); + }); + + + $scope.getMontageImagePath = function () { return ZMDataModel.getMontageImagePath(); diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index d275f0a7..d6eaefb8 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -1,4 +1,4 @@ -<ion-modal-view> +<ion-modal-view cache="false"> <!-- <ion-header-bar> <h1 class="title"> @@ -15,7 +15,7 @@ <!-- replay can also be gapless --> <div ng-if="!isSimulated()"> <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; "> - <img ng-src="{{loginData.url}}/cgi-bin/nph-zms?source=event&mode=jpeg&event={{eventId}}&frame=1&scale=100&rate=100&maxfps=5&replay=single&user={{loginData.username}}&pass={{loginData.password}}&connkey={{connKey}}" width="100%" /> + <img ng-src="{{loginData.url}}/cgi-bin/nph-zms?source=event&mode=jpeg&event={{eventId}}&frame=1&rate=100&maxfps=5&replay=single&user={{loginData.username}}&pass={{loginData.password}}&connkey={{connKey}}" width="100%" /> </ion-scroll> </div> diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index ea5f8a1d..aa9f416c 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -1,4 +1,4 @@ -<ion-modal-view> +<ion-modal-view cache="false"> <!-- <ion-header-bar> <h1 class="title"> @@ -16,7 +16,7 @@ <div ng-if="!isSimulated()"> <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; "> - <img ng-src="{{LoginData.url}}/cgi-bin/nph-zms?mode=jpeg&monitor={{monitorId}}&scale=100&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="100%" /> + <img ng-src="{{LoginData.url}}/cgi-bin/nph-zms?mode=jpeg&monitor={{monitorId}}&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="100%" /> </ion-scroll> </div> diff --git a/www/templates/monitors.html b/www/templates/monitors.html index 9ba3df04..7e947273 100644 --- a/www/templates/monitors.html +++ b/www/templates/monitors.html @@ -1,4 +1,4 @@ -<ion-view view-title="Monitors"> +<ion-view view-title="Monitors" cache="false"> <ion-nav-buttons side="left"> <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button> diff --git a/www/templates/montage.html b/www/templates/montage.html index d6414837..bf2e5d96 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -27,7 +27,7 @@ and auth token mode --> <div ng-if="!isSimulated()"> <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; "> - <img ng-src="{{LoginData.url}}/cgi-bin/nph-zms?mode=jpeg&monitor={{monitor.Monitor.Id}}&scale=100&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;" /> + <img ng-src="{{LoginData.url}}/cgi-bin/nph-zms?mode=jpeg&monitor={{monitor.Monitor.Id}}&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;" /> </ion-scroll> </div> |