diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/MomentCtrl.js | 44 | ||||
| -rw-r--r-- | www/lang/locale-en.json | 2 | ||||
| -rw-r--r-- | www/templates/moment-popover.html | 10 | ||||
| -rw-r--r-- | www/templates/moment.html | 4 |
4 files changed, 43 insertions, 17 deletions
diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js index 39351a36..2b7d6f40 100644 --- a/www/js/MomentCtrl.js +++ b/www/js/MomentCtrl.js @@ -256,6 +256,28 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ }; + + +//---------------------------------------------------------------- +// construct popover only when needed +// so that we can use one-time binding for the compare function +//---------------------------------------------------------------- + $scope.isChecked=function(val) { + //console.log ("COMPARE"); + return $translate.instant(val) == $scope.type; + } + + $scope.showPopover = function($event) { + + $ionicPopover.fromTemplateUrl('templates/moment-popover.html', { + scope: $scope, + }).then(function (popover) { + $scope.popover = popover; + popover.show($event); + }); + + } + //---------------------------------------------------------------- // Pinning a thumbnail means don't collapse it. Useful to drill // down quickly. @@ -660,13 +682,21 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ function getMoments(sortCondition, to) { - if (sortCondition == 'MaxScore') - $scope.type = $translate.instant('kMomentMenuByScore'); - else if (sortCondition == 'StartTime') + if (sortCondition == 'MaxScore') { + $scope.type = $translate.instant + ('kMomentMenuByScore'); + $scope.typeIcon = "ion-arrow-graph-up-right"; + } + else if (sortCondition == 'StartTime') { $scope.type = $translate.instant('kMomentMenuByTime'); - else if (sortCondition == 'monitorName') + $scope.typeIcon = "ion-clock"; + } + else if (sortCondition == 'monitorName') { $scope.type = $translate.instant('kMomentMenuByMonitor'); + $scope.typeIcon = "ion-ios-videocam"; + } + $scope.apiurl = NVRDataModel.getLogin().apiurl; moments.length = 0; @@ -820,11 +850,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ }); $scope.$on('$ionicView.afterEnter', function () { - $ionicPopover.fromTemplateUrl('templates/moment-popover.html', { - scope: $scope, - }).then(function (popover) { - $scope.popover = popover; - }); + getMoments(momentType); diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 60277461..e8324463 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -210,7 +210,7 @@ "kMinVersion" :"Minimum Required Version", "kMinimumIntervals" :"minimum interval", "kMode" :"Mode", - "kMoment24Heading" :"24hr Preview", + "kMoment24Heading" :"24hr", "kMomentLoadError" :"Error retrieving moments", "kMomentMenuByMonitor" :"by camera", "kMomentMenuByTime" :"by time", diff --git a/www/templates/moment-popover.html b/www/templates/moment-popover.html index 2da37112..6d2f49fc 100644 --- a/www/templates/moment-popover.html +++ b/www/templates/moment-popover.html @@ -1,16 +1,16 @@ <ion-popover-view class="fit"> <ion-content> - <div class="list" ng-click="popover.hide()"> + <div class="list" ng-click="popover.remove()"> - <a class="item" ng-href="" ng-click="popover.hide();getMoments('StartTime');"> - {{'kMomentMenuByTime' | translate}} + <a class="item" ng-href="" ng-click="popover.remove();getMoments('StartTime');"> + {{'kMomentMenuByTime' | translate}} <i ng-if="::isChecked('kMomentMenuByTime')" class="ion-checkmark"></i> </a> - <a class="item" ng-href="" ng-click="popover.hide();getMoments('monitorName');">{{'kMomentMenuByMonitor' | translate}}</a> + <a class="item" ng-href="" ng-click="popover.remove();getMoments('monitorName');">{{'kMomentMenuByMonitor' | translate}} <i ng-if="::isChecked('kMomentMenuByMonitor')" class="ion-checkmark"></i></a> - <a class="item" ng-href="" ng-click="popover.hide();getMoments('MaxScore');">{{'kMomentMenuByScore' | translate}}</a> + <a class="item" ng-href="" ng-click="popover.remove();getMoments('MaxScore');">{{'kMomentMenuByScore' | translate}} <i ng-if="::isChecked('kMomentMenuByScore')" class="ion-checkmark"></i></a> </div> diff --git a/www/templates/moment.html b/www/templates/moment.html index 3ce02627..d2bbe8d8 100644 --- a/www/templates/moment.html +++ b/www/templates/moment.html @@ -1,5 +1,5 @@ <ion-view cache-view="false"> - <ion-nav-title>{{'kMoment24Heading' | translate}} {{type}}</ion-nav-title> + <ion-nav-title><i class="{{typeIcon}}"></i> {{'kMoment24Heading' | translate}}</ion-nav-title> <ion-nav-buttons side="left"> <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button> <button class="button button-icon button-clear ion-gear-b" ng-click="hideUnhide()"></button> @@ -12,7 +12,7 @@ <a class="button button-icon icon ion-chevron-down" ng-click="toggleSubMenu()" ;></a> - <a class="button button-icon icon ion-android-more-vertical " ng-click="popover.show($event)" ;> </a> + <a class="button button-icon icon ion-android-more-vertical " ng-click="showPopover($event)" ;> </a> |