webshims-rails 0.4.6 → 0.4.7

data/vendor/assets/javascripts/webshims/shims/form-shim-extend.js

@@ -351,7 +351,7 @@ webshims.defineNodeNamesBooleanProperty(['input', 'textarea', 'select'], 'requir
 	set: function(value){
 		$(this).getShadowFocusElement().attr('aria-required', !!(value)+'');
 	},
-	initAttr: (!$.browser.msie || webshims.browserVersion > 7)//only if we have aria-support
+	initAttr: (Modernizr.localstorage)//only if we have aria-support
 });
 
 webshims.reflectProperties(['input'], ['pattern']);
@@ -666,14 +666,13 @@ webshims.defineNodeNameProperty('form', 'noValidate', {
 	}
 });
 
-if($.browser.webkit && Modernizr.inputtypes.date){
+if(Modernizr.inputtypes.date && /webkit/i.test(navigator.userAgent)){
 	(function(){
 		
 		var noInputTriggerEvts = {updateInput: 1, input: 1},
 			fixInputTypes = {
 				date: 1,
-				time: 1,
-				"datetime-local": 1
+				time: 1
 			},
 			noFocusEvents = {
 				focusout: 1,
@@ -1097,8 +1096,7 @@ try {
 
 (function(){
 	Modernizr.textareaPlaceholder = !!('placeholder' in $('<textarea />')[0]);
-	var bustedTextarea = $.browser.webkit && Modernizr.textareaPlaceholder && webshims.browserVersion < 535;
-	if(Modernizr.input.placeholder && Modernizr.textareaPlaceholder && !bustedTextarea){return;}
+	if(Modernizr.input.placeholder && Modernizr.textareaPlaceholder){return;}
 	
 	var isOver = (webshims.cfg.forms.placeholderType == 'over');
 	var isResponsive = (webshims.cfg.forms.responsivePlaceholder);
@@ -1300,8 +1298,8 @@ try {
 							data.text.css('padding'+ side, size);
 						});
 						
-						$(elem)
-							.on('updateshadowdom', function(){
+						$(document)
+							.onTrigger('updateshadowdom', function(){
 								var height, width; 
 								if((width = elem.offsetWidth) || (height = elem.offsetHeight)){
 									data.text
@@ -1313,7 +1311,6 @@ try {
 									;
 								}
 							})
-							.triggerHandler('updateshadowdom')
 						;
 						
 					} else {
@@ -1369,17 +1366,11 @@ try {
 			attr: {
 				set: function(val){
 					var elem = this;
-					if(bustedTextarea){
-						webshims.data(elem, 'textareaPlaceholder', val);
-						elem.placeholder = '';
-					} else {
-						webshims.contentAttr(elem, 'placeholder', val);
-					}
+					webshims.contentAttr(elem, 'placeholder', val);
 					pHolder.update(elem, val);
 				},
 				get: function(){
-					var ret = (bustedTextarea) ? webshims.data(this, 'textareaPlaceholder') : '';
-					return ret || webshims.contentAttr(this, 'placeholder');
+					return webshims.contentAttr(this, 'placeholder');
 				}
 			},
 			reflect: true,
@@ -1395,13 +1386,9 @@ try {
 			placeholderValueDesc[propType] = {
 				set: function(val){
 					var elem = this;
-					var placeholder;
-					if(bustedTextarea){
-						placeholder = webshims.data(elem, 'textareaPlaceholder');
-					} 
-					if(!placeholder){
-						placeholder = webshims.contentAttr(elem, 'placeholder');
-					}
+					var placeholder = webshims.contentAttr(elem, 'placeholder');
+					 
+					
 					$.removeData(elem, 'cachedValidity');
 					var ret = desc[propType]._supset.call(elem, val);
 					if(placeholder && 'value' in elem){

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

@@ -7,7 +7,7 @@
 		},
 		id = 0
 	;
-	var geoOpts = $.webshims.cfg.geolocation.options || {};
+	var geoOpts = $.webshims.cfg.geolocation || {};
 	navigator.geolocation = (function(){
 		var pos;
 		var api = {

data/vendor/assets/javascripts/webshims/shims/json-storage.js

@@ -284,7 +284,7 @@ if (!('sessionStorage' in window)) {window.sessionStorage = new Storage('session
 		if(runStart || (('localStorage' in window) && document.getElementById('swflocalstorageshim')) ){return;}
 		runStart = true;
 		if(window.swfobject && swfobject.hasFlashPlayerVersion('8.0.0')){
-			$('body')[$.browser.mozilla ? 'after' : 'append']('<div id="swflocalstorageshim-wrapper"><div id="swflocalstorageshim" /></div>');
+			$('body').append('<div id="swflocalstorageshim-wrapper"><div id="swflocalstorageshim" /></div>');
 			swfobject.embedSWF($.webshims.cfg.basePath +'swf/localStorage.swf' +($.webshims.cfg.addCacheBuster || ''), 'swflocalstorageshim', '295', '198', '8.0.0', '', {allowscriptaccess: 'always'}, {name: 'swflocalstorageshim'}, function(e){
 				if(!e.success && !window.localStorage){
 					localStorageSwfCallback();

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

@@ -50,7 +50,9 @@
 							if(hasSwf && !options.preferFlash && webshims.mediaelement.createSWF && !$(e.target).closest('audio, video').is('.nonnative-api-active')){
 								options.preferFlash = true;
 								document.removeEventListener('error', switchOptions, true);
-								$('audio, video').mediaLoad();
+								$('audio, video').each(function(){
+									webshims.mediaelement.selectSource(this);
+								});
 								webshims.info("switching mediaelements option to 'preferFlash', due to an error with native player: "+e.target.src);
 							} else if(!hasSwf){
 								document.removeEventListener('error', switchOptions, true);
@@ -454,7 +456,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 		data = data || webshims.data(elem, 'mediaelement');
 		stepSources(elem, data, options.preferFlash || undefined, _srces);
 	};
-	
+	mediaelement.selectSource = selectSource;
 	
 	$(document).on('ended', function(e){
 		var data = webshims.data(e.target, 'mediaelement');
@@ -520,52 +522,57 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 			var media = $('video, audio', context)
 				.add(insertedElement.filter('video, audio'))
 				.each(function(){
-					if($.browser.msie && webshims.browserVersion > 8 && $.prop(this, 'paused') && !$.prop(this, 'readyState') && $(this).is('audio[preload="none"][controls]:not([autoplay])')){
+					var data = webshims.data(this, 'mediaelement');
+					
+					if(hasNative && $.prop(this, 'paused') && !$.prop(this, 'readyState') && $(this).is('audio[preload="none"][controls]:not([autoplay])') && (!data || data.isActive == 'html5')){
+						//IE controls not visible bug
 						$(this).prop('preload', 'metadata').mediaLoad();
 					} else {
-						selectSource(this);
+						selectSource(this, data);
 					}
 					
-					
-					
 					if(hasNative){
-						var bufferTimer;
-						var lastBuffered;
-						var elem = this;
-						var getBufferedString = function(){
-							var buffered = $.prop(elem, 'buffered');
-							if(!buffered){return;}
-							var bufferString = "";
-							for(var i = 0, len = buffered.length; i < len;i++){
-								bufferString += buffered.end(i);
-							}
-							return bufferString;
-						};
-						var testBuffer = function(){
-							var buffered = getBufferedString();
-							if(buffered != lastBuffered){
-								lastBuffered = buffered;
-								$(elem).triggerHandler('progress');
-							}
-						};
 						
-						$(this)
-							.on({
-								'play loadstart progress': function(e){
-									if(e.type == 'progress'){
-										lastBuffered = getBufferedString();
-									}
-									clearTimeout(bufferTimer);
-									bufferTimer = setTimeout(testBuffer, 999);
-								},
-								'emptied stalled mediaerror abort suspend': function(e){
-									if(e.type == 'emptied'){
-										lastBuffered = false;
-									}
-									clearTimeout(bufferTimer);
+						//FF progress bug
+						(function(){
+							var bufferTimer;
+							var lastBuffered;
+							var elem = this;
+							var getBufferedString = function(){
+								var buffered = $.prop(elem, 'buffered');
+								if(!buffered){return;}
+								var bufferString = "";
+								for(var i = 0, len = buffered.length; i < len;i++){
+									bufferString += buffered.end(i);
 								}
-							})
-						;
+								return bufferString;
+							};
+							var testBuffer = function(){
+								var buffered = getBufferedString();
+								if(buffered != lastBuffered){
+									lastBuffered = buffered;
+									$(elem).triggerHandler('progress');
+								}
+							};
+							
+							$(this)
+								.on({
+									'play loadstart progress': function(e){
+										if(e.type == 'progress'){
+											lastBuffered = getBufferedString();
+										}
+										clearTimeout(bufferTimer);
+										bufferTimer = setTimeout(testBuffer, 999);
+									},
+									'emptied stalled mediaerror abort suspend': function(e){
+										if(e.type == 'emptied'){
+											lastBuffered = false;
+										}
+										clearTimeout(bufferTimer);
+									}
+								})
+							;
+						})();
 					}
 					
 				})

data/vendor/assets/javascripts/webshims/shims/mediaelement-jaris.js

@@ -366,6 +366,11 @@ jQuery.webshims.register('mediaelement-jaris', function($, webshims, window, doc
 		var hidevents = hideEvtArray.map(function(evt){
 			return evt +'.webshimspolyfill';
 		}).join(' ');
+		var opposite = {
+			'html5': 'third',
+			'third': 'html5'
+		};
+		
 		
 		var hidePlayerEvents = function(event){
 			var data = webshims.data(event.target, 'mediaelement');
@@ -373,8 +378,14 @@ jQuery.webshims.register('mediaelement-jaris', function($, webshims, window, doc
 			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 {
+						data.isActive = opposite[data.isActive];
+						$(event.target).pause();
+						data.isActive = opposite[data.isActive];
+					}
 				}
 			}
 		};
@@ -508,6 +519,10 @@ jQuery.webshims.register('mediaelement-jaris', function($, webshims, window, doc
 			box = data.shadowElem;
 			resetSwfProps(data);
 		} else {
+			var setDimensions = function(){
+				setElementDimension(data, $.prop(elem, 'controls'));
+			};
+			
 			box = $('<div class="polyfill-'+ (elemNodeName) +' polyfill-mediaelement" id="wrapper-'+ elemId +'"><div id="'+ elemId +'"></div>')
 				.css({
 					position: 'relative',
@@ -567,9 +582,8 @@ jQuery.webshims.register('mediaelement-jaris', function($, webshims, window, doc
 			webshims.addShadowDom(elem, box);
 			addMediaToStopEvents(elem);
 			mediaelement.setActive(elem, 'third', data);
-			$(elem).on('updatemediaelementdimensions updateshadowdom', function(){
-				setElementDimension(data, $.prop(elem, 'controls'));
-			});
+			$(document).on('updateshadowdom', setDimensions);
+			$(elem).on('updatemediaelementdimensions', setDimensions);
 		}
 		
 		if(!mediaelement.jarisEvent[data.id]){
@@ -805,9 +819,8 @@ jQuery.webshims.register('mediaelement-jaris', function($, webshims, window, doc
 		mediaSup = webshims.defineNodeNameProperties(nodeName, descs, 'prop');
 	});
 	
-	if(hasFlash){
+	if(hasFlash && $.cleanData){
 		var oldClean = $.cleanData;
-		var gcBrowser = $.browser.msie && webshims.browserVersion < 9;
 		var flashNames = {
 			object: 1,
 			OBJECT: 1
@@ -824,15 +837,13 @@ jQuery.webshims.register('mediaelement-jaris', function($, webshims, window, doc
 								elems[i].api_pause();
 							} catch(er){}
 						}
-						if(gcBrowser){
-							try {
-								for (prop in elems[i]) {
-									if (typeof elems[i][prop] == "function") {
-										elems[i][prop] = null;
-									}
+						try {
+							for (prop in elems[i]) {
+								if (typeof elems[i][prop] == "function") {
+									elems[i][prop] = null;
 								}
-							} catch(er){}
-						}
+							}
+						} catch(er){}
 					}
 				}
 				

data/vendor/assets/javascripts/webshims/shims/mediaelement-swf.js

@@ -455,19 +455,29 @@ jQuery.webshims.register('mediaelement-swf', function($, webshims, window, docum
 		var hidevents = hideEvtArray.map(function(evt){
 			return evt +'.webshimspolyfill';
 		}).join(' ');
-		
+		var opposite = {
+			'html5': 'third',
+			'third': 'html5'
+		};
 		var hidePlayerEvents = function(event){
 			var data = webshims.data(event.target, 'mediaelement');
 			if(!data){return;}
 			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 {
+						data.isActive = opposite[data.isActive];
+						$(event.target).pause();
+						data.isActive = opposite[data.isActive];
+					}
 				}
 			}
 		};
 		
+		
 		addMediaToStopEvents = function(elem){
 			$(elem)
 				.off(hidevents)
@@ -599,6 +609,10 @@ jQuery.webshims.register('mediaelement-swf', function($, webshims, window, docum
 				overflow: 'hidden'
 			})
 		;
+		var setDimensions = function(){
+			setElementDimension(data, $.prop(elem, 'controls'));
+		};
+			
 		data = webshims.data(elem, 'mediaelement', webshims.objectCreate(playerStateObj, {
 			actionQueue: {
 				value: []
@@ -671,9 +685,9 @@ jQuery.webshims.register('mediaelement-swf', function($, webshims, window, docum
 		
 		options.changeSWF(vars, elem, canPlaySrc, data, 'embed');
 		
-		$(elem).on('updatemediaelementdimensions updateshadowdom', function(){
-			setElementDimension(data, $.prop(elem, 'controls'));
-		});
+		
+		$(document).on('updateshadowdom', setDimensions);
+		$(elem).on('updatemediaelementdimensions', setDimensions);
 		
 		
 		swfobject.embedSWF(playerSwfPath, elemId, "100%", "100%", "9.0.0", false, vars, params, attrs, function(swfData){
@@ -876,9 +890,8 @@ jQuery.webshims.register('mediaelement-swf', function($, webshims, window, docum
 		mediaSup = webshims.defineNodeNameProperties(nodeName, descs, 'prop');
 	});
 	
-	if(hasFlash){
+	if(hasFlash && $.cleanData){
 		var oldClean = $.cleanData;
-		var gcBrowser = $.browser.msie && webshims.browserVersion < 9;
 		var flashNames = {
 			object: 1,
 			OBJECT: 1
@@ -895,15 +908,13 @@ jQuery.webshims.register('mediaelement-swf', function($, webshims, window, docum
 								elems[i][SENDEVENT]('play', false);
 							} catch(er){}
 						}
-						if(gcBrowser){
-							try {
-								for (prop in elems[i]) {
-									if (typeof elems[i][prop] == "function") {
-										elems[i][prop] = null;
-									}
+						try {
+							for (prop in elems[i]) {
+								if (typeof elems[i][prop] == "function") {
+									elems[i][prop] = null;
 								}
-							} catch(er){}
-						}
+							}
+						} catch(er){}
 					}
 				}
 				

data/vendor/assets/javascripts/webshims/shims/mediaelement-yt.js

@@ -158,6 +158,10 @@ var addMediaToStopEvents = $.noop;
 	var hidevents = hideEvtArray.map(function(evt){
 		return evt +'.webshimspolyfill';
 	}).join(' ');
+	var opposite = {
+		'html5': 'third',
+		'third': 'html5'
+	};
 	
 	var hidePlayerEvents = function(event){
 		var data = webshims.data(event.target, 'mediaelement');
@@ -165,8 +169,14 @@ var addMediaToStopEvents = $.noop;
 		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 {
+					data.isActive = opposite[data.isActive];
+					$(event.target).pause();
+					data.isActive = opposite[data.isActive];
+				}
 			}
 		}
 	};
@@ -396,7 +406,10 @@ mediaelement.createSWF = function(mediaElem, src, data){
 			overflow: 'hidden'
 		})
 	;
-	
+	var setDimensions = function(){
+		setElementDimension(data);
+	};
+			
 	
 	
 	data = webshims.data(mediaElem, 'mediaelement', webshims.objectCreate(playerStateObj, {
@@ -440,9 +453,8 @@ mediaelement.createSWF = function(mediaElem, src, data){
 	addMediaToStopEvents(mediaElem);
 	
 	addYtAPI(mediaElem, elemId, data, ytID);
-	$(mediaElem).on('updatemediaelementdimensions updateshadowdom', function(){
-		setElementDimension(data);
-	});
+	$(document).on('updateshadowdom', setDimensions);
+	$(mediaElem).on('updatemediaelementdimensions', setDimensions);
 };
 
 (function(){