some fixes

avalonmediasystem · Dec 2, 2016 · 28f4794 · 28f4794
1 parent aa5be84
commit 28f4794
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/app/assets/javascripts/avalon_player.js.coffee b/app/assets/javascripts/avalon_player.js.coffee
@@ -106,7 +106,13 @@ class AvalonPlayer
         $(@player.media).on 'timeupdate', => @setActiveSection()
         @container.find('#content').css('visibility','visible')
         @player.setCurrentTime(initialTime)
-        @player.initializeTrackScrubber(initialTime, _this.stream_info)
+        if _this.stream_info.hasOwnProperty('t')
+          trackstart = t[0]
+          trackend = t[1]
+        else
+          trackstart = 0
+          trackend = _this.stream_info.duration
+        @player.initializeTrackScrubber(trackstart, trackend, _this.stream_info)
         $(@player.media).one 'loadedmetadata', initialize_view
         $(@player.media).one 'loadeddata', initialize_view
         keyboardAccess()
@@ -148,6 +154,9 @@ class AvalonPlayer
       $(active_node)
         .addClass('current-stream')
         .trigger('streamswitch', [@stream_info])
+      trackstart = parseFloat($(active_node).data('fragmentbegin')||0)||0
+      trackend = parseFloat($(active_node).data('fragmentend')||@stream_info.duration)||@stream_info.duration
+      @player.initializeTrackScrubber(trackstart, trackend, @stream_info)
 
     marked_node = @container.find('i.now-playing')
     now_playing_node = @container.find('a.current-stream')
@@ -156,7 +165,6 @@ class AvalonPlayer
     unless now_playing_node == marked_node
       marked_node.remove()
       now_playing_node.before('<i class="now-playing fa fa-arrow-circle-right"></i>')
-      @player.initializeTrackScrubber(parseFloat(now_playing_node.data().fragmentbegin)||0, @stream_info)
 
   initStructureHandlers: ->
     @container.find('a[data-segment]').on 'click', (e) =>