diff options
| -rw-r--r-- | config.xml | 2 | ||||
| -rw-r--r-- | www/js/MomentCtrl.js | 15 |
2 files changed, 15 insertions, 2 deletions
@@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.514" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.515" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>zmNinja</name> <description> High performance ZoneMinder client diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js index a52e5466..60b78c5a 100644 --- a/www/js/MomentCtrl.js +++ b/www/js/MomentCtrl.js @@ -505,11 +505,24 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ moments = objSort(moments, [sortCondition, ascordesc], ["dateObject", true]); } - $scope.moments = moments; + if (moments.length && !moments[0].Event.MaxScoreFramed) { + $ionicPopup.alert({ + title: $translate.instant('kNote'), + template: "{{'kApiUpgrade' | translate }}", + okText: $translate.instant('kButtonOk'), + cancelText: $translate.instant('kButtonCancel'), + }); + } + + else { + $scope.moments = moments; $timeout(function () { initMasonry(); }, 300); + } + + /* if (sortCondition == "MonitorId") { moments.sort(function(a, b) { var da = a.Event.MonitorId; |