videojs_rails 4.12.8 → 4.12.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c82f559cece0ecbd1aad283045cf6c2e576e9399
-  data.tar.gz: b665ddbff9cb4cd783a38de0446587e535ab56c5
+  metadata.gz: d7844e04433a4dc9a759199cadd70274072341ca
+  data.tar.gz: 1b3bafb8f19fda714b252fa4ffad6ce55ffe616a
 SHA512:
-  metadata.gz: 6dc5525c6277e7d8f24f4e6225980ef7466f6bff79395c3f5b516b3c95723ac851f71296d544ac98f90ee8ad081ab345324b3a3e9213ab604ddf4cb62ec20ca3
-  data.tar.gz: 39919a3dec9aca4170084fc0830e8a391ff8eba7b30128739c67206abda929a5890c2319d1d2ca5e33d6fb7d817045ea8423567f7fde70a833658991ce8f1800
+  metadata.gz: c4a28dcf3155328c69538590c5bd804f0c730cd54fc8734f185b78eb29bf1cc0f9b95523ab62ce7bba4fdc05f659202db23521ac112a2804dc8f6c4a6e0b3b8c
+  data.tar.gz: d7bce6cca74210ce229c10a6f46bab097a8302ff885fd72a3bd9833ed9ab5fbfca57a3d31bb1a446156fe199d1684d2ba830ffd9cf634eeea79b5d531cfcc724

data/lib/videojs_rails/version.rb

@@ -1,3 +1,3 @@
 module VideojsRails
-  VERSION = '4.12.8'
+  VERSION = '4.12.9'
 end

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

@@ -80,7 +80,7 @@ vjs.ACCESS_PROTOCOL = ('https:' == document.location.protocol ? 'https://' : 'ht
 * Full player version
 * @type {string}
 */
-vjs['VERSION'] = '4.12.8';
+vjs['VERSION'] = '4.12.9';
 
 /**
  * Global Player instance options, surfaced from vjs.Player.prototype.options_
@@ -4931,7 +4931,12 @@ vjs.Player.prototype.load = function(){
  * @return {String} The current source
  */
 vjs.Player.prototype.currentSrc = function(){
-  return this.techGet('currentSrc') || this.cache_.src || '';
+  var techSrc = this.techGet('currentSrc');
+
+  if (techSrc === undefined) {
+    return this.cache_.src || '';
+  }
+  return techSrc;
 };
 
 /**
@@ -6589,6 +6594,8 @@ vjs.MediaTechController = vjs.Component.extend({
       this.emulateTextTracks();
     }
 
+    this.on('loadstart', this.updateCurrentSource_);
+
     this.initTextTrackListeners();
   }
 });
@@ -6721,6 +6728,24 @@ vjs.MediaTechController.prototype.onTap = function(){
   this.player().userActive(!this.player().userActive());
 };
 
+/**
+ * Set currentSource_ asynchronously to simulate the media element's
+ * asynchronous execution of the `resource selection algorithm`
+ *
+ * currentSource_ is set either as the first loadstart event OR
+ * in a timeout to make sure it is set asynchronously before anything else
+ * but before other loadstart handlers have had a chance to execute
+ */
+vjs.MediaTechController.prototype.updateCurrentSource_ = function () {
+  // We could have been called with a 0-ms setTimeout OR via loadstart (which ever
+  // happens first) so we should clear the timeout to be a good citizen
+  this.clearTimeout(this.updateSourceTimer_);
+
+  if (this.pendingSource_) {
+    this.currentSource_ = this.pendingSource_;
+  }
+};
+
 /* Fallbacks for unsupported event types
 ================================================================================ */
 // Manually trigger progress events based on changes to the buffered amount
@@ -6979,6 +7004,8 @@ vjs.MediaTechController.prototype['featuresNativeTextTracks'] = false;
  *
  */
 vjs.MediaTechController.withSourceHandlers = function(Tech){
+  Tech.prototype.currentSource_ = {src: ''};
+
   /**
    * Register a source handler
    * Source handlers are scripts for handling specific formats.
@@ -7063,7 +7090,12 @@ vjs.MediaTechController.withSourceHandlers = function(Tech){
     this.disposeSourceHandler();
     this.off('dispose', this.disposeSourceHandler);
 
-    this.currentSource_ = source;
+    // Schedule currentSource_ to be set asynchronously
+    if (source && source.src !== '') {
+      this.pendingSource_ = source;
+      this.updateSourceTimer_ = this.setTimeout(vjs.bind(this, this.updateCurrentSource_), 0);
+    }
+
     this.sourceHandler_ = sh.handleSource(source, this);
     this.on('dispose', this.disposeSourceHandler);
 
@@ -7415,7 +7447,13 @@ vjs.Html5.prototype.setSrc = function(src) {
 };
 
 vjs.Html5.prototype.load = function(){ this.el_.load(); };
-vjs.Html5.prototype.currentSrc = function(){ return this.el_.currentSrc; };
+vjs.Html5.prototype.currentSrc = function(){
+  if (this.currentSource_) {
+    return this.currentSource_.src;
+  } else {
+    return this.el_.currentSrc;
+  }
+};
 
 vjs.Html5.prototype.poster = function(){ return this.el_.poster; };
 vjs.Html5.prototype.setPoster = function(val){ this.el_.poster = val; };

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

@@ -1,6 +1,6 @@
 /*!
 Video.js Default Styles (http://videojs.com)
-Version 4.12.8
+Version 4.12.9
 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.12.8
+  version: 4.12.9
 platform: ruby
 authors:
 - Sean Behan