webshims-rails 1.13.0 → 1.14.1

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

@@ -75,20 +75,27 @@ webshims.register('form-combat', function($,webshims){
 		shadow: 'label',
 		shadowFocus: 'element'
 	});
-	
-	addReplacement('selectmenu', 'mobileSelectmenu', {
+
+	var uiSelect = {
 		shadow: 'button',
-		shadowFocus: function(data, elem){
+		shadowFocus: function(data){
 			return data.options.nativeMenu ? data.element : data.button;
 		},
 		_create: function(elem, shadow, shadowFocus, widgetData){
-			if(('listbox' in widgetData)){
+			var menuName;
+			if(('menu' in widgetData)){
+				menuName = 'menuName';
+			} else if(('listbox' in widgetData)){
+				menuName = 'listbox';
+			}
+			if(menuName){
+
 				var onValidate = function(e){
-					if (!webshims.wsPopover.isInElement([elem, shadow, shadowFocus, $(widgetData.listbox).parent()], e.target)) {
+					if (!webshims.wsPopover.isInElement([elem, shadow, shadowFocus, $(widgetData[menuName]).parent()], e.target)) {
 						$(elem).trigger('updatevalidation.webshims');
 					}
 				};
-				
+
 				$(shadow).on('wsallowinstantvalidation', function(e, data){
 					if(data.type == 'focusout' && data.target != elem && widgetData.isOpen){
 						setTimeout(function(){
@@ -99,7 +106,12 @@ webshims.register('form-combat', function($,webshims){
 				});
 			}
 		}
-	});
+	};
+
+	addReplacement('selectmenu', 'mobileSelectmenu', uiSelect);
+
+	addReplacement('selectmenu', 'uiSelectmenu', uiSelect);
+
 
 	function find(context){
 		$('select:not(.ui-select-nativeonly), input[type="radio"], input[type="checkbox"]', context).each(find.detectReplacement);

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

@@ -142,6 +142,8 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 	addModule('form-validation', $.extend({d: ['form-message']}, formExtras));
 
 	addModule('form-validators', $.extend({}, formExtras));
+
+
 	
 	if($.expr.filters){
 		extendSels();
@@ -262,13 +264,22 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 	};
 
 	$.event.special.valuevalidation = {
+		setup: function(){
+			webshims.error('valuevalidation was renamed to validatevalue!');
+		}
+	};
+
+
+	$.event.special.validatevalue = {
 		setup: function(){
 			var data = $(this).data() || $.data(this, {});
-			if(!('valuevalidation' in data)){
-				data.valuevalidation = true;
+			if(!('validatevalue' in data)){
+				data.validatevalue = true;
 			}
 		}
 	};
+
+
 	
 	$(document).on('focusin.lazyloadvalidation', function(e){
 		if('form' in e.target){
@@ -281,4 +292,24 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 	if(modules['form-number-date-ui'].loaded && !options.customMessages && (modules['form-number-date-api'].test() || (Modernizr.inputtypes.range && Modernizr.inputtypes.color))){
 		webshims.isReady('form-number-date-ui', true);
 	}
+
+	webshims.ready('DOM', function(){
+		if(document.querySelector('.ws-custom-file')){
+			webshims.reTest(['form-validation']);
+		}
+	});
+
+	$(function(){
+		var fileReaderReady = ('FileReader' in window && 'FormData' in window);
+		if(!fileReaderReady){
+			webshims.addReady(function(context){
+				if(!fileReaderReady && !modules.filereader.loaded && !modules.moxie.loaded){
+					if(context.querySelector('input.ws-filereader')){
+						webshims.reTest(['filereader', 'moxie']);
+						fileReaderReady = true;
+					}
+				}
+			});
+		}
+	});
 });

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

@@ -216,7 +216,7 @@ webshims.register('form-message', function($, webshims, window, document, undefi
 		if(message && message.indexOf('{%') != -1){
 			['value', 'min', 'max', 'maxlength', 'minlength', 'label'].forEach(function(attr){
 				if(message.indexOf('{%'+attr) === -1){return;}
-				var val = ((attr == 'label') ? $.trim($('label[for="'+ elem.id +'"]', elem.form).text()).replace(/\*$|:$/, '') : $.prop(elem, attr)) || '';
+				var val = ((attr == 'label') ? $.trim($('label[for="'+ elem.id +'"]', elem.form).text()).replace(/\*$|:$/, '') : $.prop(elem, attr) || $.attr(elem, attr) || '') || '';
 				val = ''+val;
 
 

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

@@ -55,6 +55,8 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			;
 		}
 	};
+	var numericType = Modernizr.inputtypes.tel && navigator.userAgent.indexOf('Mobile') != -1 && !('inputMode' in document.createElement('input') && !('inputmode' in document.createElement('input'))) ?
+		'tel' : 'text';
 	var splitInputs = {
 		date: {
 			_create: function(opts){
@@ -65,18 +67,18 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				if(opts.yearSelect){
 					obj.splits.push($('<select class="yy"></select>')[0]);
 				} else {
-					obj.splits.push($('<input type="text" class="yy" size="4" inputmode="numeric" maxlength="4" />')[0]);
+					obj.splits.push($('<input type="'+ numericType +'" class="yy" size="4" inputmode="numeric" maxlength="4" />')[0]);
 				}
 				
 				if(opts.monthSelect){
 					obj.splits.push($('<select class="mm">'+getMonthOptions(opts)+'</select>')[0]);
 				} else {
-					obj.splits.push($('<input type="text" class="mm" inputmode="numeric" maxlength="2" size="2" />')[0]);
+					obj.splits.push($('<input type="'+ numericType +'" class="mm" inputmode="numeric" maxlength="2" size="2" />')[0]);
 				}
 				if(opts.daySelect){
 					obj.splits.push($(daySelect)[0]);
 				} else {
-					obj.splits.push($('<input type="text" class="dd ws-spin" inputmode="numeric" maxlength="2" size="2" />')[0]);
+					obj.splits.push($('<input type="'+ numericType +'" class="dd ws-spin" inputmode="numeric" maxlength="2" size="2" />')[0]);
 				}
 				
 				obj.elements = [obj.splits[0], $('<span class="ws-input-seperator" />')[0], obj.splits[1], $('<span class="ws-input-seperator" />')[0], obj.splits[2]];
@@ -111,7 +113,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				if(opts.yearSelect){
 					obj.splits.push($('<select class="yy"></select>')[0]);
 				} else {
-					obj.splits.push($('<input type="text" class="yy" size="4" inputmode="numeric" maxlength="4" />')[0]);
+					obj.splits.push($('<input type="'+ numericType +'" class="yy" size="4" inputmode="numeric" maxlength="4" />')[0]);
 				}
 				
 				if(opts.monthSelect){
@@ -119,7 +121,10 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				} else {
 					obj.splits.push($('<input type="text" class="mm ws-spin" />')[0]);
 					if(opts.onlyMonthDigits){
-						$(obj.splits[1]).attr({inputmode: 'numeric', size: 2, maxlength: 2});
+						$().attr({inputmode: 'numeric', size: 2, maxlength: 2});
+						try {
+							obj.splits[1].setAttribute('type', numericType);
+						} catch(e){}
 					}
 				}
 				
@@ -142,7 +147,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			}
 		}
 	};
-	
+
 	var nowDate = new Date(new Date().getTime() - (new Date().getTimezoneOffset() * 60 * 1000 ));
 	var nowYear = nowDate.getFullYear();
 	nowDate = new Date(nowDate.getFullYear(), nowDate.getMonth(), nowDate.getDate(), nowDate.getHours()).getTime();
@@ -962,7 +967,11 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				} else if(!isNaN(this.maxAsNumber) && start > this.maxAsNumber){
 					start = this.maxAsNumber;
 				}
-				this.elemHelper.prop('valueAsNumber', start);
+				try {
+					this.elemHelper.prop('valueAsNumber', start);
+				} catch(e){
+					webshims.warn('valueAsNumber set: '+e);
+				}
 				this.options.defValue = this.elemHelper.prop('value');
 			},
 			reorderInputs: function(){
@@ -986,7 +995,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			_beforeValue: function(val){
 				this.valueAsNumber = this.asNumber(val);
 				this.options.value = val;
-				
+
 				if(isNaN(this.valueAsNumber) || (!isNaN(this.minAsNumber) && this.valueAsNumber < this.minAsNumber) || (!isNaN(this.maxAsNumber) && this.valueAsNumber > this.maxAsNumber)){
 					this._setStartInRange();
 				} else {
@@ -1102,9 +1111,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				touchEnd = function(e){
 					var ret, touch;
 					e = e.originalEvent || {};
-					$(this).off('touchend', touchEnd);
+					$(this).off('touchend touchcancel', touchEnd);
 					var changedTouches = e.changedTouches || e.touches;
-					if(!touchData || !changedTouches || changedTouches.length != 1){
+					if(e.type == 'touchcancel' || !touchData || !changedTouches || changedTouches.length != 1){
 						return;
 					}
 
@@ -1135,7 +1144,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 						y: touch.pageY,
 						now: Date.now()
 					};
-					elemTarget.on('touchend', touchEnd);
+					elemTarget.on('touchend touchcancel', touchEnd);
 				};
 
 				this.each(function(){
@@ -1249,7 +1258,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			cancel: function(val, popover, data){
 				if(!data.options.inlinePicker){
 					popover.stopOpen = true;
-					if(assumeVirtualKeyBoard){
+					if(!popover.openedByFocus && assumeVirtualKeyBoard){
 						$('button', data.buttonWrapper).trigger('focus');
 					} else {
 						data.element.getShadowFocusElement().trigger('focus');
@@ -1349,14 +1358,6 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			var popover = webshims.objectCreate(options.inlinePicker ? webshims.inlinePopover : webshims.wsPopover, {}, $.extend(options.popover || {}, {prepareFor: options.inlinePicker ? data.buttonWrapper : data.element}));
 			var opener = $('<button type="button" class="ws-popover-opener"><span /></button>').appendTo(data.buttonWrapper);
 			
-			if(options.widgetPosition){
-				webshims.error('options.widgetPosition was removed use options.popover.position instead');
-			}
-			
-			if(options.openOnFocus && popover.options && (popover.options.appendTo == 'auto' || popover.options.appendTo == 'element')){
-				webshims.error('openOnFocus and popover.appendTo "auto/element" can prduce a11y problems try to change appendTo to body or similiar or use openOnMouseFocus instead');
-			}
-			
 			var showPickerContent = function(){
 				(picker[data.type].showPickerContent || picker.showPickerContent)(data, popover);
 			};
@@ -1425,9 +1426,28 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 							stopPropagation.apply(this, arguments);
 							popover.preventBlur();
 						},
-						focus: function(){
-							popover.preventBlur();
-						}
+						keydown: function(e){
+							if(e.keyCode == 40 && e.altKey){
+								open();
+							}
+						},
+						'focus mousedown': (function(){
+							var allowClose = true;
+							var reset = function(){
+								allowClose = true;
+							};
+							return function(e){
+								if(e.type  == 'mousedown'){
+									allowClose = false;
+									setTimeout(reset);
+								}
+								if(e.type == 'focus' && allowClose && options.openOnFocus && popover.openedByFocus && (popover.options.appendTo == 'auto' || popover.options.appendTo == 'element')){
+									popover.hide();
+								} else {
+									popover.preventBlur();
+								}
+							};
+						})()
 					})
 				;
 				
@@ -1674,6 +1694,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				}
 
 			};
+			oriStyleO.webkitAppearance = 'none';
 			data.element.onWSOff('updateshadowdom', updateStyles, true);
 		};
 		
@@ -1681,13 +1702,14 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		var implementType = function(){
 			
 			var type = $.prop(this, 'type');
-			
 			var i, opts, data, optsName, labels, cNames, hasInitialFocus;
-			if(inputTypes[type] && webshims.implement(this, 'inputwidgets')){
+
+			if(inputTypes[type] && webshims.implement(this, 'inputwidgets') && (!modernizrInputTypes[type] || !$(this).hasClass('ws-noreplace'))){
 				data = {};
 				optsName = type;
 				hasInitialFocus = $(this).is(':focus');
 				labels = $(this).jProp('labels');
+
 				opts = $.extend(webshims.getOptions(this, type, [options.widgets, options[type], $($.prop(this, 'form')).data(type)]), {
 					orig: this,
 					type: type,
@@ -1720,6 +1742,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 						opts[optsName] = $.attr(this, copyAttrs[i]) || opts[optsName];
 					}
 				}
+
 				if(opts.formatMonthNames){
 					webshims.error('formatMonthNames was renamded to monthNames');
 				}
@@ -1743,11 +1766,11 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					cNames = cNames.replace('form-control', '');
 				}
 				
-				data.shim.element.on('change input', stopPropagation).addClass(cNames);
+				data.shim.element.on('change input', stopPropagation).addClass(cNames+' '+webshims.shadowClass);
 				
 				if(data.shim.buttonWrapper){
 					
-					data.shim.buttonWrapper.addClass('input-button-size-'+(data.shim.buttonWrapper.children().filter(isVisible).length));
+					data.shim.buttonWrapper.addClass('input-button-size-'+(data.shim.buttonWrapper.children().filter(isVisible).length)+' '+webshims.shadowClass);
 					
 					if(data.shim.buttonWrapper.filter(isVisible).length){
 						data.shim.element.addClass('has-input-buttons');

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

@@ -4,17 +4,21 @@ webshims.inputTypes = webshims.inputTypes || {};
 //some helper-functions
 var cfg = webshims.cfg.forms;
 var bugs = webshims.bugs;
-
-var isNumber = function(string){
-		return (typeof string == 'number' || (string && string == string * 1));
-	},
-	typeModels = webshims.inputTypes,
+var splitReg = /\s*,\s*/g;
+var typeModels = webshims.inputTypes,
 	checkTypes = {
 		radio: 1,
 		checkbox: 1
 	},
-	getType = function(elem){
-		return (elem.getAttribute('type') || elem.type || '').toLowerCase();
+	getType = function(){
+		var elem = this;
+		var type = (elem.getAttribute('type') || '').toLowerCase();
+		return (webshims.inputTypes[type]) ? type : elem.type;
+	},
+	cacheType = function(cache, input){
+		if(!('type' in cache)){
+			cache.type = getType.call(input);
+		}
 	}
 ;
 
@@ -94,6 +98,7 @@ var isPlaceholderOptionSelected = function(select){
 };
 
 var emptyJ = $([]);
+//TODO: cache + perftest
 var getGroupElements = function(elem){
 	elem = $(elem);
 	var name, form;
@@ -118,9 +123,7 @@ var validityRules = {
 		valueMissing: function(input, val, cache){
 			if(!input.prop('required')){return false;}
 			var ret = false;
-			if(!('type' in cache)){
-				cache.type = getType(input[0]);
-			}
+			cacheType(cache, input[0]);
 			if(cache.nodeName == 'select'){
 				ret = (!val && (input[0].selectedIndex < 0 || isPlaceholderOptionSelected(input[0]) ));
 			} else if(checkTypes[cache.type]){
@@ -131,21 +134,32 @@ var validityRules = {
 			return ret;
 		},
 		patternMismatch: function(input, val, cache) {
-			if(val === '' || cache.nodeName == 'select'){return false;}
-			if(!('type' in cache)){
-				cache.type = getType(input[0]);
-			}
-			if(!patternTypes[cache.type]){return false;}
+			var i;
+			var ret = false;
+			if(val === '' || cache.nodeName == 'select'){return ret;}
+
+			cacheType(cache, input[0]);
+
+			if(!patternTypes[cache.type]){return ret;}
 			var pattern = input.attr('pattern');
-			if(!pattern){return false;}
+			if(!pattern){return ret;}
 			try {
 				pattern = new RegExp('^(?:' + pattern + ')$');
 			} catch(er){
 				webshims.error('invalid pattern value: "'+ pattern +'" | '+ er);
-				pattern = false;
+				pattern = ret;
+			}
+			if(!pattern){return ret;}
+
+			val = cache.type == 'email' && input.prop('multiple') ? val.split(splitReg) : [val];
+
+			for(i = 0; i < val.length; i++){
+				if(!pattern.test(val[i])){
+					ret = true;
+					break;
+				}
 			}
-			if(!pattern){return false;}
-			return !(pattern.test(val));
+			return ret;
 		}
 	}
 ;
@@ -154,9 +168,9 @@ $.each({tooShort: ['minLength', -1], tooLong: ['maxLength', 1]}, function(name,
 	validityRules[name] = function(input, val, cache){
 		//defaultValue is not the same as dirty flag, but very similiar
 		if(cache.nodeName == 'select' || input.prop('defaultValue') == val){return false;}
-		if(!('type' in cache)){
-			cache.type = getType(input[0]);
-		}
+
+		cacheType(cache, input[0]);
+
 		if(!lengthTypes[cache.type]){return false;}
 		var prop = input.prop(props[0]);
 		
@@ -168,9 +182,8 @@ $.each({typeMismatch: 'mismatch', badInput: 'bad'}, function(name, fn){
 	validityRules[name] = function (input, val, cache){
 		if(val === '' || cache.nodeName == 'select'){return false;}
 		var ret = false;
-		if(!('type' in cache)){
-			cache.type = getType(input[0]);
-		}
+
+		cacheType(cache, input[0]);
 		
 		if(typeModels[cache.type] && typeModels[cache.type][fn]){
 			ret = typeModels[cache.type][fn](val, input);
@@ -238,6 +251,7 @@ $.extend($.event.special.submit, {
 		return submitSetup.apply(this, arguments);
 	}
 });
+
 webshims.ready('form-shim-extend2 WINDOWLOAD', function(){
 	$(window).on('invalid', $.noop);
 });
@@ -247,15 +261,16 @@ webshims.addInputType('email', {
 	mismatch: (function(){
 		//taken from http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html#valid-e-mail-address
 		var test = cfg.emailReg || /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/;
-		var splitReg = /\s*,\s*/g;
 		return function(val, input){
+			var i;
 			var ret = false;
-			val = $(input).prop('multiple') ? val.split(splitReg) : [val];
-			
-			for(var i = 0; i < val.length; i++){
-				if(!test.test(val[i])){
-					ret = true;
-					break;
+			if(val){
+				val = input.prop('multiple') ? val.split(splitReg) : [val];
+				for(i = 0; i < val.length; i++){
+					if(!test.test(val[i])){
+						ret = true;
+						break;
+					}
 				}
 			}
 			return ret;
@@ -268,18 +283,14 @@ webshims.addInputType('url', {
 		//taken from scott gonzales
 		var test = cfg.urlReg || /^([a-z]([a-z]|\d|\+|-|\.)*):(\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?((\[(|(v[\da-f]{1,}\.(([a-z]|\d|-|\.|_|~)|[!\$&'\(\)\*\+,;=]|:)+))\])|((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=])*)(:\d*)?)(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*|(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)){0})(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i;
 		return function(val){
-			return !test.test(val);
+			return val && !test.test(val);
 		};
 	})()
 });
 
 webshims.defineNodeNameProperty('input', 'type', {
 	prop: {
-		get: function(){
-			var elem = this;
-			var type = (elem.getAttribute('type') || '').toLowerCase();
-			return (webshims.inputTypes[type]) ? type : elem.type;
-		}
+		get: getType
 	}
 });