diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-01-10 14:34:56 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-01-10 14:34:56 -0500 |
| commit | 8623646c266eb9e99103c9696c09456a42ac0060 (patch) | |
| tree | bd08963c93a1b9822fe3df11220a3bb116218485 /www/js/EventModalCtrl.js | |
| parent | d288da87ccc65e2ef21dd9189ac14452077cf53e (diff) | |
#499 iOS related changes, also handled case where push broadcast can be called before PortalLogin is done - needs to be handled _after_ auth
Diffstat (limited to 'www/js/EventModalCtrl.js')
| -rw-r--r-- | www/js/EventModalCtrl.js | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 6f014de2..86f2b233 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -134,7 +134,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro { NVRDataModel.debug("EventModalCtrl: Re-login detected, resetting everything & re-generating connkey"); - NVRDataModel.stopNetwork("Auth-Success inside EventModalCtrl"); + // NVRDataModel.stopNetwork("Auth-Success inside EventModalCtrl"); $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); //console.log ("********* OFFSET FROM AUTH SUCC"); $timeout(function() @@ -981,7 +981,15 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro { var cv = document.getElementById("eventchart"); - var ctx = cv.getContext("2d"); + var ctx; + try { + ctx = cv.getContext("2d"); + } + catch (e) { + NVRDataModel.debug ("2D Context ERROR, maybe live play"); + + } + frameoptions = { responsive: true, |