videojs_rails 4.6.3 → 4.6.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ade6d435934e1f31123bdfe294dbcfd141a4731e
4
- data.tar.gz: 0220359bae4496a63e2e68df63ae13584a82f969
3
+ metadata.gz: 80a4f30faab8c97afa8b8b44242e568a3139cbca
4
+ data.tar.gz: 56b077ebc2e96e658bd682030c5350ac8d1c0573
5
5
  SHA512:
6
- metadata.gz: 44e6f4163cbdfbe845b1bf73eba69c4fa954f30fed57b034ebb6ad69dd7579b233b93e759f2266bc12bd6f8cd96a745415b8e8a04aa6a173624b2dc109fbeba0
7
- data.tar.gz: 0fb5011e60c1092cb90e3ce8f78f0732bf0fbd8638289e0d3353da338df62a5a2e4906e01b371f27b211455504eff56af591f41c9a1de57ae3871956193ece0b
6
+ metadata.gz: 8d4aac4ce74e012b2fd30731a9378805e04472a02d95a49cb3b3909ea46ce5c08148131a19a0647664672903be1628b9c2ee1263f72b13672818ccd35c92679a
7
+ data.tar.gz: 2274ede9d80bfdc4f1d198078d05c0ec51e8f62dad233e047f6cef91d69ada4974707c38bfaaea2de8216e49f911a46f47e55fbb4a2fa65a09e80226b316113e
@@ -1,3 +1,3 @@
1
1
  module VideojsRails
2
- VERSION = '4.6.3'
2
+ VERSION = '4.6.4'
3
3
  end
@@ -5771,6 +5771,17 @@ vjs.MediaTechController.prototype.initControlsListeners = function(){
5771
5771
  this.ready(activateControls);
5772
5772
  player.on('controlsenabled', activateControls);
5773
5773
  player.on('controlsdisabled', deactivateControls);
5774
+
5775
+ // if we're loading the playback object after it has started loading or playing the
5776
+ // video (often with autoplay on) then the loadstart event has already fired and we
5777
+ // need to fire it manually because many things rely on it.
5778
+ // Long term we might consider how we would do this for other events like 'canplay'
5779
+ // that may also have fired.
5780
+ this.ready(function(){
5781
+ if (this.networkState && this.networkState() > 0) {
5782
+ this.player().trigger('loadstart');
5783
+ }
5784
+ });
5774
5785
  };
5775
5786
 
5776
5787
  vjs.MediaTechController.prototype.addControlsListeners = function(){
@@ -5871,24 +5882,6 @@ vjs.MediaTechController.prototype.features = {
5871
5882
  };
5872
5883
 
5873
5884
  vjs.media = {};
5874
-
5875
- /**
5876
- * List of default API methods for any MediaTechController
5877
- * @type {String}
5878
- */
5879
- 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(',');
5880
- // Create placeholder methods for each that warn when a method isn't supported by the current playback technology
5881
-
5882
- function createMethod(methodName){
5883
- return function(){
5884
- throw new Error('The "'+methodName+'" method is not available on the playback technology\'s API');
5885
- };
5886
- }
5887
-
5888
- for (var i = vjs.media.ApiMethods.length - 1; i >= 0; i--) {
5889
- var methodName = vjs.media.ApiMethods[i];
5890
- vjs.MediaTechController.prototype[vjs.media.ApiMethods[i]] = createMethod(methodName);
5891
- }
5892
5885
  /**
5893
5886
  * @fileoverview HTML5 Media Controller - Wrapper for HTML5 Media API
5894
5887
  */
@@ -5920,12 +5913,8 @@ vjs.Html5 = vjs.MediaTechController.extend({
5920
5913
 
5921
5914
  var source = options['source'];
5922
5915
 
5923
- // If the element source is already set, we may have missed the loadstart event, and want to trigger it.
5924
- // We don't want to set the source again and interrupt playback.
5925
- if (source && this.el_.currentSrc === source.src && this.el_.networkState > 0) {
5926
- player.trigger('loadstart');
5927
- // Otherwise set the source if one was provided.
5928
- } else if (source) {
5916
+ // set the source if one was provided
5917
+ if (source && this.el_.currentSrc !== source.src) {
5929
5918
  this.el_.src = source.src;
5930
5919
  }
5931
5920
 
@@ -6138,6 +6127,8 @@ vjs.Html5.prototype.defaultMuted = function(){ return this.el_.defaultMuted; };
6138
6127
  vjs.Html5.prototype.playbackRate = function(){ return this.el_.playbackRate; };
6139
6128
  vjs.Html5.prototype.setPlaybackRate = function(val){ this.el_.playbackRate = val; };
6140
6129
 
6130
+ vjs.Html5.prototype.networkState = function(){ return this.el_.networkState; };
6131
+
6141
6132
  /* HTML5 Support Testing ---------------------------------------------------- */
6142
6133
 
6143
6134
  vjs.Html5.isSupported = function(){
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  Video.js Default Styles (http://videojs.com)
3
- Version 4.6.3
3
+ Version 4.6.4
4
4
  Create your own skin at http://designer.videojs.com
5
5
  */
6
6
  /* SKIN
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: videojs_rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.6.3
4
+ version: 4.6.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Behan