summaryrefslogtreecommitdiff
path: root/www/js/MonitorCtrl.js
diff options
context:
space:
mode:
authorARC <arjunrc@gmail.com>2015-04-29 20:37:28 -0400
committerARC <arjunrc@gmail.com>2015-04-29 20:37:28 -0400
commiteabc4988d8627690a0a1111a9a163cbe03692bca (patch)
treef781e1cef5cf40bff0192a1a1015ca42f015a0b8 /www/js/MonitorCtrl.js
parentcc75f665b426051fa0bab30167f78cf3aae5cf23 (diff)
fixed modals to make sure images load only when user taps on view button. No sense in wasting memory. Image override directives are being called correctly. Now I need to expriment with how to overwrite image frames when ZMS is still sending data to the client to avoid the blank screen issue
Diffstat (limited to 'www/js/MonitorCtrl.js')
-rw-r--r--www/js/MonitorCtrl.js24
1 files changed, 13 insertions, 11 deletions
diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index 8be9bdbe..69d190d0 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -42,11 +42,21 @@ $scope.reloadView = function ()
$scope.monitorId = mid;
$scope.LoginData = ZMDataModel.getLogin();
$scope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
- $scope.modal.show();
+
+ // This is a modal to show the monitor footage
+ $ionicModal.fromTemplateUrl('templates/monitors-modal.html', {
+ scope: $scope,
+ animation: 'slide-in-up'
+ })
+ .then(function (modal) {
+ $scope.modal = modal;
+ $scope.modal.show();
+ });
+
};
$scope.closeModal = function () {
- console.log("Close Monitor Modal");
- $scope.modal.hide();
+ console.log("Close & Destroy Monitor Modal");
+ $scope.modal.remove();
};
//Cleanup the modal when we're done with it!
@@ -55,15 +65,7 @@ $scope.reloadView = function ()
$scope.modal.remove();
});
-// This is a modal to show the monitor footage
- $ionicModal.fromTemplateUrl('templates/monitors-modal.html', {
- scope: $scope,
- animation: 'slide-in-up'
- })
- .then(function (modal) {
- $scope.modal = modal;
- });
console.log("***EVENTS: Waiting for Monitors to load before I proceed");