summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config.xml2
-rw-r--r--www/js/EventCtrl.js133
-rw-r--r--www/js/EventServer.js5
-rw-r--r--www/js/NVR.js1
4 files changed, 36 insertions, 105 deletions
diff --git a/config.xml b/config.xml
index 77963746..026cd226 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.5.000" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.5.001" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>zmNinja</name>
<description>
High performance ZoneMinder client
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index ed0d457b..fa1c25b8 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -750,9 +750,15 @@ angular.module('zmApp.controllers')
if (myevents.length < maxEventsToLoad) {
//console.log ("EVENTS LOADED="+JSON.stringify($scope.events));
NVR.debug("EventCtrl:loading one more page just in case we don't have enough to display");
- loadMore();
+ loadMore()
+ .then (function () {
+ return d.resolve(true);
+ });
+
+ } else {
+ return d.resolve(true);
+
}
- return d.resolve(true);
});
return (d.promise);
}
@@ -3063,19 +3069,37 @@ angular.module('zmApp.controllers')
// loads next page of events
//--------------------------------------------------------
+ $scope.loadMore = function () {
+
+ var now = Date.now();
+ if (now - loadMoreTime > 1500) {
+ NVR.debug("$scope.loadMore > loadMore() ... delta: " + (now - loadMoreTime));
+ loadMore();
+ loadMoreTime = Date.now();
+ $scope.$broadcast('scroll.infiniteScrollComplete');
+ }
+ else {
+ NVR.debug("$scope.loadMore ... delta: " + (now - loadMoreTime));
+ $timeout(function () {
+ $scope.$broadcast('scroll.infiniteScrollComplete');
+ }, 250);
+ }
+ };
+
function loadMore() {
// the events API does not return an error for anything
// except greater page limits than reported
//console.log("***** LOADING MORE INFINITE SCROLL ****");
+ var d = $q.defer();
if ((currEventsPage >= maxEventsPage) && (pageLoaded)) {
moreEvents = false;
NVR.debug("No more - We have a total of " + maxEventsPage + " and are at page=" + currEventsPage);
// console.log("*** At Page " + currEventsPage + " of " + maxEventsPage + ", not proceeding");
$ionicLoading.hide();
- return;
+ return d.resolve(true);
}
currEventsPage++;
@@ -3085,7 +3109,7 @@ angular.module('zmApp.controllers')
$scope.$broadcast('scroll.infiniteScrollComplete');
// console.log("**** LOADMORE ARTIFICALLY DISABLED");
- return;
+ return d.resolve(true);
}
var loadingStr = "";
@@ -3176,6 +3200,7 @@ angular.module('zmApp.controllers')
//console.log("Got new page of events");
moreEvents = true;
$scope.$broadcast('scroll.infiniteScrollComplete');
+ return d.resolve(true);
},
function (error) {
@@ -3183,109 +3208,13 @@ angular.module('zmApp.controllers')
moreEvents = false;
$ionicLoading.hide();
$scope.$broadcast('scroll.infiniteScrollComplete');
+ return d.resolve(true);
});
+ return d.promise;
}
- function loadMoreNew() {
- // the events API does not return an error for anything
- // except greater page limits than reported
-
- //console.log("***** LOADING MORE INFINITE SCROLL ****");
- loadMoreTime = Date.now();
-
- if (currentPagePosition > 0 && currentPagePosition >= currentPageLength) {
- currEventsPage++;
- currentPagePosition = 0;
- currentPageLength = 0;
- }
- NVR.debug("EventCtrl:loadMore() currEventsPage: " + currEventsPage + ", currentPagePosition: " + currentPagePosition + ", currentPageLength: " + currentPageLength);
-
- if (currEventsPage > maxEventsPage) {
- moreEvents = false;
- $scope.nextEvents = true;
- NVR.debug("No more - We have a total of " + maxEventsPage + " and are at page=" + currEventsPage);
-
- // console.log("*** At Page " + currEventsPage + " of " + maxEventsPage + ", not proceeding");
- $ionicLoading.hide();
- return;
- }
-
- if (!enableLoadMore) {
- $ionicLoading.hide();
- moreEvents = false; // Don't ion-scroll till enableLoadMore is true;
- $scope.nextEvents = true;
- $scope.$broadcast('scroll.infiniteScrollComplete');
-
- // console.log("**** LOADMORE ARTIFICALLY DISABLED");
- return;
- }
-
- var loadingStr = "";
- if ($scope.search.text != "") {
- var toastStr = $translate.instant('kPleaseWait') +'...'+ currEventsPage;
- // console.log ("SHOW " + toastStr );
- $ionicLoading.show({
- maxwidth: 100,
- noBackdrop:true,
- scope: $scope,
- template: toastStr,
- //template: '<button class="button button-clear icon-left ion-close-circled button-text-wrap" ng-click="cancelSearch()" >' + toastStr + '</button>'
- });
-
- loadingStr = "none";
- }
-
- nolangFrom = "";
- nolangTo = "";
- if ($rootScope.fromString)
- nolangFrom = moment($rootScope.fromString).locale('en').format("YYYY-MM-DD HH:mm:ss");
- if ($rootScope.toString)
- nolangTo = moment($rootScope.toString).locale('en').format("YYYY-MM-DD HH:mm:ss");
-
- if (currentPagePosition && currentPageData) {
- loadEvents(currentPageData);
- //console.log("Got new page of events");
- moreEvents = true;
- }
- else {
- NVR.getEvents($scope.id, currEventsPage, loadingStr, nolangFrom, nolangTo, false,$rootScope.monitorsFilter)
- .then( function (data) {
- // console.log(JSON.stringify(data.pagination));
- if (data.pagination && data.pagination.pageCount)
- maxEventsPage = data.pagination.pageCount;
-
- loadEvents(data);
- currentPageData = data;
- //console.log("Got new page of events");
- moreEvents = true;
- },
-
- function (error) {
- // console.log("*** No More Events to Load, Stop Infinite Scroll ****");
- moreEvents = false;
- $ionicLoading.hide();
- });
- }
- }
-
- $scope.loadMore = function () {
-
- var now = Date.now();
- if (now - loadMoreTime > 1500) {
- NVR.debug("$scope.loadMore > loadMore() ... delta: " + (now - loadMoreTime));
- loadMore();
- loadMoreTime = Date.now();
- $scope.$broadcast('scroll.infiniteScrollComplete');
- }
- else {
- NVR.debug("$scope.loadMore ... delta: " + (now - loadMoreTime));
- $timeout(function () {
- $scope.$broadcast('scroll.infiniteScrollComplete');
- }, 250);
- }
- };
function loadEvents(data) {
var loginData = NVR.getLogin();
diff --git a/www/js/EventServer.js b/www/js/EventServer.js
index 8dac402e..8b1ceb01 100644
--- a/www/js/EventServer.js
+++ b/www/js/EventServer.js
@@ -45,7 +45,8 @@ angular.module('zmApp.controllers')
user: loginData.username,
password: loginData.password,
monlist: loginData.eventServerMonitors,
- intlist: loginData.eventServerInterval
+ intlist: loginData.eventServerInterval,
+ appversion: NVR.getAppVersion()
});
@@ -633,7 +634,7 @@ angular.module('zmApp.controllers')
NVR.debug("push: EventSever: received push notification with payload:"+JSON.stringify(message));
- if ($rootScope.platformOS == 'ios') {
+ if ($rootScope.platformOS != 'desktop') {
NVR.debug ("push: clearing badge");
window.FirebasePlugin.setBadgeNumber(0);
}
diff --git a/www/js/NVR.js b/www/js/NVR.js
index 301091a6..e695649d 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -3807,6 +3807,7 @@ angular.module('zmApp.controllers')
$http.get(myurl /*,{timeout:15000}*/ )
.then(function (data) {
data = data.data;
+// console.log (data);
if (loadingStr != 'none') $ionicLoading.hide();
//myevents = data.events;
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 05:51:16 +0000