videojs_rails 4.11.3 → 4.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ced5809db6899f0c9e1d322d6cdb3ae59b860782
-  data.tar.gz: 8eb0f572a252332085909cc3d628eb280fccfc8c
+  metadata.gz: 344dbd419b2240eda178bab867f01ecf317b8537
+  data.tar.gz: 4daebb3442433182f74a27ecd38af5ee44d59b7a
 SHA512:
-  metadata.gz: 9c93ef8b89b8be0a91199e2d74285582e98bac3266a8b093f484a9441ec4238db82255e02b145fb383705e7a4192fb6270c1a83bedd526de01483696ef180604
-  data.tar.gz: 1719e4faa8b04510fd53265df4a340b4e49821086e2a6c559bb44d1abc1f579c364d9205f50a0ec0690b41e6232975ce204acdcd2422c7792ae4f070304c7402
+  metadata.gz: ccf6ac39edb9cf2e39fe2021480aa85778c0fcb6e56588a04a37fedf417bf0b119faa42fd72957ceda05ea433f9bab836b4e86a1b6a4fb1fc14e61b6f842bb9b
+  data.tar.gz: 036c47ff537e13fa2efc145b054c79064a297b95fc67eea6cb276b03279159897f4b28f7676dd715772680f8d48ee6eeccb341e82c2bd1054a4289e779d7bf3e

data/lib/videojs_rails/version.rb

@@ -1,3 +1,3 @@
 module VideojsRails
-  VERSION = '4.11.3'
+  VERSION = '4.11.4'
 end

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

@@ -2122,8 +2122,8 @@ vjs.Component.prototype.removeChild = function(component){
 
   if (!childFound) return;
 
-  this.childIndex_[component.id] = null;
-  this.childNameIndex_[component.name] = null;
+  this.childIndex_[component.id()] = null;
+  this.childNameIndex_[component.name()] = null;
 
   var compEl = component.el();
   if (compEl && compEl.parentNode === this.contentEl()) {
@@ -6788,6 +6788,7 @@ vjs.Html5.prototype.createEl = function(){
   var player = this.player_,
       // If possible, reuse original tag for HTML5 playback technology element
       el = player.tag,
+      attributes,
       newEl,
       clone;
 
@@ -6804,8 +6805,15 @@ vjs.Html5.prototype.createEl = function(){
       player.tag = null;
     } else {
       el = vjs.createEl('video');
+
+      // determine if native controls should be used
+      attributes = videojs.util.mergeOptions({}, player.tagAttributes);
+      if (!vjs.TOUCH_ENABLED || player.options()['nativeControlsForTouch'] !== true) {
+        delete attributes.controls;
+      }
+
       vjs.setElementAttributes(el,
-        vjs.obj.merge(player.tagAttributes || {}, {
+        vjs.obj.merge(attributes, {
           id:player.id() + '_html5_api',
           'class':'vjs-tech'
         })
@@ -7037,13 +7045,13 @@ vjs.Html5.nativeSourceHandler = {};
  * @return {String}         'probably', 'maybe', or '' (empty string)
  */
 vjs.Html5.nativeSourceHandler.canHandleSource = function(source){
-  var ext;
+  var match, ext;
 
   function canPlayType(type){
     // IE9 on Windows 7 without MediaPlayer throws an error here
     // https://github.com/videojs/video.js/issues/519
     try {
-      return !!vjs.TEST_VID.canPlayType(type);
+      return vjs.TEST_VID.canPlayType(type);
     } catch(e) {
       return '';
     }
@@ -7052,11 +7060,15 @@ vjs.Html5.nativeSourceHandler.canHandleSource = function(source){
   // If a type was provided we should rely on that
   if (source.type) {
     return canPlayType(source.type);
-  } else {
+  } else if (source.src) {
     // If no type, fall back to checking 'video/[EXTENSION]'
-    ext = source.src.match(/\.([^\/\?]+)(\?[^\/]+)?$/i)[1];
+    match = source.src.match(/\.([^.\/\?]+)(\?[^\/]+)?$/i);
+    ext = match && match[1];
+
     return canPlayType('video/'+ext);
   }
+
+  return '';
 };
 
 /**

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

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