webshims-rails 1.14.3 → 1.14.4

data/vendor/assets/javascripts/webshims/shims/track.js

@@ -5,7 +5,8 @@ webshims.register('track', function($, webshims, window, document, undefined){
 	//descriptions are not really shown, but they are inserted into the dom
 	var showTracks = {subtitles: 1, captions: 1, descriptions: 1};
 	var dummyTrack = $('<track />');
-	var supportTrackMod = Modernizr.ES5 && Modernizr.objectAccessor;
+	var support = webshims.support;
+	var supportTrackMod = support.ES5 && support.objectAccessor;
 	var createEventTarget = function(obj){
 		var eventList = {};
 		obj.addEventListener = function(name, fn){
@@ -314,19 +315,23 @@ webshims.register('track', function($, webshims, window, document, undefined){
 		ttml = $.parseXML(ttml) || [];
 		return $(ttml).find('[begin][end]').map(mapTtmlToVtt).get().join('\n\n') || '';
 	};
-	
+	var loadingTracks = 0;
+
 	mediaelement.loadTextTrack = function(mediaelem, track, trackData, _default){
-		var loadEvents = 'play playing';
+		var loadEvents = 'play playing loadedmetadata loadstart';
 		var obj = trackData.track;
 		var load = function(){
 			var error, ajax, createAjax;
-			var src = obj.mode != 'disabled' && ($.attr(track, 'src') && $.prop(track, 'src'));
+			var isDisabled = obj.mode == 'disabled';
+			var videoState = !!($.prop(mediaelem, 'readyState') > 0 || $.prop(mediaelem, 'networkState') == 2 || !$.prop(mediaelem, 'paused'));
+			var src = (!isDisabled || videoState) && ($.attr(track, 'src') && $.prop(track, 'src'));
 
 			if(src){
 				$(mediaelem).off(loadEvents, load).off('updatetrackdisplay', load);
 
 				if(!trackData.readyState){
 					error = function(){
+						loadingTracks--;
 						trackData.readyState = 3;
 						obj.cues = null;
 						obj.activeCues = obj.shimActiveCues = obj._shimActiveCues = null;
@@ -336,12 +341,14 @@ webshims.register('track', function($, webshims, window, document, undefined){
 					try {
 						obj.cues = mediaelement.createCueList();
 						obj.activeCues = obj.shimActiveCues = obj._shimActiveCues = mediaelement.createCueList();
+						loadingTracks++;
 						createAjax = function(){
 							ajax = $.ajax({
 								dataType: 'text',
 								url: src,
 								success: function(text){
-									var contentType = ajax.getResponseHeader('content-type');
+									loadingTracks--;
+									var contentType = ajax.getResponseHeader('content-type') || '';
 
 									if(!contentType.indexOf('application/xml')){
 										text = ttmlTextToVTT(text);
@@ -357,13 +364,16 @@ webshims.register('track', function($, webshims, window, document, undefined){
 											error();
 										}
 									});
-									
 								},
 								error: error
 							});
 						};
 						if($.ajax && $.ajaxSettings.xhr){
-							createAjax();
+							if(isDisabled){
+								setTimeout(createAjax, loadingTracks * 2);
+							} else {
+								createAjax();
+							}
 						} else {
 							webshims.ready('jajax', createAjax);
 							webshims.loader.loadList(['jajax']);
@@ -382,13 +392,12 @@ webshims.register('track', function($, webshims, window, document, undefined){
 		obj.cues = null;
 
 		$(mediaelem).on(loadEvents, load);
+
 		if(_default){
 			obj.mode = showTracks[obj.kind] ? 'showing' : 'hidden';
-			webshims.ready('WINDOWLOAD', load);
+			load();
 		} else {
-			webshims.ready('WINDOWLOAD', function(){
-				$(mediaelem).on('updatetrackdisplay', load);
-			});
+			$(mediaelem).on('updatetrackdisplay', load);
 		}
 	};
 	
@@ -660,7 +669,7 @@ modified for webshims
 		return baseData.textTracks;
 	};
 	
-	if(!Modernizr.track){
+	if(!support.track){
 		webshims.defineNodeNamesBooleanProperty(['track'], 'default');
 		webshims.reflectProperties(['track'], ['srclang', 'label']);
 		
@@ -675,7 +684,7 @@ modified for webshims
 	
 	webshims.defineNodeNameProperties('track', {
 		kind: {
-			attr: Modernizr.track ? {
+			attr: support.track ? {
 				set: function(value){
 					var trackData = webshims.data(this, 'trackData');
 					this.setAttribute('data-kind', value);
@@ -730,7 +739,6 @@ modified for webshims
 	});
 	
 	//
-	
 	webshims.defineNodeNamesProperties(['track'], {
 		ERROR: {
 			value: 3
@@ -840,7 +848,7 @@ modified for webshims
 			})
 			.on('emptied updatetracklist wsmediareload', thUpdateList)
 			.each(function(){
-				if(Modernizr.track){
+				if(support.track){
 					var shimedTextTracks = $.prop(this, 'textTracks');
 					var origTextTracks = this.textTracks;
 
@@ -865,7 +873,7 @@ modified for webshims
 		});
 	});
 	
-	if(Modernizr.texttrackapi){
+	if(support.texttrackapi){
 		$('video, audio').trigger('trackapichange');
 	}
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webshims-rails
 version: !ruby/object:Gem::Version
-  version: 1.14.3
+  version: 1.14.4
 platform: ruby
 authors:
 - David Reese
@@ -64,9 +64,7 @@ files:
 - vendor/assets/javascripts/webshims/shims/combos/16.js
 - vendor/assets/javascripts/webshims/shims/combos/17.js
 - vendor/assets/javascripts/webshims/shims/combos/18.js
-- vendor/assets/javascripts/webshims/shims/combos/19.js
 - vendor/assets/javascripts/webshims/shims/combos/2.js
-- vendor/assets/javascripts/webshims/shims/combos/20.js
 - vendor/assets/javascripts/webshims/shims/combos/21.js
 - vendor/assets/javascripts/webshims/shims/combos/22.js
 - vendor/assets/javascripts/webshims/shims/combos/23.js
@@ -78,7 +76,6 @@ files:
 - vendor/assets/javascripts/webshims/shims/combos/3.js
 - vendor/assets/javascripts/webshims/shims/combos/30.js
 - vendor/assets/javascripts/webshims/shims/combos/31.js
-- vendor/assets/javascripts/webshims/shims/combos/32.js
 - vendor/assets/javascripts/webshims/shims/combos/33.js
 - vendor/assets/javascripts/webshims/shims/combos/34.js
 - vendor/assets/javascripts/webshims/shims/combos/4.js
@@ -90,10 +87,10 @@ files:
 - vendor/assets/javascripts/webshims/shims/combos/97.js
 - vendor/assets/javascripts/webshims/shims/combos/98.js
 - vendor/assets/javascripts/webshims/shims/combos/99.js
-- vendor/assets/javascripts/webshims/shims/combos/comboinfo.json
 - vendor/assets/javascripts/webshims/shims/details.js
 - vendor/assets/javascripts/webshims/shims/dom-extend.js
 - vendor/assets/javascripts/webshims/shims/es5.js
+- vendor/assets/javascripts/webshims/shims/es6.js
 - vendor/assets/javascripts/webshims/shims/excanvas.js
 - vendor/assets/javascripts/webshims/shims/filereader.js
 - vendor/assets/javascripts/webshims/shims/form-combat.js
@@ -101,6 +98,7 @@ files:
 - vendor/assets/javascripts/webshims/shims/form-datalist-lazy.js
 - vendor/assets/javascripts/webshims/shims/form-datalist.js
 - vendor/assets/javascripts/webshims/shims/form-fixrangechange.js
+- vendor/assets/javascripts/webshims/shims/form-inputmode.js
 - vendor/assets/javascripts/webshims/shims/form-message.js
 - vendor/assets/javascripts/webshims/shims/form-native-extend.js
 - vendor/assets/javascripts/webshims/shims/form-number-date-api.js
@@ -137,8 +135,8 @@ files:
 - vendor/assets/javascripts/webshims/shims/i18n/formcfg-zh-TW.js
 - vendor/assets/javascripts/webshims/shims/jajax.js
 - vendor/assets/javascripts/webshims/shims/jme/_icons.scss
-- vendor/assets/javascripts/webshims/shims/jme/b.js
-- vendor/assets/javascripts/webshims/shims/jme/c.js
+- vendor/assets/javascripts/webshims/shims/jme/alternate-media.js
+- vendor/assets/javascripts/webshims/shims/jme/base.js
 - vendor/assets/javascripts/webshims/shims/jme/controls.css
 - vendor/assets/javascripts/webshims/shims/jme/controls.scss
 - vendor/assets/javascripts/webshims/shims/jme/jme.eot
@@ -146,7 +144,8 @@ files:
 - vendor/assets/javascripts/webshims/shims/jme/jme.ttf
 - vendor/assets/javascripts/webshims/shims/jme/jme.woff
 - vendor/assets/javascripts/webshims/shims/jme/mediacontrols-lazy.js
-- vendor/assets/javascripts/webshims/shims/jme/p.js
+- vendor/assets/javascripts/webshims/shims/jme/mediacontrols.js
+- vendor/assets/javascripts/webshims/shims/jme/playlist.js
 - vendor/assets/javascripts/webshims/shims/jpicker/ChangeLog.txt
 - vendor/assets/javascripts/webshims/shims/jpicker/ReadMe.txt
 - vendor/assets/javascripts/webshims/shims/jpicker/images/AlphaBar.png
@@ -160,6 +159,7 @@ files:
 - vendor/assets/javascripts/webshims/shims/jpicker/images/preview-opacity.png
 - vendor/assets/javascripts/webshims/shims/jpicker/images/rangearrows.gif
 - vendor/assets/javascripts/webshims/shims/jpicker/jpicker.css
+- vendor/assets/javascripts/webshims/shims/matchMedia.js
 - vendor/assets/javascripts/webshims/shims/mediaelement-core.js
 - vendor/assets/javascripts/webshims/shims/mediaelement-debug.js
 - vendor/assets/javascripts/webshims/shims/mediaelement-jaris.js
@@ -189,6 +189,7 @@ files:
 - vendor/assets/javascripts/webshims/shims/styles/scss/shim.scss
 - vendor/assets/javascripts/webshims/shims/styles/shim-ext.css
 - vendor/assets/javascripts/webshims/shims/styles/shim.css
+- vendor/assets/javascripts/webshims/shims/styles/transparent.png
 - vendor/assets/javascripts/webshims/shims/styles/widget.eot
 - vendor/assets/javascripts/webshims/shims/styles/widget.svg
 - vendor/assets/javascripts/webshims/shims/styles/widget.ttf