Merge pull request #887 from avalonmediasystem/master-5.0.x

Master 5.0.x
avalonmediasystem · Jun 24, 2016 · 374e156 · 374e156
2 parents 85a15d4 + 8c0f903
commit 374e156
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 18 deletions.
diff --git a/Gemfile b/Gemfile
@@ -26,7 +26,7 @@
   gem 'kaminari', '~> 0.15.0'
 
   gem 'avalon-workflow', git: 'https://github.com/avalonmediasystem/avalon-workflow.git', tag: 'avalon-r4'
-  gem 'mediaelement_rails', git: 'https://github.com/avalonmediasystem/mediaelement_rails.git', tag: 'avalon-r5'
+  gem 'mediaelement_rails', git: 'https://github.com/avalonmediasystem/mediaelement_rails.git', branch: 'captions'
   gem 'mediaelement-qualityselector', git:'https://github.com/avalonmediasystem/mediaelement-qualityselector.git', tag: 'avalon-r4'
   gem 'media_element_thumbnail_selector', git: 'https://github.com/avalonmediasystem/media-element-thumbnail-selector', tag: 'avalon-r4'
   gem 'mediaelement-skin-avalon', git:'https://github.com/avalonmediasystem/mediaelement-skin-avalon.git', tag: 'avalon-r5'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -131,8 +131,8 @@ GIT
 
 GIT
   remote: https://github.com/avalonmediasystem/mediaelement_rails.git
-  revision: 8bb5ddad7abd2249ecb0f2891903728fc627e04b
-  tag: avalon-r5
+  revision: 86de64fd02e4982508c07dd6b3412430793e6955
+  tag: captions
   specs:
     mediaelement_rails (0.5.1)
       jquery-rails (>= 1.0)
@@ -716,7 +716,7 @@ GEM
       actionpack (>= 3.1)
       jquery-rails
       railties (>= 3.1)
-    tzinfo (0.3.49)
+    tzinfo (0.3.50)
     uber (0.0.13)
     uglifier (2.7.1)
       execjs (>= 0.3.0)
@@ -849,6 +849,3 @@ DEPENDENCIES
   whenever
   with_locking
   xray-rails
-
-BUNDLED WITH
-   1.12.4
diff --git a/app/assets/javascripts/avalon_player.js.coffee b/app/assets/javascripts/avalon_player.js.coffee
@@ -39,7 +39,7 @@ class AvalonPlayer
       success: (mediaElement, domObject, player) =>
         @boundPrePlay = => if mejs.MediaFeatures.isAndroid then AndroidShim.androidPrePlay(this, player)
         @boundPrePlay()
-        if success_callback then success_callback()
+        if success_callback then success_callback(mediaElement, domObject, player)
 
     player_options[key] = val for key, val of opts
     @player = new MediaElementPlayer element, player_options

diff --git a/app/views/media_objects/_item_view.html.erb b/app/views/media_objects/_item_view.html.erb
@@ -104,8 +104,8 @@ Unless required by applicable law or agreed to in writing, software distributed
       customError: '<%= t("media_objects.player.customError").html_safe %>',
       playlistItemDefaultTitle: '<%= @currentStream.embed_title.html_safe %>',
       autostart: <%= params[:autostart] == 'true' ? 'true' : 'false' %>,
-      success: function(mediaElement, domObject) {
-	avalonPlayer.player.media.addEventListener('ended', function(e) {
+      success: function(mediaElement, domObject, player) {
+	player.media.addEventListener('ended', function(e) {
 	    advancePlaylist();
 	}, false);
       }

diff --git a/app/views/playlists/_player.html.erb b/app/views/playlists/_player.html.erb
@@ -90,8 +90,8 @@ Unless required by applicable law or agreed to in writing, software distributed
 	customError: '<%= t("media_objects.player.customError").html_safe %>',
 	displayMediaFragment: true,
         autostart: <%= params[:autostart] == 'true' ? 'true' : 'false' %>,
-	success: function(mediaElement, domObject) {
-	  avalonPlayer.player.media.addEventListener('timeupdate', function(e) {
+	success: function(mediaElement, domObject, player) {
+	  player.media.addEventListener('timeupdate', function(e) {
 	    if (avalonPlayer.player.getCurrentTime() > avalonPlayer.stream_info.t.split(',')[1]) {
 	      avalonPlayer.player.media.stop();
 	      advancePlaylist();

diff --git a/config/application.rb b/config/application.rb
@@ -11,9 +11,9 @@
 end
 
 module Avalon
-  VERSION = '5.0'
+  VERSION = '5.0.1'
   class MissingUserId < Exception; end
-  
+
   class Application < Rails::Application
     require 'rubyhorn/rest_client/ingest'
     # Settings in config/environments/* take precedence over those specified here.
@@ -61,7 +61,7 @@ class Application < Rails::Application
 
     # Enable the asset pipeline
     config.assets.enabled = true
-    config.assets.logger = false 
+    config.assets.logger = false
     config.assets.debug = false
 
     # Version of your assets, change this if you want to expire all your assets
@@ -75,8 +75,8 @@ class Application < Rails::Application
 
     config.secret_key_base = ENV['AVALON_SECRET_KEY_BASE'] || YAML.load(File.open("#{Rails.root}/config/secrets.yml"))[Rails.env]['secret_key_base']
   end
-  
-  # Map config to the local namespace so we can use shorter references in 
+
+  # Map config to the local namespace so we can use shorter references in
   # our YAML file
   def self.config
     Application.config

diff --git a/config/initializers/policy_aware_modification.rb b/config/initializers/policy_aware_modification.rb
@@ -27,6 +27,6 @@ def self.query(query, args={})
     end
 
   def self.default_http_method
-    ActiveFedora.solr_config.fetch(:http_method, :get).to_sym
+    ActiveFedora.solr_config.fetch(:http_method, :post).to_sym
   end
 end