diff options
| author | PliablePixels <pliablepixels@gmail.com> | 2015-07-29 17:37:44 -0400 |
|---|---|---|
| committer | PliablePixels <pliablepixels@gmail.com> | 2015-07-29 17:37:44 -0400 |
| commit | 542305d12922c3ded15cc215ed93e1eab010bf2e (patch) | |
| tree | 312f0dcd5c841e1bf7039a114a3c701068c7828e /www/js/EventCtrl.js | |
| parent | 44563c1ca99210854c053e3b7705d29e99138aa2 (diff) | |
slideshow changed to not proceed till image fully loads
Diffstat (limited to 'www/js/EventCtrl.js')
| -rw-r--r-- | www/js/EventCtrl.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 2371983d..9df6ac7b 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -320,7 +320,7 @@ angular.module('zmApp.controllers') if (data.event.Frame[i].Type=="Alarm") { //⬤ - console.log ("**ALARM AT " + i); + //console.log ("**ALARM AT " + i); $scope.slider_options.scale.push({val:i+1,label:' '}); } else @@ -738,6 +738,7 @@ angular.module('zmApp.controllers') }); } + // now get event details to show alarm frames var loginData=ZMDataModel.getLogin(); var myurl = loginData.apiurl+'/events/'+eid+".json"; |
