diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-12-04 16:24:24 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-12-04 16:24:24 -0500 |
| commit | 54e6e399767bf6fbbe3a5d56d81121b6b52b4d47 (patch) | |
| tree | 9bb14cdeac17e7fe65172e59bddbd523f71b61c7 | |
| parent | 8812d6fd22b1710e019ba53e94723c76b97af6b7 (diff) | |
don't know why calcMsTimer was needed - I changed it simply to leninsecs/no-of-frames
Former-commit-id: 29d8070a88e9bdc18470093582b5cee082b208b8
| -rw-r--r-- | www/js/EventCtrl.js | 14 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 2 | ||||
| -rw-r--r-- | www/templates/events.html | 4 |
3 files changed, 5 insertions, 15 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index fc0224aa..65190edc 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -571,19 +571,7 @@ angular.module('zmApp.controllers') }; - //-------------------------------------------------------------------------- - // This is used to compute automatic playback speed for event playback - // and scrub - //-------------------------------------------------------------------------- - - $scope.calcMsTimer = function (frames, len) { - var myframes, mylen; - myframes = parseFloat(frames); - mylen = parseFloat(len); - - return (Math.round(1000 / (myframes / mylen))); - }; - + $scope.openMenu = function () { $ionicSideMenuDelegate.toggleLeft(); }; diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index ea0a6c4c..1d785f72 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -9,7 +9,7 @@ <div ng-if="defaultVideo=='' || loginData.enableh264==false"> - <ul rn-carousel rn-carousel-buffered rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{calcMsTimer(eFramesNum, eventDur)/1000.0}}" rn-carousel-pause-on-hover rn-platform="{{$root.platformOS}}"> + <ul rn-carousel rn-carousel-buffered rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{event.Event.Length/event.Event.Frames}}" rn-carousel-pause-on-hover rn-platform="{{$root.platformOS}}"> <li ng-repeat="slide in slides"> <div ng-if="!animationInProgress"> diff --git a/www/templates/events.html b/www/templates/events.html index a1cd6367..147be16b 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -143,7 +143,9 @@ <p>{{mycarousel.index+1}}/{{event.Event.Frames}} Type: {{FrameArray[mycarousel.index].Type}}</p> <div style="height:190px"> - <ul rn-carousel rn-carousel-buffered rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{calcMsTimer(event.Event.Frames, event.Event.Length)/1000.0}}" rn-carousel-pause-on-hover rn-platform="{{$root.platformOS}}"> + + {{event.Event.Length/event.Event.Frames}} + <ul rn-carousel rn-carousel-buffered rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{event.Event.Length/event.Event.Frames}}" rn-carousel-pause-on-hover rn-platform="{{$root.platformOS}}"> <li ng-repeat="slide in slides"> <!-- Linwood scaling --> <img imageonload="finishedLoadingImage($index)" image-spinner-src="{{playbackURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/> |