summaryrefslogtreecommitdiff
path: root/www/js/MontageCtrl.js
diff options
context:
space:
mode:
authorPliablePixels <pliablepixels@gmail.com>2015-08-28 11:52:59 -0400
committerPliablePixels <pliablepixels@gmail.com>2015-08-28 11:52:59 -0400
commitb9f387782bf9ea222d52eac954f1bddad8131391 (patch)
tree94e349c9e2ff709237e32adf0cc9f25632391874 /www/js/MontageCtrl.js
parent4332c99d924cd00b6a6e5f1b306db8da58b2ab59 (diff)
Implemented auth key into the app so each image refresh in Montage and Monitor view does not hit the ZM DB and generate a million records. Solves the log pings of https://github.com/pliablepixels/zmNinja/issues/26
Diffstat (limited to 'www/js/MontageCtrl.js')
-rw-r--r--www/js/MontageCtrl.js32
1 files changed, 32 insertions, 0 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index e7941ccf..26e5af6b 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -158,6 +158,38 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
$scope.LoginData = ZMDataModel.getLogin();
$scope.monLimit = $scope.LoginData.maxMontage;
console.log("********* Inside Montage Ctrl, MAX LIMIT=" + $scope.monLimit);
+
+
+ $rootScope.authSession = "undefined";
+ $ionicLoading.show({
+ template: 'negotiating stream authentication...',
+ animation: 'fade-in',
+ showBackdrop: true,
+ duration: zm.loadingTimeout,
+ maxWidth: 300,
+ showDelay: 0
+ });
+
+
+ var ld = ZMDataModel.getLogin();
+ ZMDataModel.getAuthKey()
+ .then(function(success)
+ {
+ $ionicLoading.hide();
+ console.log (success);
+ $rootScope.authSession =success;
+ ZMDataModel.zmLog ("Stream authentication construction: " +
+ $rootScope.authSession);
+
+ },
+ function (error)
+ {
+
+ $ionicLoading.hide();
+ console.log (error);
+ //$rootScope.authSession="";
+ ZMDataModel.zmLog ("Modal: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
+ });
// I was facing a lot of problems with Chrome/crosswalk getting stuck with