webshims-rails 1.10.6 → 1.10.9

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

@@ -324,6 +324,7 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 	var hasNative = Modernizr.audio && Modernizr.video;
 	var hasFlash = swfmini.hasFlashPlayerVersion('9.0.115');
 	var loadedSwf = 0;
+	var needsLoadPreload = 'ActiveXObject' in window && hasNative;
 	var getProps = {
 		paused: true,
 		ended: false,
@@ -437,12 +438,7 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 		data.readyState = readyState;
 	};
 	
-	$.extend($.event.customEvent, {
-		updatemediaelementdimensions: true,
-		flashblocker: true,
-		swfstageresize: true,
-		mediaelementapichange: true
-	});
+	
 	
 	mediaelement.jarisEvent = {};
 	var localConnectionTimer;
@@ -691,8 +687,13 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 			var isNativeHTML5 = ( event.originalEvent && event.originalEvent.type === event.type );
 			if( isNativeHTML5 == (data.activating == 'third') ){
 				event.stopImmediatePropagation();
-				if(stopEvents[event.type] && data.isActive != data.activating){
-					$(event.target).pause();
+				
+				if(stopEvents[event.type]){
+					if(data.isActive != data.activating){
+						$(event.target).pause();
+					} else if(isNativeHTML5){
+						($.prop(event.target, 'pause')._supvalue || $.noop).apply(event.target);
+					}
 				}
 			}
 		};
@@ -756,15 +757,18 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 	})();
 	
 	var setElementDimension = function(data, hasControls){
+		var cAttr;
 		var elem = data._elem;
 		var box = data.shadowElem;
+		
 		$(elem)[hasControls ? 'addClass' : 'removeClass']('webshims-controls');
 		if(data._elemNodeName == 'audio' && !hasControls){
 			box.css({width: 0, height: 0});
 		} else {
+			
 			box.css({
-				width: elem.style.width || $(elem).width(),
-				height: elem.style.height || $(elem).height()
+				width: elem.style.width || ((cAttr = $(elem).attr('width')) && cAttr+'px') || $(elem).width(),
+				height: elem.style.height|| ((cAttr = $(elem).attr('height')) && cAttr+'px') || $(elem).height()
 			});
 		}
 	};
@@ -793,7 +797,7 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 	replaceVar = function(val){
 		return (val.replace) ? val.replace(regs.A, '%26').replace(regs.a, '%26').replace(regs.e, '%3D').replace(regs.q, '%3F') : val;
 	};
-	
+
 	mediaelement.createSWF = function( elem, canPlaySrc, data ){
 		if(!hasFlash){
 			setTimeout(function(){
@@ -801,7 +805,7 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 			}, 1);
 			return;
 		}
-		
+
 		if(loadedSwf < 1){
 			loadedSwf = 1;
 		} else {
@@ -812,7 +816,7 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 		}
 		
 		if($.attr(elem, 'height') || $.attr(elem, 'width')){
-			webshims.warn("width or height content attributes used. Webshims only uses CSS (computed styles or inline styles) to detect size of a video/audio");
+			webshims.warn("width or height content attributes used. Webshims prefers the usage of CSS (computed styles or inline styles) to detect size of a video/audio. It's really more powerfull.");
 		}
 		
 		var isRtmp = canPlaySrc.type == 'audio/rtmp' || canPlaySrc.type == 'video/rtmp';
@@ -909,6 +913,7 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 					}
 				}
 			}));
+			
 			setElementDimension(data, hasControls);
 		
 			box.insertBefore(elem);
@@ -918,16 +923,31 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 			}
 			
 			webshims.addShadowDom(elem, box);
+			if(!webshims.data(elem, 'mediaelement')){
+				webshims.data(elem, 'mediaelement', data);
+			}
 			addMediaToStopEvents(elem);
+			
 			mediaelement.setActive(elem, 'third', data);
+			
 			$(elem)
 				.on({'updatemediaelementdimensions': setDimension})
 				.onWSOff('updateshadowdom', setDimension)
+				.on('remove', function(e){
+					if(!e.originalEvent && mediaelement.jarisEvent[data.id] && mediaelement.jarisEvent[data.id].elem == elem){
+						delete mediaelement.jarisEvent[data.id];
+						clearTimeout(localConnectionTimer);
+						clearTimeout(data.flashBlock);
+					}
+					box.remove();
+				})
 			;
 		}
 		
-		if(!mediaelement.jarisEvent[data.id]){
+		
+		if(!mediaelement.jarisEvent[data.id] || mediaelement.jarisEvent[data.id].elem != elem){
 			mediaelement.jarisEvent[data.id] = function(jaris){
+				
 				if(jaris.type == 'ready'){
 					var onReady = function(){
 						if(data.api){
@@ -960,8 +980,8 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 					}
 					data.duration = jaris.duration;
 				}
-				
 			};
+			mediaelement.jarisEvent[data.id].elem = elem;
 		}
 		
 		$.extend(vars, 
@@ -987,27 +1007,27 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 		clearTimeout(data.flashBlock);
 		
 		swfmini.embedSWF(playerSwfPath, elemId, "100%", "100%", "9.0.115", false, vars, params, attrs, function(swfData){
-			
 			if(swfData.success){
-				
-				data.api = swfData.ref;
-				
-				if(!hasControls){
-					$(swfData.ref).attr('tabindex', '-1').css('outline', 'none');
-				}
-				
-				data.flashBlock = setTimeout(function(){
+				var fBlocker = function(){
 					if((!swfData.ref.parentNode && box[0].parentNode) || swfData.ref.style.display == "none"){
 						box.addClass('flashblocker-assumed');
 						$(elem).trigger('flashblocker');
 						webshims.warn("flashblocker assumed");
 					}
 					$(swfData.ref).css({'minHeight': '2px', 'minWidth': '2px', display: 'block'});
-				}, 9);
+				};
+				data.api = swfData.ref;
+				
+				if(!hasControls){
+					$(swfData.ref).attr('tabindex', '-1').css('outline', 'none');
+				}
+				
+				data.flashBlock = setTimeout(fBlocker, 99);
 				
 				if(!localConnectionTimer){
 					clearTimeout(localConnectionTimer);
 					localConnectionTimer = setTimeout(function(){
+						fBlocker();
 						var flash = $(swfData.ref);
 						if(flash[0].offsetWidth > 1 && flash[0].offsetHeight > 1 && location.protocol.indexOf('file:') === 0){
 							webshims.error("Add your local development-directory to the local-trusted security sandbox:  http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html");
@@ -1161,12 +1181,23 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 			}
 		});
 		
+		
 		webshims.onNodeNamesPropertyModify(nodeName, 'preload', function(val){
-			var data = getSwfDataFromElem(this);
+			var data, baseData, elem;
 			
 			
-			if(data && bufferSrc(this)){
-				queueSwfMethod(this, 'api_preload', [], data);
+			if(bufferSrc(this)){
+				data = getSwfDataFromElem(this);
+				if(data){
+					queueSwfMethod(this, 'api_preload', [], data);
+				} else if(needsLoadPreload && this.paused && !this.error && !$.data(this, 'mediaerror') && !this.readyState && !this.networkState && !this.autoplay && $(this).is(':not(.nonnative-api-active)')){
+					elem = this;
+					baseData = webshims.data(elem, 'mediaelementBase') || webshims.data(elem, 'mediaelementBase', {});
+					clearTimeout(baseData.loadTimer);
+					baseData.loadTimer = setTimeout(function(){
+						$(elem).mediaLoad();
+					}, 9);
+				}
 			}
 		});
 		

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

@@ -530,52 +530,55 @@ var swfmini = function() {
 			});
 			webshims.loader.loadList(['mediaelement-native-fix']);
 		}
-	}
-	
-	if(hasNative && !options.preferFlash){
-		var noSwitch = {
-			1: 1,
-			2: 1
-		};
-		var switchOptions = function(e){
-			var media;
-			var parent;
-			if(!options.preferFlash && 
+		
+		if(!options.preferFlash){
+			var noSwitch = {
+				1: 1,
+				2: 1
+			};
+			var switchOptions = function(e){
+				var media, error, parent;
+				if(!options.preferFlash && 
 				($(e.target).is('audio, video') || ((parent = e.target.parentNode) && $('source:last', parent)[0] == e.target)) && 
-				(media = $(e.target).closest('audio, video')) && !noSwitch[media.prop('error')]
+				(media = $(e.target).closest('audio, video')) && !noSwitch[(error = media.prop('error'))]
 				){
-				$(function(){
-					if(hasSwf && !options.preferFlash){
-						loadSwf();
-						webshims.ready('WINDOWLOAD '+swfType, function(){
-							setTimeout(function(){
-								if(!options.preferFlash && webshims.mediaelement.createSWF && !media.is('.nonnative-api-active')){
-									options.preferFlash = true;
-									document.removeEventListener('error', switchOptions, true);
-									$('audio, video').each(function(){
-										webshims.mediaelement.selectSource(this);
-									});
-									webshims.error("switching mediaelements option to 'preferFlash', due to an error with native player: "+e.target.src+" Mediaerror: "+ media.prop('error'));
-								}
-							}, 9);
-						});
-					} else{
-						document.removeEventListener('error', switchOptions, true);
+					if(error == null){
+						webshims.warn("There was an unspecified error on a mediaelement");
+						return;
+						
 					}
-				});
-			}
-		};
-		document.addEventListener('error', switchOptions, true);
-		$('audio, video').each(function(){
-			var error = $.prop(this, 'error');
-			if(error && !noSwitch[error]){
-				switchOptions({target: this});
-				return false;
-			}
-		});
+					$(function(){
+						if(hasSwf && !options.preferFlash){
+							loadSwf();
+							webshims.ready('WINDOWLOAD '+swfType, function(){
+								setTimeout(function(){
+									if(!options.preferFlash && webshims.mediaelement.createSWF && !media.is('.nonnative-api-active')){
+										options.preferFlash = true;
+										document.removeEventListener('error', switchOptions, true);
+										$('audio, video').each(function(){
+											webshims.mediaelement.selectSource(this);
+										});
+										webshims.error("switching mediaelements option to 'preferFlash', due to an error with native player: "+e.target.src+" Mediaerror: "+ media.prop('error'));
+									}
+								}, 9);
+							});
+						} else{
+							document.removeEventListener('error', switchOptions, true);
+						}
+					});
+				}
+			};
+			document.addEventListener('error', switchOptions, true);
+			$('audio, video').each(function(){
+				var error = $.prop(this, 'error');
+				if(error && !noSwitch[error]){
+					switchOptions({target: this});
+					return false;
+				}
+			});
+		}
 	}
 	
-	
 	if(Modernizr.track && !bugs.track){
 		(function(){
 			
@@ -956,63 +959,14 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 		
 	});
 	
-	webshims.ready('dom-support', function(){
-		if(!supportsLoop){
-			webshims.defineNodeNamesBooleanProperty(['audio', 'video'], 'loop');
-		}
-		
-		['audio', 'video'].forEach(function(nodeName){
-			var supLoad = webshims.defineNodeNameProperty(nodeName, 'load',  {
-				prop: {
-					value: function(){
-						var data = webshims.data(this, 'mediaelement');
-						selectSource(this, data);
-						if(hasNative && (!data || data.isActive == 'html5') && supLoad.prop._supvalue){
-							supLoad.prop._supvalue.apply(this, arguments);
-						}
-					}
-				}
-			});
-			nativeCanPlayType[nodeName] = webshims.defineNodeNameProperty(nodeName, 'canPlayType',  {
-				prop: {
-					value: function(type){
-						var ret = '';
-						if(hasNative && nativeCanPlayType[nodeName].prop._supvalue){
-							ret = nativeCanPlayType[nodeName].prop._supvalue.call(this, type);
-							if(ret == 'no'){
-								ret = '';
-							}
-						}
-						if(!ret && hasSwf){
-							type = $.trim((type || '').split(';')[0]);
-							if(mediaelement.swfMimeTypes.indexOf(type) != -1){
-								ret = 'maybe';
-							}
-						}
-						return ret;
-					}
-				}
-			});
-		});
-		webshims.onNodeNamesPropertyModify(['audio', 'video'], ['src', 'poster'], {
-			set: function(){
-				var elem = this;
-				var baseData = webshims.data(elem, 'mediaelementBase') || webshims.data(elem, 'mediaelementBase', {});
-				clearTimeout(baseData.loadTimer);
-				baseData.loadTimer = setTimeout(function(){
-					selectSource(elem);
-					elem = null;
-				}, 9);
-			}
-		});
-	});
-		
+	var handleMedia = false;	
 	var initMediaElements = function(){
 		var testFixMedia = function(){
 			if(webshims.implement(this, 'mediaelement')){
 				selectSource(this);
 				
-				if(hasNative){
+				//fixes for FF 12 and IE9/10 || does not hurt, if run in other browsers
+				if(hasNative && (!supportsLoop || ('ActiveXObject' in window))){
 					var bufferTimer;
 					var lastBuffered;
 					var elem = this;
@@ -1041,7 +995,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 									lastBuffered = getBufferedString();
 								}
 								clearTimeout(bufferTimer);
-								bufferTimer = setTimeout(testBuffer, 999);
+								bufferTimer = setTimeout(testBuffer, 400);
 							},
 							'emptied stalled mediaerror abort suspend': function(e){
 								if(e.type == 'emptied'){
@@ -1058,11 +1012,62 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 			}
 			
 		};
-		var handleMedia = false;
+		
 		
 		
 		webshims.ready('dom-support', function(){
 			handleMedia = true;
+			
+			if(!supportsLoop){
+				webshims.defineNodeNamesBooleanProperty(['audio', 'video'], 'loop');
+			}
+			
+			['audio', 'video'].forEach(function(nodeName){
+				var supLoad = webshims.defineNodeNameProperty(nodeName, 'load',  {
+					prop: {
+						value: function(){
+							var data = webshims.data(this, 'mediaelement');
+							selectSource(this, data);
+							if(hasNative && (!data || data.isActive == 'html5') && supLoad.prop._supvalue){
+								supLoad.prop._supvalue.apply(this, arguments);
+							}
+						}
+					}
+				});
+				nativeCanPlayType[nodeName] = webshims.defineNodeNameProperty(nodeName, 'canPlayType',  {
+					prop: {
+						value: function(type){
+							var ret = '';
+							if(hasNative && nativeCanPlayType[nodeName].prop._supvalue){
+								ret = nativeCanPlayType[nodeName].prop._supvalue.call(this, type);
+								if(ret == 'no'){
+									ret = '';
+								}
+							}
+							if(!ret && hasSwf){
+								type = $.trim((type || '').split(';')[0]);
+								if(mediaelement.swfMimeTypes.indexOf(type) != -1){
+									ret = 'maybe';
+								}
+							}
+							return ret;
+						}
+					}
+				});
+			});
+			webshims.onNodeNamesPropertyModify(['audio', 'video'], ['src', 'poster'], {
+				set: function(){
+					var elem = this;
+					var baseData = webshims.data(elem, 'mediaelementBase') || webshims.data(elem, 'mediaelementBase', {});
+					clearTimeout(baseData.loadTimer);
+					baseData.loadTimer = setTimeout(function(){
+						selectSource(elem);
+						elem = null;
+					}, 9);
+				}
+			});
+			
+			
 			webshims.addReady(function(context, insertedElement){
 				var media = $('video, audio', context)
 					.add(insertedElement.filter('video, audio'))

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

@@ -244,7 +244,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				clearTimeout(that.timers.repos);
 				that.timers.repos = setTimeout(function(){
 					that.position(visual);
-				}, 900);
+				}, 400);
 			});
 		},
 		prepareFor: function(element, visual){
@@ -455,7 +455,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				errorBox = this.create(elem, fieldWrapper);
 			} else if(typeof errorBox == 'string'){
 				errorBox = $('#'+errorBox);
-				$.data(elem, 'errorbox', errorBox);
+				fieldWrapper.data('errorbox', errorBox);
 			}
 			return errorBox;
 		},