From 0132abea2f34fb1cb7045f9b908491c2c63a1f6c Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 2 Feb 2019 10:06:06 -0500 Subject: #755 animate and fade the entire window --- www/js/MontageHistoryCtrl.js | 16 ++++++++-------- www/templates/montage-history.html | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 8f0a0fb7..24aea0f5 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -691,11 +691,11 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc drawGraph(framearray, $scope.MontageMonitors[ndx].Monitor.Id); }, 100); var element = angular.element(document.getElementById($scope.MontageMonitors[ndx].Monitor.Id + "-timeline")); - element.removeClass('animated flipInX'); - element.addClass('animated flipOutX'); + element.removeClass('animated fadeIn'); + element.addClass('animated fadeOut'); $timeout(function () { - element.removeClass('animated flipOutX'); - element.addClass('animated flipInX'); + element.removeClass('animated fadeOut'); + element.addClass('animated fadeIn'); $scope.MontageMonitors[ndx].Monitor.eventUrlTime = data.event.Event.StartTime; var bw = NVR.getBandwidth() == "lowbw" ? zm.eventMontageQualityLowBW : ld.montageHistoryQuality; @@ -926,13 +926,13 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc // m.Monitor.videoObject.config.sources[0].src = $sce.trustAsResourceUrl(videoURL); var element = angular.element(document.getElementById(m.Monitor.Id + "-timeline")); - element.removeClass('animated flipInX'); - element.addClass('animated flipOutX'); + element.removeClass('animated fadeIn'); + element.addClass('animated fadeOut'); $timeout (function () { - element.removeClass('animated flipOutX'); - element.addClass('animated flipInX'); + element.removeClass('animated fadeOut'); + element.addClass('animated fadeIn'); NVR.debug ("--->updating videoURL for mid="+m.Monitor.Id+ "to:"+videoURL); m.Monitor.eid = success.eid; diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html index 7ef88e98..3b02166a 100644 --- a/www/templates/montage-history.html +++ b/www/templates/montage-history.html @@ -32,7 +32,7 @@
-
+
@@ -46,7 +46,7 @@ {{monitor.Monitor.Name}} 
[{{monitor.Monitor.eid}}] + class="header-event-id" >[{{monitor.Monitor.eid}}] {{prettifyDateTimeFirst(monitor.Monitor.eventUrlTime)}} ({{humanizeTime(monitor.Monitor.eventUrlTime)}}) 
@@ -88,7 +88,7 @@
-
+
  @@ -99,7 +99,7 @@ {{monitor.Monitor.Name}} 
[{{monitor.Monitor.eid}}] + class="header-event-id" >[{{monitor.Monitor.eid}}] {{prettifyDateTimeFirst(monitor.Monitor.eventUrlTime)}} ({{humanizeTime(monitor.Monitor.eventUrlTime)}}) 
-- cgit v1.2.3