Merge pull request #3 from avalonmediasystem/mejs-time-clip

Limit clip offsets to between 0 and 100 percent
avalonmediasystem · Feb 27, 2017 · 8b9b094 · 8b9b094
2 parents 9c5b35e + c7ac4c5
commit 8b9b094
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/assets/javascripts/me-track-scrubber.coffee b/app/assets/javascripts/me-track-scrubber.coffee
@@ -43,7 +43,7 @@
  duration = stream_info.duration
  trackduration = trackend - trackstart
  $currentTime = $('.track-mejs-currenttime')
- $currentTime.text(mejs.Utility.secondsToTimeCode(this.getCurrentTime()-trackstart, false))
+ $currentTime.text(mejs.Utility.secondsToTimeCode(Math.max(0,this.getCurrentTime()-trackstart), false))
  this.trackdata = {}
  this.trackdata['starttime'] = trackstart
  this.trackdata['endtime'] = trackend
@@ -52,8 +52,8 @@
  $duration = $('.track-mejs-duration')
  $duration.text(mejs.Utility.secondsToTimeCode(parseInt(trackduration), false))
 
- start_percent = Math.round(100*trackstart / duration)
- end_percent = Math.round(100*trackend / duration)
+ start_percent = Math.max(0,Math.min(100,Math.round(100*trackstart / duration)))
+ end_percent = Math.max(0,Math.min(100,Math.round(100*trackend / duration)))
  clip_span = $('<span />').addClass('mejs-time-clip')
  trackbubble = $('<span class="mejs-time-clip">')
  trackbubble.css 'left', start_percent+'%'