diff options
Diffstat (limited to 'www/js/EventModalCtrl.js')
| -rw-r--r-- | www/js/EventModalCtrl.js | 48 |
1 files changed, 32 insertions, 16 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 34308434..35921adc 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -621,7 +621,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro function saveNow() { $ionicLoading.show({ - template: $translate.instant('kSavingSnapshot')+"...", + template: $translate.instant('kSavingSnapshot') + "...", noBackdrop: true, duration: zm.httpTimeout }); @@ -703,6 +703,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro return; + $scope.videoIsReady = false; var ld = ZMDataModel.getLogin(); $scope.loginData = ZMDataModel.getLogin(); @@ -873,7 +874,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro } $ionicLoading.show({ - template: $translate.instant('kPleaseWait')+"...", + template: $translate.instant('kPleaseWait') + "...", noBackdrop: true, duration: zm.httpTimeout }); @@ -922,7 +923,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro ZMDataModel.zmDebug("Set playback speed to " + $scope.eventSpeed); $ionicLoading.show({ - template: $translate.instant('kPlaybackInterval')+': ' + $scope.eventSpeed.toFixed(3) + "ms", + template: $translate.instant('kPlaybackInterval') + ': ' + $scope.eventSpeed.toFixed(3) + "ms", animation: 'fade-in', showBackdrop: false, duration: 1500, @@ -1124,7 +1125,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro ZMDataModel.zmDebug("Sending " + cmd + " to " + connkey); $ionicLoading.show({ - template: $translate.instant('kSwitchingEvents')+"...", + template: $translate.instant('kSwitchingEvents') + "...", noBackdrop: true, duration: zm.httpTimeout }); @@ -1348,27 +1349,41 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro else videoURL = event.Event.baseURL + "/index.php?view=view_video&eid=" + event.Event.Id; - console.log("************** VIDEO IS " + videoURL); + // hack + // videoURL = "http://static.videogular.com/assets/videos/videogular.mp4"; + + $scope.video_url = videoURL; + + // console.log("************** VIDEO IS " + videoURL); + + ZMDataModel.zmDebug("Video url passed to player is: " + videoURL); + + // console.log (">>>>>>>>>>>>>"+loginData.url+"-VS-"+event.Event.baseURL); //console.log("************** VIDEO IS " + videoURL); - event.Event.video.config = { - autoPlay: true, - sources: [ - { - src: $sce.trustAsResourceUrl(videoURL), - type: "video/mp4" - } - ], - theme: "lib/videogular-themes-default/videogular.css", + $scope.videoObject = { + config: { + autoPlay: true, + sources: [ + { + src: $sce.trustAsResourceUrl(videoURL), + type: "video/mp4" + } + + ], + theme: "lib/videogular-themes-default/videogular.css", + } }; - $scope.videoObject = event.Event.video; + // $scope.videoObject = angular.copy(event.Event.video); $scope.playbackURL = $scope.loginData.url; + $scope.videoIsReady = true; + /* we don't need this for electron if ($rootScope.platformOS == "desktop") { $scope.playbackURL = zm.desktopUrl; @@ -1417,6 +1432,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro }; + $scope.mycarousel.index = 0; $scope.ionRange.index = 1; $scope.eventSpeed = $scope.event.Event.Length / $scope.event.Event.Frames; @@ -1532,4 +1548,4 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro -}]); +}]);
\ No newline at end of file |