summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.xml2
-rw-r--r--www/js/EventCtrl.js15
-rw-r--r--www/js/ModalCtrl.js2
-rw-r--r--www/js/app.js3
4 files changed, 7 insertions, 15 deletions
diff --git a/config.xml b/config.xml
index bdf3e0f7..ca822bca 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="com.pliablepixels.zmninja" version="0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.pliablepixels.zmninja" version="0.61" 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/EventCtrl.js b/www/js/EventCtrl.js
index c0e8f7d6..7320a03c 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -62,11 +62,6 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', ['$scope', '$r
// FIXME: This is a hack
var pageLoaded = false;
-
-
- // FIXME: Hack or elegance?
- // to get rid of full stack event get on search
-
var enableLoadMore = true;
// When loading images, it sometimes takes time - the images can be quite
@@ -87,10 +82,6 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', ['$scope', '$r
// First get total pages and then
// start from the latest. If this fails, nothing displays
- // FIXME: clean up error handling
-
- // FIXME: call loadMore once -- to fill up page. Its possible
- // last event page only has a few records
ZMDataModel.getEventsPages($scope.id)
.then(function (data) {
@@ -119,6 +110,9 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', ['$scope', '$r
});
+ // not explictly handling error --> I have a default "No events found" message
+ // displayed in the template if events list is null
+
$scope.openMenu = function () {
$ionicSideMenuDelegate.toggleLeft();
@@ -265,8 +259,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', ['$scope', '$r
});
}
var loginData = ZMDataModel.getLogin();
- // FIXME: CMD_SLOWFWD CMD_FASTFWD and REVs
- // Also read up CMD_QUERY as the stream is playing
+
/*
var CMD_NONE = 0;
var CMD_PAUSE = 1;
diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js
index a9c45c34..535cadf3 100644
--- a/www/js/ModalCtrl.js
+++ b/www/js/ModalCtrl.js
@@ -175,7 +175,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
console.log("****RETURNING " + foo);
return foo;
},
- //FIXME: Refer to
+ // NOTE: Refer to
// zoneminder/skins/mobile/includes/control_functions.php
// for move commands
// logic - /zm/api/monitors/X.json, read ControlId = Y
diff --git a/www/js/app.js b/www/js/app.js
index d3e97a17..bf6e646f 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -439,8 +439,7 @@ angular.module('zmApp', [
var defaultState = "/montage";
//var defaultState = "/login";
// as it turns out I can't really inject a factory in config the normal way
- // FIXME: In future, read up http://stackoverflow.com/questions/15937267/inject-service-in-app-config
- //var defaultState = (ZMDataModel.isLoggedIn())? "/monitors":"/login";
+
//$urlRouterProvider.otherwise(defaultState);