videojs_rails 4.6.3 → 4.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ade6d435934e1f31123bdfe294dbcfd141a4731e
-  data.tar.gz: 0220359bae4496a63e2e68df63ae13584a82f969
+  metadata.gz: 80a4f30faab8c97afa8b8b44242e568a3139cbca
+  data.tar.gz: 56b077ebc2e96e658bd682030c5350ac8d1c0573
 SHA512:
-  metadata.gz: 44e6f4163cbdfbe845b1bf73eba69c4fa954f30fed57b034ebb6ad69dd7579b233b93e759f2266bc12bd6f8cd96a745415b8e8a04aa6a173624b2dc109fbeba0
-  data.tar.gz: 0fb5011e60c1092cb90e3ce8f78f0732bf0fbd8638289e0d3353da338df62a5a2e4906e01b371f27b211455504eff56af591f41c9a1de57ae3871956193ece0b
+  metadata.gz: 8d4aac4ce74e012b2fd30731a9378805e04472a02d95a49cb3b3909ea46ce5c08148131a19a0647664672903be1628b9c2ee1263f72b13672818ccd35c92679a
+  data.tar.gz: 2274ede9d80bfdc4f1d198078d05c0ec51e8f62dad233e047f6cef91d69ada4974707c38bfaaea2de8216e49f911a46f47e55fbb4a2fa65a09e80226b316113e

data/lib/videojs_rails/version.rb

@@ -1,3 +1,3 @@
 module VideojsRails
-  VERSION = '4.6.3'
+  VERSION = '4.6.4'
 end

data/vendor/assets/javascripts/video.js.erb

@@ -5771,6 +5771,17 @@ vjs.MediaTechController.prototype.initControlsListeners = function(){
   this.ready(activateControls);
   player.on('controlsenabled', activateControls);
   player.on('controlsdisabled', deactivateControls);
+
+  // if we're loading the playback object after it has started loading or playing the
+  // video (often with autoplay on) then the loadstart event has already fired and we
+  // need to fire it manually because many things rely on it.
+  // Long term we might consider how we would do this for other events like 'canplay'
+  // that may also have fired.
+  this.ready(function(){
+    if (this.networkState && this.networkState() > 0) {
+      this.player().trigger('loadstart');
+    }
+  });
 };
 
 vjs.MediaTechController.prototype.addControlsListeners = function(){
@@ -5871,24 +5882,6 @@ vjs.MediaTechController.prototype.features = {
 };
 
 vjs.media = {};
-
-/**
- * List of default API methods for any MediaTechController
- * @type {String}
- */
-vjs.media.ApiMethods = 'play,pause,paused,currentTime,setCurrentTime,duration,buffered,volume,setVolume,muted,setMuted,width,height,supportsFullScreen,enterFullScreen,src,load,currentSrc,preload,setPreload,autoplay,setAutoplay,loop,setLoop,error,networkState,readyState,seeking,initialTime,startOffsetTime,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks,defaultPlaybackRate,playbackRate,mediaGroup,controller,controls,defaultMuted'.split(',');
-// Create placeholder methods for each that warn when a method isn't supported by the current playback technology
-
-function createMethod(methodName){
-  return function(){
-    throw new Error('The "'+methodName+'" method is not available on the playback technology\'s API');
-  };
-}
-
-for (var i = vjs.media.ApiMethods.length - 1; i >= 0; i--) {
-  var methodName = vjs.media.ApiMethods[i];
-  vjs.MediaTechController.prototype[vjs.media.ApiMethods[i]] = createMethod(methodName);
-}
 /**
  * @fileoverview HTML5 Media Controller - Wrapper for HTML5 Media API
  */
@@ -5920,12 +5913,8 @@ vjs.Html5 = vjs.MediaTechController.extend({
 
     var source = options['source'];
 
-    // If the element source is already set, we may have missed the loadstart event, and want to trigger it.
-    // We don't want to set the source again and interrupt playback.
-    if (source && this.el_.currentSrc === source.src && this.el_.networkState > 0) {
-      player.trigger('loadstart');
-    // Otherwise set the source if one was provided.
-    } else if (source) {
+    // set the source if one was provided
+    if (source && this.el_.currentSrc !== source.src) {
       this.el_.src = source.src;
     }
 
@@ -6138,6 +6127,8 @@ vjs.Html5.prototype.defaultMuted = function(){ return this.el_.defaultMuted; };
 vjs.Html5.prototype.playbackRate = function(){ return this.el_.playbackRate; };
 vjs.Html5.prototype.setPlaybackRate = function(val){ this.el_.playbackRate = val; };
 
+vjs.Html5.prototype.networkState = function(){ return this.el_.networkState; };
+
 /* HTML5 Support Testing ---------------------------------------------------- */
 
 vjs.Html5.isSupported = function(){

data/vendor/assets/stylesheets/video-js.css.erb

@@ -1,6 +1,6 @@
 /*!
 Video.js Default Styles (http://videojs.com)
-Version 4.6.3
+Version 4.6.4
 Create your own skin at http://designer.videojs.com
 */
 /* SKIN

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: videojs_rails
 version: !ruby/object:Gem::Version
-  version: 4.6.3
+  version: 4.6.4
 platform: ruby
 authors:
 - Sean Behan