diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/DataModel.js | 6 | ||||
| -rw-r--r-- | www/js/DevOptionsCtrl.js | 1 | ||||
| -rw-r--r-- | www/js/app.js | 1 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 14 |
4 files changed, 14 insertions, 8 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 9bb1c7e0..5602f7eb 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -91,7 +91,7 @@ angular.module('zmApp.controllers') 'resumeDelay': 300, 'language': 'en', 'reachability': true, - 'forceImageModePath': true, + 'forceImageModePath': false, @@ -427,8 +427,8 @@ angular.module('zmApp.controllers') } if (typeof loginData.forceImageModePath == 'undefined') { - zmDebug("forceImageModePath does not exist. Setting to true"); - loginData.forceImageModePath = true; + zmDebug("forceImageModePath does not exist. Setting to false"); + loginData.forceImageModePath = false; } if (typeof loginData.reachability == 'undefined') { diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js index 580e1214..502c02d0 100644 --- a/www/js/DevOptionsCtrl.js +++ b/www/js/DevOptionsCtrl.js @@ -86,6 +86,7 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' ZMDataModel.zmDebug("SaveDevOptions: Saving to disk"); ZMDataModel.setLogin($scope.loginData); + ZMDataModel.getMonitors(1); } diff --git a/www/js/app.js b/www/js/app.js index cb7ba822..3d0a8168 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -81,6 +81,7 @@ angular.module('zmApp', [ }) +// https://forum.ionicframework.com/t/ng-src-not-updated-in-video-tag/7540/6 .directive('dynamicUrl', function () { return { restrict: 'A', diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 5c030c99..2b5a1bd6 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -31,15 +31,20 @@ <div ng-if="defaultVideo!==undefined && defaultVideo!='' && loginData.enableh264 == true"> <div ng-if="videoIsReady" class="videogular-full-container" > - <!--<video controls="controls" preload="metadata" autoplay="autoplay" webkit-playsinline="webkit-playsinline" class="videoPlayer"><source src="" dynamic-url dynamic-url-src="{{video_url}}" type="video/mp4"/></video>--> + <!--<video width="320" height="240" controls> + <source src="" dynamic-url dynamic-url-src="{{video_url}}"> + + </video>--> + + - <videogular vg-theme="videoObject.config.theme" vg-complete="playbackFinished()" on-double-tap="closeModal();" vg-autoplay="true" vg-responsive="true"> + <videogular vg-theme="videoObject.config.theme" vg-complete="playbackFinished()" on-double-tap="closeModal();" vg-autoplay="true" vg-responsive="true"> <vg-media vg-src="videoObject.config.sources" vg-native-controls="false"> </vg-media> <vg-overlay-play></vg-overlay-play> - <!-- <vg-buffering></vg-buffering>--> + <vg-controls> <vg-play-pause-button></vg-play-pause-button> @@ -52,8 +57,7 @@ <vg-mute-button></vg-mute-button> </vg-volume> </vg-controls> - - + </videogular> |