diff options
| -rw-r--r-- | www/js/EventCtrl.js | 7 | ||||
| -rw-r--r-- | www/js/TimelineCtrl.js | 3 | ||||
| -rw-r--r-- | www/js/app.js | 2 | ||||
| -rw-r--r-- | www/templates/devoptions.html | 2 | ||||
| -rw-r--r-- | www/templates/events.html | 12 |
5 files changed, 17 insertions, 9 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index a7cefade..001e98ea 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -698,7 +698,8 @@ angular.module('zmApp.controllers') // now get event details to show alarm frames var loginData = ZMDataModel.getLogin(); - + if (typeof event.Event.DefaultVideo === 'undefined') + event.Event.DefaultVideo=""; // grab video details event.Event.video = {}; var videoURL = loginData.url + "/events/" + event.Event.relativePath + event.Event.DefaultVideo; @@ -1122,8 +1123,12 @@ angular.module('zmApp.controllers') $scope.eFramesNum = eframes; $scope.eventDur = Math.round(edur); $scope.loginData = ZMDataModel.getLogin(); + if (typeof event.Event.DefaultVideo === 'undefined') + event.Event.DefaultVideo=""; + $scope.defaultVideo = event.Event.DefaultVideo; + event.Event.video = {}; var videoURL = $scope.loginData.url + "/events/" + event.Event.relativePath + event.Event.DefaultVideo; diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 762ece16..75779aff 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -679,6 +679,9 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla if (idfound) { + + if (typeof myevents[i].Event.DefaultVideo === 'undefined') + myevents[i].Event.DefaultVideo=""; graphData.add({ id: graphIndex, content: "<span class='my-vis-font'>" + myevents[i].Event.Notes + "</span>", diff --git a/www/js/app.js b/www/js/app.js index 982a995e..45b5f56c 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -32,7 +32,7 @@ angular.module('zmApp', [ //----------------------------------------------- .constant('zm', { - minAppVersion: '1.28.105', // if ZM is less than this, the app won't work + minAppVersion: '1.28.107', // if ZM is less than this, the app won't work minEventServerVersion: '0.4', gcmSenderId:'710936220256', httpTimeout: 15000, diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html index c6a56447..0be0758f 100644 --- a/www/templates/devoptions.html +++ b/www/templates/devoptions.html @@ -67,7 +67,7 @@ <label> <ion-toggle ng-model="loginData.enableh264" ng-checked="{{loginData.enableh264}}" - toggle-class="toggle-calm">Enable H.264 video branch support</ion-toggle> + toggle-class="toggle-calm"> H264 Video support</ion-toggle> </label> diff --git a/www/templates/events.html b/www/templates/events.html index a894495e..af7224e9 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -54,22 +54,22 @@ <div ng-switch-when="Motion"> <i class="ion-android-walk" style="float:left; font-size:200%;"></i> - <div ng-if="event.Event.DefaultVideo!=''"> - <i class="ion-ios-videocam" style="float:left; padding-left:5px; font-size:200%;"></i> + <div ng-if="event.Event.DefaultVideo !== undefined && event.Event.DefaultVideo!=''"> + <i class="ion-ios-videocam" style="float:left; padding-left:5px; font-size:100%;"></i> </div> <br/> </div> <div ng-switch-when="Signal"> <i class="ion-wifi" style="float:left; font-size:200%;"></i> - <div ng-if="event.Event.DefaultVideo!=''"> - <i class="ion-ios-videocam" style="float:left; padding-left:5px;font-size:200%;"></i> + <div ng-if=" event.Event.DefaultVideo !== undefined && event.Event.DefaultVideo!=''"> + <i class="ion-ios-videocam" style="float:left; padding-left:5px;font-size:100%;"></i> </div> <br/> </div> <div ng-switch-default> <i class="ion-ionic" style="float:left; font-size:200%;"></i> - <div ng-if="event.Event.DefaultVideo!=''"> - <i class="ion-ios-videocam" style="float:left; padding-left:5px;font-size:200%;"></i> + <div ng-if= "event.Event.DefaultVideo !== undefined && event.Event.DefaultVideo!=''"> + <i class="ion-ios-videocam" style="float:left; padding-left:5px;font-size:100%;"></i> </div> <br/> </div> |