summaryrefslogtreecommitdiff
path: root/www/templates
diff options
context:
space:
mode:
Diffstat (limited to 'www/templates')
-rw-r--r--www/templates/events-modal.html3
-rw-r--r--www/templates/events.html3
2 files changed, 4 insertions, 2 deletions
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index cf333eb8..60f49707 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -1,6 +1,7 @@
<div ng-controller="ModalCtrl">
<ion-modal-view cache="false">
<ion-content style="background-color:#444444" ng-cloak>
+
<ion-scroll has-bouncing=false min-zoom=1 zooming="true"
direction="xy" style="width: 100%; ">
<div style="height: 100vh;">
@@ -8,7 +9,7 @@
<ul rn-carousel rn-carousel-buffered
rn-carousel-transition="none" rn-swipe-disabled="true"
rn-carousel-index="mycarousel.index"
- rn-carousel-auto-slide="0.3" rn-carousel-pause-on-hover >
+ rn-carousel-auto-slide="{{calcMsTimer(eFramesNum, eventDur)/1000.0}}" rn-carousel-pause-on-hover >
<li ng-repeat="slide in slides">
diff --git a/www/templates/events.html b/www/templates/events.html
index 12e9f220..547305ec 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -101,6 +101,7 @@
<!-- this is the event scrub area -->
<div ng-if = "isGroupShown(event)">
+
<br/>
<br/>
<br/>
@@ -130,7 +131,7 @@
<ul rn-carousel rn-carousel-buffered
rn-carousel-transition="none" rn-swipe-disabled="true"
rn-carousel-index="mycarousel.index"
- rn-carousel-auto-slide="0.3" rn-carousel-pause-on-hover >
+ rn-carousel-auto-slide="{{calcMsTimer(event.Event.Frames, event.Event.Length)/1000.0}}" rn-carousel-pause-on-hover >
<li ng-repeat="slide in slides">
<img imageonload="finishedLoadingImage($index)"
image-spinner-src="{{event.Event.BasePath}}{{slide.img}}?rand={{rand}}"