diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-21 16:04:07 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-21 16:04:07 -0400 |
| commit | aec88217f55948fdb0da242c42ace38b93e511e9 (patch) | |
| tree | 89d40aeac849b93a54c540fb7510626eb7d5ab47 /www | |
| parent | 292dba10da1061784a198dd4ca6bc2ec791f78e7 (diff) | |
ios play video inline hack
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/EventModalCtrl.js | 4 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 1e6a31ef..984f5742 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -158,6 +158,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro //console.log ("*********** ON PLAY READY"); NVRDataModel.debug ("On Play Ready invoked"); handle = api; + handle.mediaElement.attr("playsinline", ""); $ionicLoading.show( { @@ -1815,7 +1816,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); - currentStreamState = streamState.ACTIVE; + if (currentStreamState!=streamState.SNAPSHOT) + currentStreamState = streamState.ACTIVE; //console.log("loginData is " + JSON.stringify($scope.loginData)); diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 0b757367..b028a8c1 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -7,10 +7,7 @@ <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" delegate-handle="imgscroll" on-swipe-left="onSwipeEvent(nextId,1)" on-swipe-right="onSwipeEvent(prevId,-1)" overflow-scroll="false"> <div id="full-screen-event" style="height: 100vh;"> - <!--<div>--> - <!-- route via ZMS --> - - Default Video: {{defaultVideo}} + <div ng-if="defaultVideo=='' || isSnapShot()"> <!--<div style="color:white">connkey:{{connKey}}</div>--> <div style="width:100vw; height:100vh;"> |