videojs_rails 4.12.9 → 4.12.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7844e04433a4dc9a759199cadd70274072341ca
-  data.tar.gz: 1b3bafb8f19fda714b252fa4ffad6ce55ffe616a
+  metadata.gz: 214118d649059fb283d024275de94e0f927da297
+  data.tar.gz: 119f38605ef976e1336e0385fab186340e196cd7
 SHA512:
-  metadata.gz: c4a28dcf3155328c69538590c5bd804f0c730cd54fc8734f185b78eb29bf1cc0f9b95523ab62ce7bba4fdc05f659202db23521ac112a2804dc8f6c4a6e0b3b8c
-  data.tar.gz: d7bce6cca74210ce229c10a6f46bab097a8302ff885fd72a3bd9833ed9ab5fbfca57a3d31bb1a446156fe199d1684d2ba830ffd9cf634eeea79b5d531cfcc724
+  metadata.gz: 0028d7e6c8bb634d76e477b7e8d098acac196f7b749b01ecbf395efcaab89a54ae0f42af3e56447e25dc43d4f414ee2ccbb474227283cc468d35be0d9b9680f4
+  data.tar.gz: b726cd4911e1cbb778b825a4601bcab726e3ef9850bd01a37111afb45765395648f483d15fc812e27016cc71a5b6f4347407bb52f2f459aec7f6973c1952717e

data/lib/videojs_rails/version.rb

@@ -1,3 +1,3 @@
 module VideojsRails
-  VERSION = '4.12.9'
+  VERSION = '4.12.10'
 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.9';
+vjs['VERSION'] = '4.12.10';
 
 /**
  * Global Player instance options, surfaced from vjs.Player.prototype.options_
@@ -4931,12 +4931,7 @@ vjs.Player.prototype.load = function(){
  * @return {String} The current source
  */
 vjs.Player.prototype.currentSrc = function(){
-  var techSrc = this.techGet('currentSrc');
-
-  if (techSrc === undefined) {
-    return this.cache_.src || '';
-  }
-  return techSrc;
+  return this.techGet('currentSrc') || this.cache_.src || '';
 };
 
 /**
@@ -6594,8 +6589,6 @@ vjs.MediaTechController = vjs.Component.extend({
       this.emulateTextTracks();
     }
 
-    this.on('loadstart', this.updateCurrentSource_);
-
     this.initTextTrackListeners();
   }
 });
@@ -6728,24 +6721,6 @@ 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
@@ -7004,8 +6979,6 @@ 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.
@@ -7090,12 +7063,7 @@ vjs.MediaTechController.withSourceHandlers = function(Tech){
     this.disposeSourceHandler();
     this.off('dispose', this.disposeSourceHandler);
 
-    // Schedule currentSource_ to be set asynchronously
-    if (source && source.src !== '') {
-      this.pendingSource_ = source;
-      this.updateSourceTimer_ = this.setTimeout(vjs.bind(this, this.updateCurrentSource_), 0);
-    }
-
+    this.currentSource_ = source;
     this.sourceHandler_ = sh.handleSource(source, this);
     this.on('dispose', this.disposeSourceHandler);
 
@@ -7432,10 +7400,27 @@ vjs.Html5.prototype.exitFullScreen = function(){
   this.el_.webkitExitFullScreen();
 };
 
+// Checks to see if the element's reported URI (either from `el_.src`
+// or `el_.currentSrc`) is a blob-uri and, if so, returns the uri that
+// was passed into the source-handler when it was first invoked instead
+// of the blob-uri
+vjs.Html5.prototype.returnOriginalIfBlobURI_ = function (elementURI, originalURI) {
+  var blobURIRegExp = /^blob\:/i;
+
+  // If originalURI is undefined then we are probably in a non-source-handler-enabled
+  // tech that inherits from the Html5 tech so we should just return the elementURI
+  // regardless of it's blobby-ness
+  if (originalURI && elementURI && blobURIRegExp.test(elementURI)) {
+    return originalURI;
+  }
+  return elementURI;
+};
 
 vjs.Html5.prototype.src = function(src) {
+  var elementSrc = this.el_.src;
+
   if (src === undefined) {
-    return this.el_.src;
+    return this.returnOriginalIfBlobURI_(elementSrc, this.source_);
   } else {
     // Setting src through `src` instead of `setSrc` will be deprecated
     this.setSrc(src);
@@ -7448,11 +7433,13 @@ vjs.Html5.prototype.setSrc = function(src) {
 
 vjs.Html5.prototype.load = function(){ this.el_.load(); };
 vjs.Html5.prototype.currentSrc = function(){
-  if (this.currentSource_) {
-    return this.currentSource_.src;
-  } else {
-    return this.el_.currentSrc;
+  var elementSrc = this.el_.currentSrc;
+
+  if (!this.currentSource_) {
+    return elementSrc;
   }
+
+  return this.returnOriginalIfBlobURI_(elementSrc, this.currentSource_.src);
 };
 
 vjs.Html5.prototype.poster = function(){ return this.el_.poster; };
@@ -7588,6 +7575,28 @@ vjs.Html5.isSupported = function(){
 // Add Source Handler pattern functions to this tech
 vjs.MediaTechController.withSourceHandlers(vjs.Html5);
 
+/*
+ * Override the withSourceHandler mixin's methods with our own because
+ * the HTML5 Media Element returns blob urls when utilizing MSE and we
+ * want to still return proper source urls even when in that case
+ */
+(function(){
+  var
+    origSetSource = vjs.Html5.prototype.setSource,
+    origDisposeSourceHandler = vjs.Html5.prototype.disposeSourceHandler;
+
+  vjs.Html5.prototype.setSource = function (source) {
+    var retVal = origSetSource.call(this, source);
+    this.source_ = source.src;
+    return retVal;
+  };
+
+  vjs.Html5.prototype.disposeSourceHandler = function () {
+    this.source_ = undefined;
+    return origDisposeSourceHandler.call(this);
+  };
+})();
+
 /**
  * The default native source handler.
  * This simply passes the source to the video element. Nothing fancy.

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

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