diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2016-01-20 04:49:16 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2016-01-20 04:49:16 -0500 |
| commit | 4052570bb7eb74baf69c7a656029abd662524923 (patch) | |
| tree | 69f1836b35dec928c4c6ae5638107229c2e00e21 /www | |
| parent | 1f411cadadc3e74cc6239204e583765bad382d92 (diff) | |
event playback - autostart on slide
Former-commit-id: 17c87cc2c11901d11d1a7a38333ccf211daa8b71
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/EventCtrl.js | 1 | ||||
| -rw-r--r-- | www/js/ModalCtrl.js | 2 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 4 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 589a565b..47aa629c 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -1270,6 +1270,7 @@ angular.module('zmApp.controllers') $scope.currentEvent = event; $scope.followSameMonitor = ($stateParams.id == "0")?"0":"1"; + // prepareModalEvent(event.Event.Id); diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js index b2299068..349a2ddc 100644 --- a/www/js/ModalCtrl.js +++ b/www/js/ModalCtrl.js @@ -554,6 +554,7 @@ $scope.togglePresets = function() ZMDataModel.zmLog ("New image loaded in"); var ld = ZMDataModel.getLogin(); + carouselUtils.setStop(false); if (ld.useNphZms == true) { $scope.currentStreamMode = 'single'; @@ -898,6 +899,7 @@ $scope.togglePresets = function() { element.removeClass(slidein); $scope.animationInProgress = false; + carouselUtils.setStop(false); } } diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index a09a5575..675a812d 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -1,4 +1,4 @@ -<div ng-controller="ModalCtrl"> +<div ng-controller="ModalCtrl" ng-cloak> <!-- style="width: 90%; height: 90%; top: 5%; left: 5%; right: 5%; bottom: 5%;"--> <ion-modal-view cache-view="false"> <ion-content style="background-color:#444444" ng-cloak> @@ -41,7 +41,7 @@ </div> <!-- no default video --> - <div ng-if="defaultVideo!='' && loginData.enableh264 == true"> + <div ng-if="defaultVideo!==undefined && defaultVideo!='' && loginData.enableh264 == true"> <div> <videogular vg-theme="videoObject.config.theme" vg-complete="playbackFinished()"> <vg-controls> diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index ee58fb63..12996f5c 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -1,5 +1,5 @@ -<div ng-controller="ModalCtrl"> +<div ng-controller="ModalCtrl" ng-cloak> <!--style="background-color:#444444;width: 90%; height: 90%; top: 5%; left: 5%; right: 5%; bottom: 5%;"--> |