add lil scrub to playlist view

avalonmediasystem · Dec 16, 2016 · 2642838 · 2642838
1 parent d375c22
commit 2642838
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/assets/javascripts/avalon_player.js.coffee b/app/assets/javascripts/avalon_player.js.coffee
@@ -166,8 +166,12 @@ class AvalonPlayer
         .addClass('current-stream')
         .trigger('streamswitch', [@stream_info])
       if @player? && @player.options.trackScrubberEnabled
-        trackstart = parseFloat($(active_node).data('fragmentbegin')||0)||0
-        trackend = parseFloat($(active_node).data('fragmentend')||@stream_info.duration)||@stream_info.duration
+        if active_node==null
+          trackstart = @stream_info.t[0]
+          trackend = @stream_info.t[1] || @stream_info.duration
+        else
+          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')

diff --git a/app/views/playlists/_player.html.erb b/app/views/playlists/_player.html.erb
@@ -65,11 +65,13 @@ Unless required by applicable law or agreed to in writing, software distributed
   <%= javascript_include_tag 'mediaelement-skin-avalon/mep-feature-responsive' %>
   <%= javascript_include_tag 'avalon_player' %>
   <%= javascript_include_tag 'me-add-to-playlist' %>
+  <%= javascript_include_tag 'me-track-scrubber' %>
 
   <%= stylesheet_link_tag "mediaelement-qualityselector/mep-feature-qualities" =%>
   <%= stylesheet_link_tag 'me-thumb-selector' %>
   <%= stylesheet_link_tag "mediaelement-skin-avalon/mejs-skin-avalon" =%>
   <%= stylesheet_link_tag 'me-add-to-playlist' %>
+  <%= stylesheet_link_tag 'me-track-scrubber' %>
 
   <% if @currentStream.present? and @currentStream.derivatives.present? %>
   <script>
@@ -92,6 +94,7 @@ Unless required by applicable law or agreed to in writing, software distributed
 	customError: '<%= t("media_objects.player.customError").html_safe %>',
 	displayMediaFragment: true,
         displayMarkers: true,
+        displayTrackScrubber: true,
         autostart: <%= params[:autostart] == 'true' ? 'true' : 'false' %>,
 	success: function(mediaElement, domObject, player) {
 	  player.media.addEventListener('timeupdate', function(e) {

diff --git a/app/views/playlists/show.html.erb b/app/views/playlists/show.html.erb
@@ -30,6 +30,7 @@ Unless required by applicable law or agreed to in writing, software distributed
   <% @current_mediaobject = MediaObject.find(@current_masterfile.mediaobject_id) %>
       <div class="col-sm-8" id="left_column">
         <%= render 'player' %>
+        <%= render file: '_track_scrubber.html.erb' %>
         <%= render file: '_add_to_playlist.html.erb' if current_user.present? %>
         <%= render 'info' %>
       </div>