diff options
| -rw-r--r-- | www/js/EventModalCtrl.js | 1 | ||||
| -rwxr-xr-x | www/js/app.js | 7 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 20 |
3 files changed, 26 insertions, 2 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index f1953c5d..b8a7acbc 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -177,6 +177,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro handle.pause(); handle.setPlayback(NVRDataModel.getLogin().videoPlaybackSpeed); handle.play(); + NVRDataModel.debug ("*** Invoking play"); }, 300); diff --git a/www/js/app.js b/www/js/app.js index b006390a..09e4d444 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -102,6 +102,13 @@ angular.module('zmApp', [ }) +//http://stackoverflow.com/a/24519069/1361529 +.filter('trusted', ['$sce', function ($sce) { + return function(url) { + return $sce.trustAsResourceUrl(url); + }; +}]) + // for events view .filter ('eventListFilter', function(NVRDataModel) diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 2e916f57..68065e24 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -18,10 +18,26 @@ <!-- no default video --> <div ng-if="defaultVideo!==undefined && defaultVideo!='' && loginData.enableh264 == true"> <div ng-if="videoIsReady"> + + + + <div style="height:{{$root.devHeight}}px; width:{{$root.devWidth}}px;"> - <videogular vg-error="onVideoError($event)" vg-can-play="onCanPlay()" vg-native-fullscreen="videoObject.config.nativeFullScreen" vg-player-ready="onPlayerReady($API)" + + <!-- + + <br/><br/><br/><br/><br/><br/> + + Falback testing:{{ video_url | trusted}} + <video controls> + <source ng-src="{{video_url | trusted}}" type="video/mp4" /> + Your browser does not support the video tag. + </video> + + --> + <videogular vg-can-play="onCanPlay()" vg-native-fullscreen="videoObject.config.nativeFullScreen" vg-player-ready="onPlayerReady($API)" vg-update-playback="onPlaybackUpdate($playBack)" - vg-plays-inline="videoObject.config.playsInline" vg-theme="videoObject.config.theme" vg-complete="playbackFinished()" on-double-tap="closeModal();" vg-autoplay="videoObject.config.autoPlay" vg-responsive="videoObject.config.responsive" vg-update-time="videoTime(event.Event.StartTime,$currentTime)"> + vg-plays-inline="videoObject.config.playsInline" vg-theme="videoObject.config.theme" vg-complete="playbackFinished()" on-double-tap="closeModal();" vg-autoplay="videoObject.config.autoPlay" vg-responsive="videoObject.config.responsive" vg-update-time="videoTime(event.Event.StartTime,$currentTime)" vg-error="onVideoError($event)"> <vg-media vg-src="videoObject.config.sources" vg-native-controls="videoObject.config.nativeControls"> </vg-media> <vg-controls> |