webshims-rails 1.11.2 → 1.11.3

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

@@ -3,6 +3,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	"use strict";
 	var supportHrefNormalized = !('hrefNormalized' in $.support) || $.support.hrefNormalized;
 	var supportGetSetAttribute = !('getSetAttribute' in $.support) || $.support.getSetAttribute;
+	var has = Object.prototype.hasOwnProperty;
 	webshims.assumeARIA = supportGetSetAttribute || Modernizr.canvas || Modernizr.video || Modernizr.boxsizing;
 	
 	if($('<input type="email" />').attr('type') == 'text' || $('<form />').attr('novalidate') === "" || ('required' in $('<input />')[0].attributes)){
@@ -75,6 +76,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	//proxying attribute
 	var olds = {};
 	var havePolyfill = {};
+	var hasPolyfillMethod = {};
 	var extendedProps = {};
 	var extendQ = {};
 	var modifyProps = {};
@@ -180,6 +182,39 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		};
 	});
 	
+	//add support for $('video').trigger('play') in case extendNative is set to false
+	if(!webshims.cfg.extendNative && !webshims.cfg.noTriggerOverride){
+		(function(oldTrigger){
+			$.event.trigger = function(event, data, elem, onlyHandlers){
+				
+				if(!hasPolyfillMethod[event] || onlyHandlers || !elem || elem.nodeType !== 1){
+					return oldTrigger.apply(this, arguments);
+				}
+				var ret, isOrig, origName;
+				var origFn = elem[event];
+				var polyfilledFn = $.prop(elem, event);
+				var changeFn = polyfilledFn && origFn != polyfilledFn;
+				if(changeFn){
+					origName = '__ws'+event;
+					isOrig = (event in elem) && has.call(elem, event);
+					elem[event] = polyfilledFn;
+					elem[origName] = origFn;
+				}
+				
+				ret = oldTrigger.apply(this, arguments);
+				if (changeFn) {
+					if(isOrig){
+						elem[event] = origFn;
+					} else {
+						delete elem[event];
+					}
+					delete elem[origName];
+				}
+				
+				return ret;
+			};
+		})($.event.trigger);
+	}
 	
 	['removeAttr', 'prop', 'attr'].forEach(function(type){
 		olds[type] = $[type];
@@ -264,6 +299,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			}
 			var oldDesc = extendedProps[nodeName][prop][type];
 			var getSup = function(propType, descriptor, oDesc){
+				var origProp;
 				if(descriptor && descriptor[propType]){
 					return descriptor[propType];
 				}
@@ -280,8 +316,10 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					};
 				}
 				if(type == 'prop' && propType == 'value' && desc.value.apply){
+					origProp = '__ws'+prop;
+					hasPolyfillMethod[prop] = true;
 					return  function(value){
-						var sup = olds[type](this, prop);
+						var sup = this[origProp] || olds[type](this, prop);
 						if(sup && sup.apply){
 							sup = sup.apply(this, arguments);
 						} 
@@ -319,7 +357,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	
 	var extendNativeValue = (function(){
 		var UNKNOWN = webshims.getPrototypeOf(document.createElement('foobar'));
-		var has = Object.prototype.hasOwnProperty;
+		
 		//see also: https://github.com/lojjic/PIE/issues/40 | https://prototype.lighthouseapp.com/projects/8886/tickets/1107-ie8-fatal-crash-when-prototypejs-is-loaded-with-rounded-cornershtc
 		var isExtendNativeSave = Modernizr.advancedObjectProperties && Modernizr.objectAccessor;
 		return function(nodeName, prop, desc){
@@ -1924,6 +1962,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			if(!langCfg['datetime-local']){
 				langCfg['datetime-local'] = {};
 			}
+			if(!langCfg.time){
+				langCfg.time = {};
+			}
 			if(!langCfg['datetime-local'].currentText && langCfg.time.currentText){
 				langCfg['datetime-local'].currentText = langCfg.time.currentText;
 			}

data/vendor/assets/javascripts/webshims/shims/dom-extend.js

@@ -3,6 +3,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	"use strict";
 	var supportHrefNormalized = !('hrefNormalized' in $.support) || $.support.hrefNormalized;
 	var supportGetSetAttribute = !('getSetAttribute' in $.support) || $.support.getSetAttribute;
+	var has = Object.prototype.hasOwnProperty;
 	webshims.assumeARIA = supportGetSetAttribute || Modernizr.canvas || Modernizr.video || Modernizr.boxsizing;
 	
 	if($('<input type="email" />').attr('type') == 'text' || $('<form />').attr('novalidate') === "" || ('required' in $('<input />')[0].attributes)){
@@ -75,6 +76,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	//proxying attribute
 	var olds = {};
 	var havePolyfill = {};
+	var hasPolyfillMethod = {};
 	var extendedProps = {};
 	var extendQ = {};
 	var modifyProps = {};
@@ -180,6 +182,39 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		};
 	});
 	
+	//add support for $('video').trigger('play') in case extendNative is set to false
+	if(!webshims.cfg.extendNative && !webshims.cfg.noTriggerOverride){
+		(function(oldTrigger){
+			$.event.trigger = function(event, data, elem, onlyHandlers){
+				
+				if(!hasPolyfillMethod[event] || onlyHandlers || !elem || elem.nodeType !== 1){
+					return oldTrigger.apply(this, arguments);
+				}
+				var ret, isOrig, origName;
+				var origFn = elem[event];
+				var polyfilledFn = $.prop(elem, event);
+				var changeFn = polyfilledFn && origFn != polyfilledFn;
+				if(changeFn){
+					origName = '__ws'+event;
+					isOrig = (event in elem) && has.call(elem, event);
+					elem[event] = polyfilledFn;
+					elem[origName] = origFn;
+				}
+				
+				ret = oldTrigger.apply(this, arguments);
+				if (changeFn) {
+					if(isOrig){
+						elem[event] = origFn;
+					} else {
+						delete elem[event];
+					}
+					delete elem[origName];
+				}
+				
+				return ret;
+			};
+		})($.event.trigger);
+	}
 	
 	['removeAttr', 'prop', 'attr'].forEach(function(type){
 		olds[type] = $[type];
@@ -264,6 +299,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			}
 			var oldDesc = extendedProps[nodeName][prop][type];
 			var getSup = function(propType, descriptor, oDesc){
+				var origProp;
 				if(descriptor && descriptor[propType]){
 					return descriptor[propType];
 				}
@@ -280,8 +316,10 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					};
 				}
 				if(type == 'prop' && propType == 'value' && desc.value.apply){
+					origProp = '__ws'+prop;
+					hasPolyfillMethod[prop] = true;
 					return  function(value){
-						var sup = olds[type](this, prop);
+						var sup = this[origProp] || olds[type](this, prop);
 						if(sup && sup.apply){
 							sup = sup.apply(this, arguments);
 						} 
@@ -319,7 +357,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	
 	var extendNativeValue = (function(){
 		var UNKNOWN = webshims.getPrototypeOf(document.createElement('foobar'));
-		var has = Object.prototype.hasOwnProperty;
+		
 		//see also: https://github.com/lojjic/PIE/issues/40 | https://prototype.lighthouseapp.com/projects/8886/tickets/1107-ie8-fatal-crash-when-prototypejs-is-loaded-with-rounded-cornershtc
 		var isExtendNativeSave = Modernizr.advancedObjectProperties && Modernizr.objectAccessor;
 		return function(nodeName, prop, desc){

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

@@ -46,17 +46,21 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 	/*
 	 * Selectors for all browsers
 	 */
+	var rElementsGroup = /^(?:form|fieldset)$/i;
 	var hasInvalid = function(elem){
 		var ret = false;
 		$(elem).jProp('elements').each(function(){
-			ret = $(this).is(':invalid');
-			if(ret){
-				return false;
+			if(!rElementsGroup.test(elem.nodeName || '')){
+				ret = $(this).is(':invalid');
+				if(ret){
+					return false;
+				}
 			}
+			
 		});
 		return ret;
 	};
-	var rElementsGroup = /^(?:form)$/i;///^(?:form|fieldset)$/i
+	
 	$.extend($.expr[":"], {
 		"valid-element": function(elem){
 			return rElementsGroup.test(elem.nodeName || '') ? !hasInvalid(elem) :!!($.prop(elem, 'willValidate') && isValid(elem));

data/vendor/assets/javascripts/webshims/shims/form-number-date-ui.js

@@ -268,6 +268,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			if(!langCfg['datetime-local']){
 				langCfg['datetime-local'] = {};
 			}
+			if(!langCfg.time){
+				langCfg.time = {};
+			}
 			if(!langCfg['datetime-local'].currentText && langCfg.time.currentText){
 				langCfg['datetime-local'].currentText = langCfg.time.currentText;
 			}

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

@@ -577,6 +577,7 @@ try {
 }
 
 (function(){
+	if(options.noPlaceholderPolyfill){return;}
 	var bustedPlaceholder;
 	Modernizr.textareaPlaceholder = !!('placeholder' in $('<textarea />')[0]);
 	if(Modernizr.input.placeholder && options.overridePlaceholder){
@@ -759,7 +760,6 @@ try {
 				create: function(elem){
 					var data = $.data(elem, 'placeHolder');
 					var form;
-					var responsiveElem;
 					if(data){return data;}
 					data = $.data(elem, 'placeHolder', {});
 					
@@ -779,7 +779,6 @@ try {
 					if(elem.type == 'password' || isOver){
 						data.text = createPlaceholder(elem);
 						if(isResponsive || $(elem).is('.responsive-width') || (elem.currentStyle || {width: ''}).width.indexOf('%') != -1){
-							responsiveElem = true;
 							data.box = data.text;
 						} else {
 							data.box = $(elem)
@@ -1019,7 +1018,6 @@ try {
 					
 					//pro forma
 					,color: 1
-					//,range: 1
 				},
 				observe = function(input){
 					var timer,
@@ -1041,7 +1039,7 @@ try {
 							extraTimer = setTimeout(trigger, 9);
 						},
 						unbind = function(){
-							input.unbind('focusout', unbind).unbind('keyup keypress keydown paste cut', extraTest).unbind('input change updateInput', trigger);
+							input.unbind('focusout', unbind).unbind('keyup keypress keydown paste cut', extraTest).unbind('input change updateInput triggerinput', trigger);
 							clearInterval(timer);
 							setTimeout(function(){
 								trigger();
@@ -1057,7 +1055,7 @@ try {
 					input.on({
 						'keyup keypress keydown paste cut': extraTest,
 						focusout: unbind,
-						'input updateInput change': trigger
+						'input updateInput change triggerinput': trigger
 					});
 				}
 			;

data/vendor/assets/javascripts/webshims/shims/form-validation.js

@@ -770,4 +770,141 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			
 		})();
 	}
+	
+	if(!$.event.special.change && !$.event.special.input && Modernizr.inputtypes && options.fixRangeChange){
+		var rangeChange = {
+			
+			trigger: function(e){
+				if(rangeChange.blockElement){
+					rangeChange.blockElement = false;
+					setTimeout(function(){
+						if(rangeChange.requestedChange && rangeChange.value != rangeChange.requestedChange.value){
+							$(rangeChange.requestedChange).trigger('change');
+						}
+						rangeChange.value = false;
+					}, 9);
+				}
+				
+			},
+			lastValue: false,
+			updateInputValue: function(e){
+				rangeChange.lastValue = e.target.value;
+			},
+			triggerInput: function(e){
+				if(rangeChange.lastValue !== false && rangeChange.lastValue != e.target.value){
+					$(e.target).trigger('input');
+				}
+			},
+			inputTeardown: function(e){
+				$(e.target)
+					.off('input', rangeChange.updateInputValue)
+					.off('blur', rangeChange.inputTeardown)
+				;
+				rangeChange.lastValue = false;
+			},
+			inputSetup: function(e){
+				
+				if(e.target.type == 'range'){
+					rangeChange.inputTeardown(e);
+					rangeChange.lastValue = e.target.value;
+					$(e.target)
+						.on('input', rangeChange.updateInputValue)
+						.on('blur', rangeChange.inputTeardown)
+					;
+				}
+			}
+		};
+		
+		
+		$.each([{name: 'key', evt: 'keyup'}, {name: 'mouse', evt: 'mouseup'}, {name: 'touch', evt: 'touchend'}], function(i, obj){
+			var setup = obj.name + 'Setup';
+			var commit = obj.name + 'Commit';
+			rangeChange[obj.name+'Block'] = function(e){
+				
+				if(!rangeChange.blockElement && e.target.type == 'range'){
+					
+					rangeChange.blockElement = e.target;
+					rangeChange.value = e.target.value;
+					$(rangeChange.blockElement)
+						.off('blur', rangeChange.trigger)
+						.on('blur', rangeChange.trigger)
+					;
+					
+					$(document.body)
+						.off(obj.evt, rangeChange[commit])
+						.on(obj.evt, rangeChange[commit])
+					;
+				}
+			};
+			
+			rangeChange[commit] = function(e){
+				$(document.body).off(obj.evt, rangeChange[commit]);
+				rangeChange.trigger();
+			};
+			
+		});
+		
+		$(document.body || 'html').on({
+			mousedown: rangeChange.mouseBlock,
+			'keydown kepress': function(e){
+				if(e.keyCode < 45 && e.keyCode > 30){
+					rangeChange.keyBlock(e);
+				}
+			},
+			'touchstart': rangeChange.touchBlock,
+			focusin: rangeChange.inputSetup
+		});
+		
+		$.extend(true, $.event.special, {
+			change: {
+				handle: function(e){
+					
+					if(!e.isTrigger && rangeChange.blockElement == e.target){
+						rangeChange.requestedChange = e.target;
+						rangeChange.triggerInput(e);
+						return false;
+					} else if(rangeChange.requestedChange == e.target){
+						rangeChange.requestedChange = false;
+					}
+					e.handleObj.handler.apply(this, arguments);
+				}
+			},
+			input: {
+				handle: (function(){
+					var lastValue, lastElement;
+					
+					var remove = function(){
+						if(lastElement){
+							$(lastElement).off('change', remove);
+						}
+						lastValue = false;
+						lastElement = false;
+					};
+					
+					var setup = function(e){
+						remove(e);
+						lastElement = e.target;
+						lastValue = e.target.value;
+						$(e.target).on('change', remove);
+					};
+					
+					return function(e){
+						var value;
+						if(!e.isTrigger && e.target.type == 'range'){
+							
+							if(lastElement != e.target){
+								setup(e);
+							} else if(lastElement == e.target){
+								if(lastValue == (value = e.target.value)){
+									return false;
+								}
+								lastValue = e.target.value;
+							}
+						}
+						e.handleObj.handler.apply(this, arguments);
+					};
+				})()
+			}
+		});
+	}
 });

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

@@ -136,7 +136,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 			src.server = tmp;
 		}
 		
-		tmp = elem.attr('type');
+		tmp = elem.attr('type') || elem.attr('data-type');
 		if(tmp){
 			src.type = tmp;
 			src.container = $.trim(tmp.split(';')[0]);
@@ -160,6 +160,11 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 				}
 			}
 		}
+		
+		if(!src.container){
+			$(elem).attr('data-wsrecheckmimetype', '');
+		}
+		
 		tmp = elem.attr('media');
 		if(tmp){
 			src.media = tmp;
@@ -393,15 +398,18 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 	
 	var handleThird = (function(){
 		var requested;
+		var readyType = hasSwf ? swfType : 'mediaelement-yt';
 		return function( mediaElem, ret, data ){
+			//readd to ready
 			
-			webshims.ready(hasSwf ? swfType : 'mediaelement-yt', function(){
-				if(mediaelement.createSWF){
+			
+			webshims.ready(readyType, function(){
+				if(mediaelement.createSWF && $(mediaElem).parent()[0]){
 					mediaelement.createSWF( mediaElem, ret, data );
 				} else if(!requested) {
 					requested = true;
 					loadThird();
-					//readd to ready
+					
 					handleThird( mediaElem, ret, data );
 				}
 			});

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

@@ -57,15 +57,6 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 		lastDuration: 0
 	}, getProps, getSetProps);
 	
-	var idRep = /^jarisplayer-/;
-	var getSwfDataFromID = function(id){
-		
-		var elem = document.getElementById(id.replace(idRep, ''));
-		if(!elem){return;}
-		var data = webshims.data(elem, 'mediaelement');
-		return data.isActive == 'third' ? data : null;
-	};
-	
 	
 	var getSwfDataFromElem = function(elem){
 		try {
@@ -658,6 +649,7 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 			box = data.shadowElem;
 			resetSwfProps(data);
 		} else {
+			$(document.getElementById('wrapper-'+ elemId )).remove();
 			box = $('<div class="polyfill-'+ (elemNodeName) +' polyfill-mediaelement" id="wrapper-'+ elemId +'"><div id="'+ elemId +'"></div>')
 				.css({
 					position: 'relative',
@@ -740,8 +732,11 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 			;
 		}
 		
-		
-		if(!mediaelement.jarisEvent[data.id] || mediaelement.jarisEvent[data.id].elem != elem){
+		if(mediaelement.jarisEvent[data.id] && mediaelement.jarisEvent[data.id].elem != elem){
+			webshims.error('something went wrong');
+			return;
+		} else if(!mediaelement.jarisEvent[data.id]){
+			
 			mediaelement.jarisEvent[data.id] = function(jaris){
 				
 				if(jaris.type == 'ready'){
@@ -947,6 +942,7 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 			descs[fn] = {
 				value: function(){
 					var data = getSwfDataFromElem(this);
+					
 					if(data){
 						if(data.stopPlayPause){
 							clearTimeout(data.stopPlayPause);
@@ -969,6 +965,7 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 		
 		webshims.onNodeNamesPropertyModify(nodeName, 'controls', function(val, boolProp){
 			var data = getSwfDataFromElem(this);
+			
 			$(this)[boolProp ? 'addClass' : 'removeClass']('webshims-controls');
 			
 			if(data){
@@ -1102,5 +1099,60 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 	} else if(!('media' in document.createElement('source'))){
 		webshims.reflectProperties('source', ['media']);
 	}
+	if(options.experimentallyMimetypeCheck){
+		(function(){
+			var ADDBACK = $.fn.addBack ? 'addBack' : 'andSelf';
+			var getMimeType = function(){
+				var done;
+				var unknown = 'media/unknown please provide mime type';
+				var media = $(this);
+				var xhrs = [];
+				media
+					.not('.ws-after-check')
+					.find('source')
+					[ADDBACK]()
+					.filter('[data-wsrecheckmimetype]:not([type])')
+					.each(function(){
+						var source = $(this).removeAttr('data-wsrecheckmimetype');
+						var error = function(){
+							source.attr('data-type', unknown);
+						};
+						try {
+							xhrs.push(
+								$.ajax({
+									type: 'head',
+									url: $.attr(this, 'src'),
+									success: function(content, status, xhr){
+										var mime = xhr.getResponseHeader('Content-Type');
+										if(mime){
+											done = true;
+										}
+										source.attr('data-type', mime || unknown);
+									},
+									error: error
+								})
+							)
+							;
+						} catch(er){
+							error();
+						}
+					})
+				;
+				if(xhrs.length){
+					media.addClass('ws-after-check');
+					$.when.apply($, xhrs).always(function(){
+						media.mediaLoad();
+						setTimeout(function(){
+							media.removeClass('ws-after-check');
+						}, 9);
+					});
+				}
+			};
+			$('audio.media-error, video.media-error').each(getMimeType);
+			$(document).on('mediaerror', function(e){
+				getMimeType.call(e.target);
+			});
+		})();
+	}
 	
 });

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: webshims-rails
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.3
 platform: ruby
 authors:
 - David Reese
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 3.1.0
 description: Makes it simple to include the webshims js library (by Alexander Farkas)
@@ -168,12 +168,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []