webshims-rails 1.14.6 → 1.15.2

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

@@ -48,7 +48,10 @@ webshims.register('track-ui', function($, webshims, window, document, undefined)
 	var usesNativeTrack =  function(){
 		return !options.override && support.texttrackapi;
 	};
-	
+	var requestAnimationFrame = window.cancelAnimationFrame && window.requestAnimationFrame || function(fn){
+		setTimeout(fn, 17);
+	};
+	var cancelAnimationFrame = window.cancelAnimationFrame || window.clearTimeout;
 	var trackDisplay = {
 		update: function(baseData, media){
 			if(!baseData.activeCues.length){
@@ -169,20 +172,42 @@ webshims.register('track-ui', function($, webshims, window, document, undefined)
 			return $.extend([], cueListProto);
 		};
 	}
+
+	function triggerCueEvent(cue, type, baseData, media, trackIndex){
+		var trackElem, compareTrack;
+		var cueChange = $.Event('cuechange');
+		if(!baseData.trackElements){
+			baseData.trackElements = media[0].getElementsByTagName('track');
+		}
+
+		trackElem = baseData.trackElements[trackIndex];
+
+		if(trackElem){
+			compareTrack = (webshims.data(trackElem, 'trackData') || {track: $.prop(trackElem, 'track')}).track;
+			if(compareTrack != cue.track){
+				trackElem = null;
+			}
+		}
+		$.event.trigger(cueChange, null, cue.track, true);
+
+		if(trackElem){
+			$.event.trigger(cueChange, null, trackElem, true);
+		}
+
+		$.event.trigger(type, null, cue, true);
+	}
 	
-	mediaelement.getActiveCue = function(track, media, time, baseData){
+	mediaelement.getActiveCue = function(track, media, time, baseData, trackIndex){
 		if(!track._lastFoundCue){
 			track._lastFoundCue = {index: 0, time: 0};
 		}
 		
-		if(support.texttrackapi && !options.override && !track._shimActiveCues){
+		if(!track._shimActiveCues && support.texttrackapi && !options.override){
 			track._shimActiveCues = mediaelement.createCueList();
 		}
 		
 		var i = 0;
-		var len;
-		var cue;
-		
+		var len, cue, delay;
 		for(; i < track.shimActiveCues.length; i++){
 			cue = track.shimActiveCues[i];
 			if(cue.startTime > time || cue.endTime < time){
@@ -191,10 +216,20 @@ webshims.register('track-ui', function($, webshims, window, document, undefined)
 				if(cue.pauseOnExit){
 					$(media).pause();
 				}
-				$(track).triggerHandler('cuechange');
-				$(cue).triggerHandler('exit');
-			} else if(track.mode == 'showing' && showTracks[track.kind] && $.inArray(cue, baseData.activeCues) == -1){
-				baseData.activeCues.push(cue);
+
+
+				triggerCueEvent(cue, 'exit', baseData, media, trackIndex);
+
+
+			} else {
+				delay = cue.endTime - time;
+				if(baseData.nextUpdateDelay > delay){
+					baseData.nextUpdateDelay = delay;
+					baseData.nextEvent = cue.endTime;
+				}
+				if(track.mode == 'showing' && showTracks[track.kind] && $.inArray(cue, baseData.activeCues) == -1){
+					baseData.activeCues.push(cue);
+				}
 			}
 		}
 		
@@ -210,20 +245,182 @@ webshims.register('track-ui', function($, webshims, window, document, undefined)
 				if(track.mode == 'showing' && showTracks[track.kind]){
 					baseData.activeCues.push(cue);
 				}
-				$(track).triggerHandler('cuechange');
-				$(cue).triggerHandler('enter');
-				
+
+				triggerCueEvent(cue, 'enter', baseData, media, trackIndex);
+
 				track._lastFoundCue.time = time;
 				track._lastFoundCue.index = i;
-				
+
+				delay = cue.endTime - time;
+				if(baseData.nextUpdateDelay > delay){
+					baseData.nextUpdateDelay = delay;
+					baseData.nextEvent = cue.endTime;
+				}
 				
 			}
 			if(cue.startTime > time){
+				delay = cue.startTime - time;
+				if(baseData.nextUpdateDelay > delay){
+					baseData.nextUpdateDelay = delay;
+					baseData.nextEvent = cue.startTime;
+				}
 				break;
 			}
 		}
 	};
-	
+	var filterTrackImplementation = function(){
+		return webshims.implement(this, 'trackui');
+	};
+	var implementTrackUi = function(){
+		var baseData, trackList, updateTimer, updateTimer2, lastDelay, lastTime, invalidTracksTimer;
+		var treshHold = 0.27;
+		var elem = $(this);
+		var recheckI = 0;
+		var recheckId;
+		var reCheck = function(){
+			recheckI++;
+
+			//if recheckI is over 5 video might be paused, stalled or waiting,
+			//in this case abort and wait for the next play, playing or timeupdate event
+			if(recheckI < 9){
+				if(elem.prop('currentTime') > baseData.nextEvent){
+					recheckI = undefined;
+					getDisplayCues();
+				} else {
+					recheckId = requestAnimationFrame(reCheck);
+				}
+			} else {
+				recheckI = undefined;
+			}
+		};
+		var getDisplayCues = function(e){
+			var track, time;
+			if(!trackList || !baseData){
+				trackList = elem.prop('textTracks');
+				baseData = webshims.data(elem[0], 'mediaelementBase') || webshims.data(elem[0], 'mediaelementBase', {});
+
+				if(!baseData.displayedActiveCues){
+					baseData.displayedActiveCues = [];
+				}
+			}
+
+			if (!trackList){return;}
+			time = elem.prop('currentTime');
+
+			if(!time && time !== 0){return;}
+
+			if(baseData.nextEvent && e && e.type == 'timeupdate' && time >= lastTime && baseData.nextEvent - time > treshHold && time - lastTime < 9){
+				return;
+			}
+
+			lastTime = time;
+			lastDelay = baseData.nextUpdateDelay;
+			baseData.nextUpdateDelay = Number.MAX_VALUE;
+			baseData.activeCues = [];
+			for(var i = 0, len = trackList.length; i < len; i++){
+				track = trackList[i];
+				if(track.mode != 'disabled' && track.cues && track.cues.length){
+					mediaelement.getActiveCue(track, elem, time, baseData, i);
+				}
+			}
+			trackDisplay.update(baseData, elem);
+
+			clearTimeout(updateTimer);
+
+			if(baseData.nextUpdateDelay <= treshHold && (e || lastDelay != baseData.nextUpdateDelay) && baseData.nextUpdateDelay > 0){
+
+				lastDelay = baseData.nextUpdateDelay;
+
+				clearTimeout(updateTimer2);
+
+				if(recheckId){
+					cancelAnimationFrame(recheckId);
+				}
+				recheckI = 0;
+				updateTimer2 = setTimeout(reCheck, (baseData.nextUpdateDelay * 1000) + 9);
+			} else if(baseData.nextUpdateDelay >= Number.MAX_VALUE){
+				baseData.nextEvent = time + 2;
+			}
+		};
+		var invalidateTrackElems = function(){
+			if(baseData && baseData.trackElements){
+				delete baseData.trackElements;
+			}
+		};
+		var onUpdatCues = function(e){
+			if(baseData && e && (e.type == 'addtrack' || e.type == 'removetrack')){
+				clearTimeout(invalidTracksTimer);
+				invalidTracksTimer = setTimeout(invalidateTrackElems, 39);
+			}
+			clearTimeout(updateTimer);
+			updateTimer = setTimeout(getDisplayCues, 40);
+		};
+		var addTrackView = function(){
+			if(!trackList) {
+				if(baseData && 'blockTrackListUpdate' in baseData){
+					baseData.blockTrackListUpdate = true;
+				}
+				trackList = elem.prop('textTracks');
+				if(baseData && baseData.blockTrackListUpdate){
+					baseData.blockTrackListUpdate = false;
+				}
+			}
+			//as soon as change on trackList is implemented in all browsers we do not need to have 'updatetrackdisplay' anymore
+			$( [trackList] )
+				.off('.trackview')
+				.on('change.trackview addtrack.trackview removetrack.trackview', onUpdatCues)
+			;
+			elem
+				.off('.trackview')
+				.on('emptied.trackview', invalidateTrackElems)
+				.on('play.trackview playing.trackview updatetrackdisplay.trackview seeked.trackview', onUpdatCues)
+				.on('timeupdate.trackview', getDisplayCues)
+			;
+		};
+
+		elem.on('remove', function(e){
+			if(!e.originalEvent && baseData && baseData.trackDisplay){
+				setTimeout(function(){
+					baseData.trackDisplay.remove();
+				}, 4);
+			}
+		});
+
+		if(!usesNativeTrack()){
+			addTrackView();
+		} else {
+
+			if(elem.hasClass('nonnative-api-active')){
+				addTrackView();
+			}
+			elem
+				.on('mediaelementapichange trackapichange', function(){
+
+					if(!usesNativeTrack() || elem.hasClass('nonnative-api-active')){
+						addTrackView();
+					} else {
+						clearTimeout(updateTimer);
+						clearTimeout(updateTimer2);
+						if(recheckId){
+							cancelAnimationFrame(recheckId);
+						}
+
+						trackList = elem.prop('textTracks');
+						baseData = webshims.data(elem[0], 'mediaelementBase') || webshims.data(elem[0], 'mediaelementBase', {});
+						$.each(trackList, function(i, track){
+							if(track._shimActiveCues){
+								delete track._shimActiveCues;
+							}
+						});
+						$( [trackList] ).off('.trackview');
+						trackDisplay.hide(baseData);
+						elem.off('.trackview');
+					}
+				})
+			;
+		}
+	};
+
 	if(usesNativeTrack()){
 		(function(){
 			var block;
@@ -265,102 +462,8 @@ webshims.register('track-ui', function($, webshims, window, document, undefined)
 	webshims.addReady(function(context, insertedElement){
 		$('video, audio', context)
 			.add(insertedElement.filter('video, audio'))
-			.filter(function(){
-				return webshims.implement(this, 'trackui');
-			})
-			.each(function(){
-				var baseData, trackList, updateTimer, updateTimer2;
-				
-				var elem = $(this);
-				var getDisplayCues = function(e){
-					var track;
-					var time;
-					
-					if(!trackList || !baseData){
-						trackList = elem.prop('textTracks');
-						baseData = webshims.data(elem[0], 'mediaelementBase') || webshims.data(elem[0], 'mediaelementBase', {});
-						if(!baseData.displayedActiveCues){
-							baseData.displayedActiveCues = [];
-						}
-					}
-					
-					if (!trackList){return;}
-					time = elem.prop('currentTime');
-					
-					if(!time && time !== 0){return;}
-					baseData.activeCues = [];
-					for(var i = 0, len = trackList.length; i < len; i++){
-						track = trackList[i];
-						if(track.mode != 'disabled' && track.cues && track.cues.length){
-							mediaelement.getActiveCue(track, elem, time, baseData);
-						}
-					}
-					
-					trackDisplay.update(baseData, elem);
-					
-				};
-				var onUpdate = function(e){
-					clearTimeout(updateTimer);
-					if(e){
-						if(e.type == 'timeupdate'){
-							getDisplayCues();
-						}
-						updateTimer2 = setTimeout(onUpdate, 90);
-					} else {
-						updateTimer = setTimeout(getDisplayCues, 9);
-					}
-				};
-				var addTrackView = function(){
-					if(!trackList) {
-						trackList = elem.prop('textTracks');
-					}
-					//as soon as change on trackList is implemented in all browsers we do not need to have 'updatetrackdisplay' anymore
-					$( [trackList] ).on('change', onUpdate);
-					elem
-						.off('.trackview')
-						.on('play.trackview timeupdate.trackview updatetrackdisplay.trackview', onUpdate)
-					;
-				};
-				
-				elem.on('remove', function(e){
-					if(!e.originalEvent && baseData && baseData.trackDisplay){
-						setTimeout(function(){
-							baseData.trackDisplay.remove();
-						}, 4);
-					}
-				});
-				
-				if(!usesNativeTrack()){
-					addTrackView();
-				} else {
-					
-					if(elem.hasClass('nonnative-api-active')){
-						addTrackView();
-					}
-					elem
-						.on('mediaelementapichange trackapichange', function(){
-							
-							if(!usesNativeTrack() || elem.hasClass('nonnative-api-active')){
-								addTrackView();
-							} else {
-								clearTimeout(updateTimer);
-								clearTimeout(updateTimer2);
-								
-								trackList = elem.prop('textTracks');
-								baseData = webshims.data(elem[0], 'mediaelementBase') || webshims.data(elem[0], 'mediaelementBase', {});
-								
-								$.each(trackList, function(i, track){
-									if(track._shimActiveCues){
-										delete track._shimActiveCues;
-									}
-								});
-								trackDisplay.hide(baseData);
-								elem.off('.trackview');
-							}
-						})
-					;
-				}
-			})
+			.filter(filterTrackImplementation)
+			.each(implementTrackUi)
 		;
 	});
 });

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

@@ -66,8 +66,12 @@ webshims.register('track', function($, webshims, window, document, undefined){
 				var lastCue = this.cues[this.cues.length-1];
 				if(lastCue && lastCue.startTime > cue.startTime){
 					webshims.error("cue startTime higher than previous cue's startTime");
+					return;
 				}
 			}
+			if(cue.startTime >= cue.endTime ){
+				webshim.error('startTime >= endTime of cue: '+ cue.text);
+			}
 			if(cue.track && cue.track.removeCue){
 				cue.track.removeCue(cue);
 			}
@@ -159,6 +163,7 @@ webshims.register('track', function($, webshims, window, document, undefined){
 			for(i = 0, len = added.length; i < len; i++){
 				$([trackList]).triggerHandler($.Event({type: 'addtrack', track: added[i]}));
 			}
+			//todo: remove
 			if(baseData.scriptedTextTracks || removed.length){
 				$(this).triggerHandler('updatetrackdisplay');
 			}
@@ -175,7 +180,7 @@ webshims.register('track', function($, webshims, window, document, undefined){
 			setTimeout(function(){
 				$(track).closest('audio, video').triggerHandler('updatetrackdisplay');
 				trackData.isTriggering = false;
-			}, 1);
+			}, 9);
 		}
 	};
 	var isDefaultTrack = (function(){
@@ -368,15 +373,10 @@ webshims.register('track', function($, webshims, window, document, undefined){
 								error: error
 							});
 						};
-						if($.ajax && $.ajaxSettings.xhr){
-							if(isDisabled){
-								setTimeout(createAjax, loadingTracks * 2);
-							} else {
-								createAjax();
-							}
+						if(isDisabled){
+							setTimeout(createAjax, loadingTracks * 2);
 						} else {
-							webshims.ready('jajax', createAjax);
-							webshims.loader.loadList(['jajax']);
+							createAjax();
 						}
 					} catch(er){
 						error();

data/vendor/assets/javascripts/webshims/shims/usermedia-core.js

@@ -5,6 +5,7 @@ webshim.register('usermedia-core', function($, webshim, window, document, undefi
 	var addUnPrefixed = function(){
 		navigator.getUserMedia = navigator[webshim.prefixed('getUserMedia', navigator)];
 	};
+
 	if(srcObjectName != 'srcObject'){
 		var hasURL = !!(window.URL && URL.createObjectURL);
 		webshim.defineNodeNamesProperty(['audio', 'video'], 'srcObject', {
@@ -23,6 +24,32 @@ webshim.register('usermedia-core', function($, webshim, window, document, undefi
 		});
 	}
 
+	(function(){
+		var streams = {};
+		var _nativeCreateObjectURL = URL.createObjectURL;
+		var _nativeRevokeObjectURL = URL.revokeObjectURL;
+
+		URL.createObjectURL = function(stream){
+
+			var url = stream;
+			if(_nativeCreateObjectURL && !stream._wsStreamId){
+				url = _nativeCreateObjectURL.apply(this, arguments);
+			} else if(stream._wsStreamId) {
+				url = stream._wsStreamId;
+				streams[url] = stream;
+			}
+			return url;
+		};
+
+		URL.revokeObjectURL = function(url){
+			if(streams[url]){
+				delete streams[url];
+			} else if (_nativeRevokeObjectURL){
+				return _nativeRevokeObjectURL.apply(this, arguments);
+			}
+		};
+	})();
+
 
 	webshim.ready(webshim.modules["usermedia-shim"].loaded ? 'usermedia-api' : 'usermedia-shim', addUnPrefixed);
 });