Videojs 4.11.4

public/js/app.js

@@ -472,8 +472,11 @@ $(window).load(function() {
 
                 var maxTimeToPlayTrack = soundtrack.settings.maxTimeToPlaySource;
                 var ensureTrackPlaying = setInterval(function() {
-                  if (soundtrack.player.currentTime() > 0 || !sources.length) {
-                    console.log('track is playing (yay!), or there are no remaining sources (boo). clearing interval.');
+                  if (!sources.length) {
+                    console.log('sources length is zero.  sad day.  failing out.');
+                    clearInterval( ensureTrackPlaying );
+                  } else if (soundtrack.player.currentTime() > 0) {
+                    console.log('track is playing (yay!).  clearing interval.');
                     clearInterval( ensureTrackPlaying )
                   } else {
                     console.log('track is NOT playing after %dms... advancing to next source', maxTimeToPlayTrack);

public/video-js/video-js.css

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

public/video-js/video.dev.js

@@ -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()) {
@@ -3409,7 +3409,6 @@ vjs.MenuButton.prototype.onClick = function(){
 };
 
 vjs.MenuButton.prototype.onKeyPress = function(event){
-  event.preventDefault();
 
   // Check for space bar (32) or enter (13) keys
   if (event.which == 32 || event.which == 13) {
@@ -3418,11 +3417,13 @@ vjs.MenuButton.prototype.onKeyPress = function(event){
     } else {
       this.pressButton();
     }
+    event.preventDefault();
   // Check for escape (27) key
   } else if (event.which == 27){
     if (this.buttonPressed_){
       this.unpressButton();
     }
+    event.preventDefault();
   }
 };
 
@@ -6787,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;
 
@@ -6803,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'
         })
@@ -7036,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 '';
     }
@@ -7051,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 '';
 };
 
 /**
@@ -7718,8 +7731,8 @@ vjs.Flash.rtmpSourceHandler.canHandleSource = function(source){
 vjs.Flash.rtmpSourceHandler.handleSource = function(source, tech){
   var srcParts = vjs.Flash.streamToParts(source.src);
 
-  tech.setRtmpConnection(srcParts.connection);
-  tech.setRtmpStream(srcParts.stream);
+  tech['setRtmpConnection'](srcParts.connection);
+  tech['setRtmpStream'](srcParts.stream);
 };
 
 // Register the native source handler