webshims-rails 1.12.5 → 1.12.7

data/vendor/assets/javascripts/webshims/shims/combos/22.js

@@ -150,12 +150,8 @@ webshims.register('details', function($, webshims, window, doc, undefined, optio
 	"use strict";
 	var mediaelement = webshims.mediaelement;
 	var id = new Date().getTime();
-	var ADDBACK = $.fn.addBack ? 'addBack' : 'andSelf';
 	//descriptions are not really shown, but they are inserted into the dom
 	var showTracks = {subtitles: 1, captions: 1, descriptions: 1};
-	var notImplemented = function(){
-		webshims.error('not implemented yet');
-	};
 	var dummyTrack = $('<track />');
 	var supportTrackMod = Modernizr.ES5 && Modernizr.objectAccessor;
 	var createEventTarget = function(obj){
@@ -257,9 +253,7 @@ webshims.register('details', function($, webshims, window, doc, undefined, optio
 	};
 	var copyProps = ['kind', 'label', 'srclang'];
 	var copyName = {srclang: 'language'};
-	
-	var owns = Function.prototype.call.bind(Object.prototype.hasOwnProperty);
-	
+
 	var updateMediaTrackList = function(baseData, trackList){
 		var removed = [];
 		var added = [];
@@ -362,60 +356,44 @@ webshims.register('details', function($, webshims, window, doc, undefined, optio
 		};
 	})();
 	var emptyDiv = $('<div />')[0];
+
 	function VTTCue(startTime, endTime, text){
 		if(arguments.length != 3){
 			webshims.error("wrong arguments.length for VTTCue.constructor");
 		}
-		
+
 		this.startTime = startTime;
 		this.endTime = endTime;
 		this.text = text;
-		
-		
-		createEventTarget(this);
-	}
-	
-	VTTCue.prototype = {
-		
-		onenter: null,
-		onexit: null,
-		pauseOnExit: false,
-		getCueAsHTML: function(){
+		this.onenter = null;
+		this.onexit = null;
+		this.pauseOnExit = false;
+		this.track = null;
+		this.id = null;
+		this.getCueAsHTML = (function(){
 			var lastText = "";
 			var parsedText = "";
-			var fragment = document.createDocumentFragment();
-			var fn;
-			if(!owns(this, 'getCueAsHTML')){
-				fn = this.getCueAsHTML = function(){
-					var i, len;
-					if(lastText != this.text){
-						lastText = this.text;
-						parsedText = mediaelement.parseCueTextToHTML(lastText);
-						emptyDiv.innerHTML = parsedText;
-						
-						for(i = 0, len = emptyDiv.childNodes.length; i < len; i++){
-							fragment.appendChild(emptyDiv.childNodes[i].cloneNode(true));
-						}
+			var fragment;
+
+			return function(){
+				var i, len;
+				if(!fragment){
+					fragment = document.createDocumentFragment();
+				}
+				if(lastText != this.text){
+					lastText = this.text;
+					parsedText = mediaelement.parseCueTextToHTML(lastText);
+					emptyDiv.innerHTML = parsedText;
+
+					for(i = 0, len = emptyDiv.childNodes.length; i < len; i++){
+						fragment.appendChild(emptyDiv.childNodes[i].cloneNode(true));
 					}
-					return fragment.cloneNode(true);
-				};
-				
-			}
-			return fn ? fn.apply(this, arguments) : fragment.cloneNode(true);
-		},
-		track: null,
-		
-		
-		id: ''
-		//todo-->
-//			,
-//			snapToLines: true,
-//			line: 'auto',
-//			size: 100,
-//			position: 50,
-//			vertical: '',
-//			align: 'middle'
-	};
+				}
+				return fragment.cloneNode(true);
+			};
+
+		})();
+	}
 	
 	window.VTTCue = VTTCue;
 	window.TextTrackCue = function(){
@@ -466,14 +444,15 @@ webshims.register('details', function($, webshims, window, doc, undefined, optio
 	})();
 	
 	mediaelement.loadTextTrack = function(mediaelem, track, trackData, _default){
-		var loadEvents = 'play playing updatetrackdisplay';
+		var loadEvents = 'play playing';
 		var obj = trackData.track;
 		var load = function(){
 			var error, ajax, createAjax;
-
 			var src = obj.mode != 'disabled' && ($.attr(track, 'src') && $.prop(track, 'src'));
+
 			if(src){
-				$(mediaelem).off(loadEvents, load);
+				$(mediaelem).off(loadEvents, load).off('updatetrackdisplay', load);
+
 				if(!trackData.readyState){
 					error = function(){
 						trackData.readyState = 3;
@@ -507,7 +486,7 @@ webshims.register('details', function($, webshims, window, doc, undefined, optio
 								error: error
 							});
 						};
-						if($.ajax){
+						if($.ajax && $.ajaxSettings.xhr){
 							createAjax();
 						} else {
 							webshims.ready('jajax', createAjax);
@@ -525,11 +504,15 @@ webshims.register('details', function($, webshims, window, doc, undefined, optio
 		obj._shimActiveCues = null;
 		obj.activeCues = null;
 		obj.cues = null;
-		$(mediaelem).off(loadEvents, load);
+
 		$(mediaelem).on(loadEvents, load);
 		if(_default){
 			obj.mode = showTracks[obj.kind] ? 'showing' : 'hidden';
-			load();
+			webshims.ready('WINDOWLOAD', load);
+		} else {
+			webshims.ready('WINDOWLOAD', function(){
+				$(mediaelem).on('updatetrackdisplay', load);
+			});
 		}
 	};
 	
@@ -558,7 +541,6 @@ webshims.register('details', function($, webshims, window, doc, undefined, optio
 			
 			
 			if(track.nodeName){
-				
 				if(supportTrackMod){
 					copyProps.forEach(function(copyProp){
 						webshims.defineProperty(obj, copyName[copyProp] || copyProp, {
@@ -593,8 +575,8 @@ webshims.register('details', function($, webshims, window, doc, undefined, optio
 		
 		return obj;
 	};
-	
-	
+
+
 /*
 taken from:
 Captionator 0.5.1 [CaptionCrunch]
@@ -611,7 +593,7 @@ modified for webshims
 		var WebVTTDEFAULTSCueParser		= /^(DEFAULTS|DEFAULT)\s+\-\-\>\s+(.*)/g;
 		var WebVTTSTYLECueParser		= /^(STYLE|STYLES)\s+\-\-\>\s*\n([\s\S]*)/g;
 		var WebVTTCOMMENTCueParser		= /^(COMMENT|COMMENTS)\s+\-\-\>\s+(.*)/g;
-		
+
 		return function(subtitleElement,objectCount){
 
 			var subtitleParts, timeIn, timeOut, html, timeData, subtitlePartIndex, id, specialCueData;
@@ -627,33 +609,33 @@ modified for webshims
 			} else if ((specialCueData = WebVTTCOMMENTCueParser.exec(subtitleElement))) {
 				return null; // At this stage, we don't want to do anything with these.
 			}
-			
+
 			subtitleParts = subtitleElement.split(/\n/g);
-		
+
 			// Trim off any blank lines (logically, should only be max. one, but loop to be sure)
 			while (!subtitleParts[0].replace(/\s+/ig,"").length && subtitleParts.length > 0) {
 				subtitleParts.shift();
 			}
-		
+
 			if (subtitleParts[0].match(/^\s*[a-z0-9-\_]+\s*$/ig)) {
 				// The identifier becomes the cue ID (when *we* load the cues from file. Programatically created cues can have an ID of whatever.)
 				id = String(subtitleParts.shift().replace(/\s*/ig,""));
 			}
-		
+
 			for (subtitlePartIndex = 0; subtitlePartIndex < subtitleParts.length; subtitlePartIndex ++) {
 				var timestamp = subtitleParts[subtitlePartIndex];
-				
+
 				if ((timestampMatch = WebVTTTimestampParser.exec(timestamp))) {
-					
+
 					// WebVTT
-					
+
 					timeData = timestampMatch.slice(1);
-					
+
 					timeIn =	parseInt((timeData[0]||0) * 60 * 60,10) +	// Hours
 								parseInt((timeData[1]||0) * 60,10) +		// Minutes
 								parseInt((timeData[2]||0),10) +				// Seconds
 								parseFloat("0." + (timeData[3]||0));		// MS
-					
+
 					timeOut =	parseInt((timeData[4]||0) * 60 * 60,10) +	// Hours
 								parseInt((timeData[5]||0) * 60,10) +		// Minutes
 								parseInt((timeData[6]||0),10) +				// Seconds
@@ -664,7 +646,7 @@ modified for webshims
 					}
 */
 				}
-				
+
 				// We've got the timestamp - return all the other unmatched lines as the raw subtitle data
 				subtitleParts = subtitleParts.slice(0,subtitlePartIndex).concat(subtitleParts.slice(subtitlePartIndex+1));
 				break;
@@ -683,7 +665,7 @@ modified for webshims
 						previous[current.split(":")[0]] = current.split(":")[1];
 						return previous;
 					},{});
-			
+
 			// Loop through cue settings, replace defaults with cue specific settings if they exist
 			compositeCueSettings =
 				cueSettings
@@ -694,7 +676,7 @@ modified for webshims
 						previous[current.split(":")[0]] = current.split(":")[1];
 						return previous;
 					},compositeCueSettings);
-			
+
 			// Turn back into string like the VTTCue constructor expects
 			cueSettings = "";
 			for (var key in compositeCueSettings) {
@@ -713,18 +695,18 @@ modified for webshims
 			return tmpCue;
 		};
 	})();
-	
+
 	mediaelement.parseCaptions = function(captionData, track, complete) {
 
 		var cue, lazyProcess, regWevVTT, startDate, isWEBVTT;
 
 		mediaelement.createCueList();
 		if (captionData) {
-			
+
 			regWevVTT = /^WEBVTT(\s*FILE)?/ig;
-			
+
 			lazyProcess = function(i, len){
-				
+
 				for(; i < len; i++){
 					cue = captionData[i];
 					if(regWevVTT.test(cue)){
@@ -746,7 +728,7 @@ modified for webshims
 							startDate = new Date().getTime();
 							lazyProcess(i, len);
 						}, 90);
-						
+
 						break;
 					}
 				}
@@ -757,9 +739,9 @@ modified for webshims
 					complete(track.cues);
 				}
 			};
-			
+
 			captionData = captionData.replace(/\r\n/g,"\n");
-			
+
 			setTimeout(function(){
 				captionData = captionData.replace(/\r/g,"\n");
 				setTimeout(function(){
@@ -768,12 +750,12 @@ modified for webshims
 					lazyProcess(0, captionData.length);
 				}, 9);
 			}, 9);
-			
+
 		} else {
 			webshims.error("Required parameter captionData not supplied.");
 		}
 	};
-	
+
 	
 	mediaelement.createTrackList = function(mediaelem, baseData){
 		baseData = baseData || webshims.data(mediaelem, 'mediaelementBase') || webshims.data(mediaelem, 'mediaelementBase', {});
@@ -995,8 +977,9 @@ modified for webshims
 				if(Modernizr.track){
 					var shimedTextTracks = $.prop(this, 'textTracks');
 					var origTextTracks = this.textTracks;
+
 					if(shimedTextTracks.length != origTextTracks.length){
-						webshims.error("textTracks couldn't be copied");
+						webshims.warn("textTracks couldn't be copied");
 					}
 					
 					$('track', this).each(hideNativeTracks);

data/vendor/assets/javascripts/webshims/shims/combos/23.js

@@ -238,7 +238,6 @@ webshims.isReady('swfmini', true);
 
 	var wsCfg = webshims.cfg;
 	var options = wsCfg.mediaelement;
-	var hasFullTrackSupport;
 	var hasSwf;
 	if(!options){
 		webshims.error("mediaelement wasn't implemented but loaded");
@@ -280,11 +279,9 @@ webshims.isReady('swfmini', true);
 			}
 		})();
 	}
-	hasFullTrackSupport = Modernizr.track && !bugs.track;
 
 webshims.register('mediaelement-core', function($, webshims, window, document, undefined, options){
 	hasSwf = swfmini.hasFlashPlayerVersion('10.0.3');
-	$('html').addClass(hasSwf ? 'swf' : 'no-swf');
 	var mediaelement = webshims.mediaelement;
 	
 	mediaelement.parseRtmp = function(data){
@@ -663,6 +660,9 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 							if(hasNative && (!data || data.isActive == 'html5') && supLoad.prop._supvalue){
 								supLoad.prop._supvalue.apply(this, arguments);
 							}
+							if(!loadTrackUi.loaded && $('track', this).length){
+								loadTrackUi();
+							}
 							$(this).triggerHandler('wsmediareload');
 						}
 					}
@@ -733,13 +733,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 		}
 	};
 	
-	if(hasFullTrackSupport){
-		webshims.defineProperty(TextTrack.prototype, 'shimActiveCues', {
-			get: function(){
-				return this._shimActiveCues || this.activeCues;
-			}
-		});
-	}
+
 	//set native implementation ready, before swf api is retested
 	if(hasNative){
 		webshims.isReady('mediaelement-core', true);

data/vendor/assets/javascripts/webshims/shims/combos/25.js

@@ -225,7 +225,9 @@ webshims.isReady('swfmini', true);
 // vim: ts=4 sts=4 sw=4 expandtab
 
 (function () {
-
+setTimeout(function(){
+	webshims.isReady('es5', true);
+});
 /**
  * Brings an environment as close to ECMAScript 5 compliance
  * as is possible with the facilities of erstwhile engines.
@@ -1664,10 +1666,69 @@ if((!advancedObjectProperties || !Object.create || !Object.defineProperties || !
     };
 
 }
+webshims.isReady('es5', true);
 })(webshims.$, webshims);
 
 
-;//DOM-Extension helper
+;
+//this might was already extended by ES5 shim feature
+(function($){
+	"use strict";
+	var webshims = window.webshims;
+	if(webshims.defineProperties){return;}
+	var defineProperty = 'defineProperty';
+	var has = Object.prototype.hasOwnProperty;
+	var descProps = ['configurable', 'enumerable', 'writable'];
+	var extendUndefined = function(prop){
+		for(var i = 0; i < 3; i++){
+			if(prop[descProps[i]] === undefined && (descProps[i] !== 'writable' || prop.value !== undefined)){
+				prop[descProps[i]] = true;
+			}
+		}
+	};
+
+	var extendProps = function(props){
+		if(props){
+			for(var i in props){
+				if(has.call(props, i)){
+					extendUndefined(props[i]);
+				}
+			}
+		}
+	};
+
+	if(Object.create){
+		webshims.objectCreate = function(proto, props, opts){
+			extendProps(props);
+			var o = Object.create(proto, props);
+			if(opts){
+				o.options = $.extend(true, {}, o.options  || {}, opts);
+				opts = o.options;
+			}
+			if(o._create && $.isFunction(o._create)){
+				o._create(opts);
+			}
+			return o;
+		};
+	}
+
+	if(Object[defineProperty]){
+		webshims[defineProperty] = function(obj, prop, desc){
+			extendUndefined(desc);
+			return Object[defineProperty](obj, prop, desc);
+		};
+	}
+	if(Object.defineProperties){
+		webshims.defineProperties = function(obj, props){
+			extendProps(props);
+			return Object.defineProperties(obj, props);
+		};
+	}
+	webshims.getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+
+	webshims.getPrototypeOf = Object.getPrototypeOf;
+})(window.webshims.$);
+//DOM-Extension helper
 webshims.register('dom-extend', function($, webshims, window, document, undefined){
 	"use strict";
 	var supportHrefNormalized = !('hrefNormalized' in $.support) || $.support.hrefNormalized;
@@ -2302,6 +2363,13 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 						this.width = docObserve.getWidth();
 						setInterval(this.test, 999);
 						$(this.test);
+						if($.support.boxSizing == null){
+							$(function(){
+								if($.support.boxSizing){
+									docObserve.handler({type: 'boxsizing'});
+								}
+							});
+						}
 						webshims.ready('WINDOWLOAD', this.test);
 						$(document).on('updatelayout.webshim pageinit popupafteropen panelbeforeopen tabsactivate collapsibleexpand shown.bs.modal shown.bs.collapse slid.bs.carousel', this.handler);
 						$(window).on('resize', this.handler);
@@ -2313,13 +2381,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			webshims.docObserve = function(){
 				webshims.ready('DOM', function(){
 					docObserve.start();
-					if($.support.boxSizing == null){
-						$(function(){
-							if($.support.boxSizing){
-								docObserve.handler({type: 'boxsizing'});
-							}
-						});
-					}
+
 				});
 			};
 			return function(nativeElem, shadowElem, opts){
@@ -3205,7 +3267,6 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 
 	var wsCfg = webshims.cfg;
 	var options = wsCfg.mediaelement;
-	var hasFullTrackSupport;
 	var hasSwf;
 	if(!options){
 		webshims.error("mediaelement wasn't implemented but loaded");
@@ -3247,11 +3308,9 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			}
 		})();
 	}
-	hasFullTrackSupport = Modernizr.track && !bugs.track;
 
 webshims.register('mediaelement-core', function($, webshims, window, document, undefined, options){
 	hasSwf = swfmini.hasFlashPlayerVersion('10.0.3');
-	$('html').addClass(hasSwf ? 'swf' : 'no-swf');
 	var mediaelement = webshims.mediaelement;
 	
 	mediaelement.parseRtmp = function(data){
@@ -3630,6 +3689,9 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 							if(hasNative && (!data || data.isActive == 'html5') && supLoad.prop._supvalue){
 								supLoad.prop._supvalue.apply(this, arguments);
 							}
+							if(!loadTrackUi.loaded && $('track', this).length){
+								loadTrackUi();
+							}
 							$(this).triggerHandler('wsmediareload');
 						}
 					}
@@ -3700,13 +3762,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 		}
 	};
 	
-	if(hasFullTrackSupport){
-		webshims.defineProperty(TextTrack.prototype, 'shimActiveCues', {
-			get: function(){
-				return this._shimActiveCues || this.activeCues;
-			}
-		});
-	}
+
 	//set native implementation ready, before swf api is retested
 	if(hasNative){
 		webshims.isReady('mediaelement-core', true);
@@ -4476,7 +4532,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 			box.insertBefore(elem);
 			
 			if(hasNative){
-				$.extend(data, {volume: $.prop(elem, 'volume'), muted: $.prop(elem, 'muted')});
+				$.extend(data, {volume: $.prop(elem, 'volume'), muted: $.prop(elem, 'muted'), paused: $.prop(elem, 'paused')});
 			}
 			
 			webshims.addShadowDom(elem, box);
@@ -4514,6 +4570,9 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 				if(jaris.type == 'ready'){
 					var onReady = function(){
 						if(data.api){
+							if(!data.paused){
+								data.api.api_play();
+							}
 							if(bufferSrc(elem)){
 								data.api.api_preload();
 							}