webshims-rails 0.4.7 → 1.10.3

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

@@ -4,14 +4,16 @@ jQuery.webshims.register('form-message', function($, webshims, window, document,
 	
 	var implementProperties = (options.overrideMessages || options.customMessages) ? ['customValidationMessage'] : [];
 	
-	validityMessages['en'] = $.extend(true, {
+	validityMessages.en = $.extend(true, {
 		typeMismatch: {
+			defaultMessage: 'Please enter a valid value.',
 			email: 'Please enter an email address.',
 			url: 'Please enter a URL.',
 			number: 'Please enter a number.',
 			date: 'Please enter a date.',
 			time: 'Please enter a time.',
 			range: 'Invalid input.',
+			month: 'Please enter a valid value.',
 			"datetime-local": 'Please enter a datetime.'
 		},
 		rangeUnderflow: {
@@ -22,43 +24,42 @@ jQuery.webshims.register('form-message', function($, webshims, window, document,
 		},
 		stepMismatch: 'Invalid input.',
 		tooLong: 'Please enter at most {%maxlength} character(s). You entered {%valueLen}.',
-		
 		patternMismatch: 'Invalid input. {%title}',
 		valueMissing: {
 			defaultMessage: 'Please fill out this field.',
 			checkbox: 'Please check this box if you want to proceed.'
 		}
-	}, (validityMessages['en'] || validityMessages['en-US'] || {}));
-	
-	
-	['select', 'radio'].forEach(function(type){
-		if(typeof validityMessages['en'].valueMissing == 'object'){
-			validityMessages['en'].valueMissing[type] = 'Please select an option.';
-		}
-	});
+	}, (validityMessages.en || validityMessages['en-US'] || {}));
 	
-	['date', 'time', 'datetime-local'].forEach(function(type){
-		if(typeof validityMessages['en'].rangeUnderflow == 'object'){
+	if(typeof validityMessages['en'].valueMissing == 'object'){
+		['select', 'radio'].forEach(function(type){
+			validityMessages.en.valueMissing[type] = 'Please select an option.';
+		});
+	}
+	if(typeof validityMessages.en.rangeUnderflow == 'object'){
+		['date', 'time', 'datetime-local', 'month'].forEach(function(type){
 			validityMessages.en.rangeUnderflow[type] = 'Value must be at or after {%min}.';
-		}
-	});
-	['date', 'time', 'datetime-local'].forEach(function(type){
-		if(typeof validityMessages['en'].rangeOverflow == 'object'){
+		});
+	}
+	if(typeof validityMessages.en.rangeOverflow == 'object'){
+		['date', 'time', 'datetime-local', 'month'].forEach(function(type){
 			validityMessages.en.rangeOverflow[type] = 'Value must be at or before {%max}.';
-		}
-	});
+		});
+	}
 	
-	validityMessages['en-US'] = validityMessages['en-US'] || validityMessages['en'];
+	validityMessages['en-US'] = validityMessages['en-US'] || validityMessages.en;
 	validityMessages[''] = validityMessages[''] || validityMessages['en-US'];
 	
-	validityMessages['de'] = $.extend(true, {
+	validityMessages.de = $.extend(true, {
 		typeMismatch: {
-			email: '{%value} ist keine zulässige E-Mail-Adresse',
-			url: '{%value} ist keine zulässige Webadresse',
-			number: '{%value} ist keine Nummer!',
-			date: '{%value} ist kein Datum',
-			time: '{%value} ist keine Uhrzeit',
-			range: '{%value} ist keine Nummer!',
+			defaultMessage: '{%value} ist in diesem Feld nicht zulässig.',
+			email: '{%value} ist keine gültige E-Mail-Adresse.',
+			url: '{%value} ist kein(e) gültige(r) Webadresse/Pfad.',
+			number: '{%value} ist keine Nummer.',
+			date: '{%value} ist kein Datum.',
+			time: '{%value} ist keine Uhrzeit.',
+			month: '{%value} ist in diesem Feld nicht zulässig.',
+			range: '{%value} ist keine Nummer.',
 			"datetime-local": '{%value} ist kein Datum-Uhrzeit Format.'
 		},
 		rangeUnderflow: {
@@ -69,51 +70,73 @@ jQuery.webshims.register('form-message', function($, webshims, window, document,
 		},
 		stepMismatch: 'Der Wert {%value} ist in diesem Feld nicht zulässig. Hier sind nur bestimmte Werte zulässig. {%title}',
 		tooLong: 'Der eingegebene Text ist zu lang! Sie haben {%valueLen} Zeichen eingegeben, dabei sind {%maxlength} das Maximum.',
-		patternMismatch: '{%value} hat für dieses Eingabefeld ein falsches Format! {%title}',
+		patternMismatch: '{%value} hat für dieses Eingabefeld ein falsches Format. {%title}',
 		valueMissing: {
-			defaultMessage: 'Bitte geben Sie einen Wert ein',
-			checkbox: 'Bitte aktivieren Sie das Kästchen'
+			defaultMessage: 'Bitte geben Sie einen Wert ein.',
+			checkbox: 'Bitte aktivieren Sie das Kästchen.'
 		}
-	}, (validityMessages['de'] || {}));
+	}, (validityMessages.de || {}));
 	
-	['select', 'radio'].forEach(function(type){
-		if(typeof validityMessages['de'].valueMissing == 'object'){
-			validityMessages['de'].valueMissing[type] = 'Bitte wählen Sie eine Option aus';
-		}
-	});
-	
-	['date', 'time', 'datetime-local'].forEach(function(type){
-		if(typeof validityMessages['de'].rangeUnderflow == 'object'){
+	if(typeof validityMessages.de.valueMissing == 'object'){
+		['select', 'radio'].forEach(function(type){
+			validityMessages.de.valueMissing[type] = 'Bitte wählen Sie eine Option aus.';
+		});
+	}
+	if(typeof validityMessages.de.rangeUnderflow == 'object'){
+		['date', 'time', 'datetime-local', 'month'].forEach(function(type){
 			validityMessages.de.rangeUnderflow[type] = '{%value} ist zu früh. {%min} ist die früheste Zeit, die Sie benutzen können.';
-		}
-	});
-	['date', 'time', 'datetime-local'].forEach(function(type){
-		if(typeof validityMessages['de'].rangeOverflow == 'object'){
+		});
+	}
+	if(typeof validityMessages.de.rangeOverflow == 'object'){
+		['date', 'time', 'datetime-local', 'month'].forEach(function(type){
 			validityMessages.de.rangeOverflow[type] = '{%value} ist zu spät. {%max} ist die späteste Zeit, die Sie benutzen können.';
-		}
-	});
+		});
+	}
 	
 	var currentValidationMessage =  validityMessages[''];
-	
-	
-	webshims.createValidationMessage = function(elem, name){
-		var message = currentValidationMessage[name];
+	var getMessageFromObj = function(message, elem){
 		if(message && typeof message !== 'string'){
 			message = message[ $.prop(elem, 'type') ] || message[ (elem.nodeName || '').toLowerCase() ] || message[ 'defaultMessage' ];
 		}
+		return message || '';
+	};
+	var valueVals = {
+		value: 1,
+		min: 1,
+		max: 1
+	};
+	
+	webshims.createValidationMessage = function(elem, name){
+		var spinner;
+		var message = getMessageFromObj(currentValidationMessage[name], elem);
+		
+		if(!message){
+			message = getMessageFromObj(validityMessages[''][name], elem) || 'invalid value';
+			webshims.info('could not find errormessage for: '+ name +' / '+ $.prop(elem, 'type') +'. in language: '+$.webshims.activeLang());
+		}
 		if(message){
 			['value', 'min', 'max', 'title', 'maxlength', 'label'].forEach(function(attr){
 				if(message.indexOf('{%'+attr) === -1){return;}
-				var val = ((attr == 'label') ? $.trim($('label[for="'+ elem.id +'"]', elem.form).text()).replace(/\*$|:$/, '') : $.attr(elem, attr)) || '';
+				var val = ((attr == 'label') ? $.trim($('label[for="'+ elem.id +'"]', elem.form).text()).replace(/\*$|:$/, '') : $.prop(elem, attr)) || '';
 				if(name == 'patternMismatch' && attr == 'title' && !val){
 					webshims.error('no title for patternMismatch provided. Always add a title attribute.');
 				}
+				if(valueVals[attr]){
+					if(!spinner){
+						spinner = $(elem).getShadowElement().data('wsspinner');
+					}
+					if(spinner && spinner.formatValue){
+						val = spinner.formatValue(val, false);
+					}
+				}
 				message = message.replace('{%'+ attr +'}', val);
 				if('value' == attr){
 					message = message.replace('{%valueLen}', val.length);
 				}
+				
 			});
 		}
+		
 		return message || '';
 	};
 	
@@ -126,6 +149,7 @@ jQuery.webshims.register('form-message', function($, webshims, window, document,
 		langObj: validityMessages, 
 		module: 'form-core', 
 		callback: function(langObj){
+			
 			currentValidationMessage = langObj;
 		}
 	});

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

@@ -6,15 +6,32 @@ jQuery.webshims.register('form-native-extend', function($, webshims, window, doc
 	var typeModels = webshims.inputTypes;
 	var validityRules = {};
 	
+	var updateValidity = (function(){
+		var timer;
+		var getValidity = function(){
+			$(this).prop('validity');
+		};
+		var update = function(){
+			$('input').each(getValidity);
+		};
+		return function(fast){
+			clearTimeout(timer);
+			timer = setTimeout(update, 9);
+		};
+	})();
 	webshims.addInputType = function(type, obj){
 		typeModels[type] = obj;
+		//update validity of all implemented input types
+		if($.isDOMReady && Modernizr.formvalidation && !webshims.bugs.bustedValidity){
+			updateValidity();
+		}
 	};
 	
 	webshims.addValidityRule = function(type, fn){
 		validityRules[type] = fn;
 	};
 	
-	webshims.addValidityRule('typeMismatch',function (input, val, cache, validityState){
+	webshims.addValidityRule('typeMismatch', function (input, val, cache, validityState){
 		if(val === ''){return false;}
 		var ret = validityState.typeMismatch;
 		if(!('type' in cache)){

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

@@ -1,7 +1,7 @@
 jQuery.webshims.register('form-number-date-api', function($, webshims, window, document, undefined){
 	"use strict";
 	
-	//ToDo
+	
 	if(!webshims.getStep){
 		webshims.getStep = function(elem, type){
 			var step = $.attr(elem, 'step');
@@ -13,7 +13,7 @@ jQuery.webshims.register('form-number-date-api', function($, webshims, window, d
 				return step;
 			}
 			step = typeProtos.number.asNumber(step);
-			return ((!isNaN(step) && step > 0) ? step : typeModels[type].step) * typeModels[type].stepScaleFactor;
+			return ((!isNaN(step) && step > 0) ? step : typeModels[type].step) * (typeModels[type].stepScaleFactor || 1);
 		};
 	}
 	if(!webshims.addMinMaxNumberToCache){
@@ -40,7 +40,7 @@ jQuery.webshims.register('form-number-date-api', function($, webshims, window, d
 			return (elem.getAttribute('type') || '').toLowerCase();
 		},
 		isDateTimePart = function(string){
-			return (isNumber(string) || (string && string == '0' + (string * 1)));
+			return (string && !(isNaN(string * 1)));
 		},
 		addMinMaxNumberToCache = webshims.addMinMaxNumberToCache,
 		addleadingZero = function(val, len){
@@ -60,11 +60,8 @@ jQuery.webshims.register('form-number-date-api', function($, webshims, window, d
 		if(!('type' in cache)){
 			cache.type = getType(input[0]);
 		}
-		//stepmismatch with date is computable, but it would be a typeMismatch (performance)
-		if(cache.type == 'date'){
-			return false;
-		}
-		var ret = (validityState || {}).stepMismatch, base;
+		
+		var ret = (validityState || {}).stepMismatch || false, base;
 		if(typeModels[cache.type] && typeModels[cache.type].step){
 			if( !('step' in cache) ){
 				cache.step = webshims.getStep(input[0], cache.type);
@@ -148,7 +145,7 @@ jQuery.webshims.register('form-number-date-api', function($, webshims, window, d
 					if(set !==  false){
 						$.prop(elem, 'value', set);
 					} else {
-						webshims.warn('INVALID_STATE_ERR: DOM Exception 11');
+						webshims.error('INVALID_STATE_ERR: DOM Exception 11');
 					}
 				} else {
 					valueAsNumberDescriptor.prop._supset && valueAsNumberDescriptor.prop._supset.apply(elem, arguments);
@@ -180,7 +177,7 @@ jQuery.webshims.register('form-number-date-api', function($, webshims, window, d
 						$.prop(elem, 'value', set);
 						return set;
 					} else {
-						webshims.warn('INVALID_STATE_ERR: DOM Exception 11');
+						webshims.error('INVALID_STATE_ERR: DOM Exception 11');
 					}
 				} else {
 					return valueAsDateDescriptor.prop._supset && valueAsDateDescriptor.prop._supset.apply(elem, arguments) || null;
@@ -189,6 +186,69 @@ jQuery.webshims.register('form-number-date-api', function($, webshims, window, d
 		}
 	});
 	
+	$.each({stepUp: 1, stepDown: -1}, function(name, stepFactor){
+		var stepDescriptor = webshims.defineNodeNameProperty('input', name, {
+			prop: {
+				value: function(factor){
+					var step, val, dateVal, valModStep, alignValue, cache;
+					var type = getType(this);
+					if(typeModels[type] && typeModels[type].asNumber){
+						cache = {type: type};
+						if(!factor){
+							factor = 1;
+							webshims.info("you should always use a factor for stepUp/stepDown");
+						}
+						factor *= stepFactor;
+						
+						val = $.prop(this, 'valueAsNumber');
+						
+						if(isNaN(val)){
+							webshims.info("valueAsNumber is NaN can't apply stepUp/stepDown ");
+							throw('invalid state error');
+						}
+						
+						step = webshims.getStep(this, type);
+						
+						if(step == 'any'){
+							webshims.info("step is 'any' can't apply stepUp/stepDown");
+							throw('invalid state error');
+						}
+						
+						webshims.addMinMaxNumberToCache('min', $(this), cache);
+						webshims.addMinMaxNumberToCache('max', $(this), cache);
+						
+						step *= factor;
+						
+						val = (val + step).toFixed(5) * 1;
+						valModStep = (val - (cache.minAsNumber || 0)) % step;
+						
+						if ( valModStep && (Math.abs(valModStep) > EPS) ) {
+							alignValue = val - valModStep;
+							alignValue += ( valModStep > 0 ) ? step : ( -step );
+							val = alignValue.toFixed(5) * 1;
+						}
+						
+						if( (!isNaN(cache.maxAsNumber) && val > cache.maxAsNumber) || (!isNaN(cache.minAsNumber) && val < cache.minAsNumber) ){
+							webshims.info("max/min overflow can't apply stepUp/stepDown");
+							throw('invalid state error');
+						}
+						if(dateVal){
+							$.prop(this, 'valueAsDate', dateVal);
+						} else {
+							$.prop(this, 'valueAsNumber', val);
+						}
+					} else if(stepDescriptor.prop && stepDescriptor.prop.value){
+						return stepDescriptor.prop.value.apply(this, arguments);
+					} else {
+						webshims.info("no step method for type: "+ type);
+						throw('invalid state error');
+					}
+				}
+			}
+		});
+	});
+	
+	
 	var typeProtos = {
 		
 		number: {
@@ -214,20 +274,24 @@ jQuery.webshims.register('form-number-date-api', function($, webshims, window, d
 		date: {
 			mismatch: function(val){
 				if(!val || !val.split || !(/\d$/.test(val))){return true;}
+				var i;
 				var valA = val.split(/\u002D/);
 				if(valA.length !== 3){return true;}
 				var ret = false;
-				$.each(valA, function(i, part){
-					if(!isDateTimePart(part)){
-						ret = true;
-						return false;
-					}
-				});
-				if(ret){return ret;}
-				if(valA[0].length !== 4 || valA[1].length != 2 || valA[1] > 12 || valA[2].length != 2 || valA[2] > 33){
+				
+				
+				if(valA[0].length < 4 || valA[1].length != 2 || valA[1] > 12 || valA[2].length != 2 || valA[2] > 33){
 					ret = true;
+				} else {
+					for(i = 0; i < 3; i++){
+						if(!isDateTimePart(valA[i])){
+							ret = true;
+							break;
+						}
+					}
 				}
-				return (val !== this.dateToString( this.asDate(val, true) ) );
+				
+				return ret || (val !== this.dateToString( this.asDate(val, true) ) );
 			},
 			step: 1,
 			//stepBase: 0, 0 = default
@@ -250,7 +314,7 @@ jQuery.webshims.register('form-number-date-api', function($, webshims, window, d
 				return (isNumber(num)) ? this.dateToString(new Date( num * 1)) : false;
 			},
 			dateToString: function(date){
-				return (date && date.getFullYear) ? date.getUTCFullYear() +'-'+ addleadingZero(date.getUTCMonth()+1, 2) +'-'+ addleadingZero(date.getUTCDate(), 2) : false;
+				return (date && date.getFullYear) ? addleadingZero(date.getUTCFullYear(), 4) +'-'+ addleadingZero(date.getUTCMonth()+1, 2) +'-'+ addleadingZero(date.getUTCDate(), 2) : false;
 			}
 		},
 		time: {
@@ -325,6 +389,53 @@ jQuery.webshims.register('form-number-date-api', function($, webshims, window, d
 					return false;
 				}
 			}
+		},
+		month: {
+			mismatch: function(val){
+				return typeProtos.date.mismatch(val+'-01');
+			},
+			step: 1,
+			stepScaleFactor:  false,
+			//stepBase: 0, 0 = default
+			asDate: function(val){
+				return new Date(typeProtos.date.asNumber(val+'-01'));
+			},
+			asNumber: function(val){
+				//1970-01
+				var ret = nan;
+				if(val && !this.mismatch(val)){
+					val = val.split(/\u002D/);
+					val[0] = (val[0] * 1) - 1970;
+					val[1] = (val[1] * 1) - 1;
+					ret = (val[0] * 12) + val[1];
+				}
+				return ret;
+			},
+			numberToString: function(num){
+				var mod;
+				var ret = false;
+				if(isNumber(num)){
+					mod = (num % 12);
+					num = ((num - mod) / 12) + 1970;
+					mod += 1;
+					if(mod < 1){
+						num -= 1;
+						mod += 12;
+					}
+					ret = addleadingZero(num, 4)+'-'+addleadingZero(mod, 2);
+					
+				}
+				
+				return ret;
+			},
+			dateToString: function(date){
+				if(date && date.getUTCHours){
+					var str = typeProtos.date.dateToString(date);
+					return (str.split && (str = str.split(/\u002D/))) ? str[0]+'-'+str[1] : false;
+				} else {
+					return false;
+				}
+			}
 		}
 //		,'datetime-local': {
 //			mismatch: function(val, _getParsed){
@@ -360,25 +471,39 @@ jQuery.webshims.register('form-number-date-api', function($, webshims, window, d
 	if(typeBugs || !supportsType('range') || !supportsType('time')){
 		typeProtos.range = $.extend({}, typeProtos.number, typeProtos.range);
 		typeProtos.time = $.extend({}, typeProtos.date, typeProtos.time);
+		typeProtos.month = $.extend({}, typeProtos.date, typeProtos.month);
 //		typeProtos['datetime-local'] = $.extend({}, typeProtos.date, typeProtos.time, typeProtos['datetime-local']);
 	}
 	
-	if(typeBugs || !supportsType('number')){
-		webshims.addInputType('number', typeProtos.number);
+	//'datetime-local'
+	['number', 'month', 'range', 'date', 'time'].forEach(function(type){
+		if(typeBugs || !supportsType(type)){
+			webshims.addInputType(type, typeProtos[type]);
+		}
+	});
+
+	if($('<input />').prop('labels') == null){
+		webshims.defineNodeNamesProperty('button, input, keygen, meter, output, progress, select, textarea', 'labels', {
+			prop: {
+				get: function(){
+					if(this.type == 'hidden'){return null;}
+					var id = this.id;
+					var labels = $(this)
+						.closest('label')
+						.filter(function(){
+							var hFor = (this.attributes['for'] || {});
+							return (!hFor.specified || hFor.value == id);
+						})
+					;
+					
+					if(id) {
+						labels = labels.add('label[for="'+ id +'"]');
+					}
+					return labels.get();
+				},
+				writeable: false
+			}
+		});
 	}
 	
-	if(typeBugs || !supportsType('range')){
-		webshims.addInputType('range', typeProtos.range);
-	}
-	if(typeBugs || !supportsType('date')){
-		webshims.addInputType('date', typeProtos.date);
-	}
-	if(typeBugs || !supportsType('time')){
-		webshims.addInputType('time', typeProtos.time);
-	}
-
-//	if(typeBugs || !supportsType('datetime-local')){
-//		webshims.addInputType('datetime-local', typeProtos['datetime-local']);
-//	}
-		
 });