webshims-rails 0.4.3 → 0.4.4

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

@@ -1,641 +1,641 @@
-jQuery.webshims.register('form-extend', function($, webshims, window, doc, undefined, options){
-	"use strict";
-	var Modernizr = window.Modernizr;
-	var modernizrInputTypes = Modernizr.inputtypes;
-	if(!Modernizr.formvalidation || webshims.bugs.bustedValidity){return;}
-	var typeModels = webshims.inputTypes;
-	var validityRules = {};
-	
-	webshims.addInputType = function(type, obj){
-		typeModels[type] = obj;
-	};
-	
-	webshims.addValidityRule = function(type, fn){
-		validityRules[type] = fn;
-	};
-	
-	webshims.addValidityRule('typeMismatch',function (input, val, cache, validityState){
-		if(val === ''){return false;}
-		var ret = validityState.typeMismatch;
-		if(!('type' in cache)){
-			cache.type = (input[0].getAttribute('type') || '').toLowerCase();
-		}
-		
-		if(typeModels[cache.type] && typeModels[cache.type].mismatch){
-			ret = typeModels[cache.type].mismatch(val, input);
-		}
-		return ret;
-	});
-	
-	var overrideNativeMessages = options.overrideMessages;	
-	
-	var overrideValidity = (!modernizrInputTypes.number || !modernizrInputTypes.time || !modernizrInputTypes.range || overrideNativeMessages);
-	var validityProps = ['customError','typeMismatch','rangeUnderflow','rangeOverflow','stepMismatch','tooLong','patternMismatch','valueMissing','valid'];
-	
-	var validityChanger = (overrideNativeMessages)? ['value', 'checked'] : ['value'];
-	var validityElements = [];
-	var testValidity = function(elem, init){
-		if(!elem){return;}
-		var type = (elem.getAttribute && elem.getAttribute('type') || elem.type || '').toLowerCase();
-		
-		if(!overrideNativeMessages && !typeModels[type]){
-			return;
-		}
-		
-		if(overrideNativeMessages && !init && type == 'radio' && elem.name){
-			$(doc.getElementsByName( elem.name )).each(function(){
-				$.prop(this, 'validity');
-			});
-		} else {
-			$.prop(elem, 'validity');
-		}
-	};
-	
-	var oldSetCustomValidity = {};
-	['input', 'textarea', 'select'].forEach(function(name){
-		var desc = webshims.defineNodeNameProperty(name, 'setCustomValidity', {
-			prop: {
-				value: function(error){
-					error = error+'';
-					var elem = (name == 'input') ? $(this).getNativeElement()[0] : this;
-					desc.prop._supvalue.call(elem, error);
-					
-					if(webshims.bugs.validationMessage){
-						webshims.data(elem, 'customvalidationMessage', error);
-					}
-					if(overrideValidity){
-						webshims.data(elem, 'hasCustomError', !!(error));
-						testValidity(elem);
-					}
-				}
-			}
-		});
-		oldSetCustomValidity[name] = desc.prop._supvalue;
-	});
-		
-	
-	if(overrideValidity || overrideNativeMessages){
-		validityChanger.push('min');
-		validityChanger.push('max');
-		validityChanger.push('step');
-		validityElements.push('input');
-	}
-	if(overrideNativeMessages){
-		validityChanger.push('required');
-		validityChanger.push('pattern');
-		validityElements.push('select');
-		validityElements.push('textarea');
-	}
-	
-	if(overrideValidity){
-		var stopValidity;
-		validityElements.forEach(function(nodeName){
-			
-			var oldDesc = webshims.defineNodeNameProperty(nodeName, 'validity', {
-				prop: {
-					get: function(){
-						if(stopValidity){return;}
-						var elem = (nodeName == 'input') ? $(this).getNativeElement()[0] : this;
-						
-						var validity = oldDesc.prop._supget.call(elem);
-						
-						if(!validity){
-							return validity;
-						}
-						var validityState = {};
-						validityProps.forEach(function(prop){
-							validityState[prop] = validity[prop];
-						});
-						
-						if( !$.prop(elem, 'willValidate') ){
-							return validityState;
-						}
-						stopValidity = true;
-						var jElm 			= $(elem),
-							cache 			= {type: (elem.getAttribute && elem.getAttribute('type') || '').toLowerCase(), nodeName: (elem.nodeName || '').toLowerCase()},
-							val				= jElm.val(),
-							customError 	= !!(webshims.data(elem, 'hasCustomError')),
-							setCustomMessage
-						;
-						stopValidity = false;
-						validityState.customError = customError;
-						
-						if( validityState.valid && validityState.customError ){
-							validityState.valid = false;
-						} else if(!validityState.valid) {
-							var allFalse = true;
-							$.each(validityState, function(name, prop){
-								if(prop){
-									allFalse = false;
-									return false;
-								}
-							});
-							
-							if(allFalse){
-								validityState.valid = true;
-							}
-							
-						}
-						
-						$.each(validityRules, function(rule, fn){
-							validityState[rule] = fn(jElm, val, cache, validityState);
-							if( validityState[rule] && (validityState.valid || !setCustomMessage) && (overrideNativeMessages || (typeModels[cache.type] && typeModels[cache.type].mismatch)) ) {
-								oldSetCustomValidity[nodeName].call(elem, webshims.createValidationMessage(elem, rule));
-								validityState.valid = false;
-								setCustomMessage = true;
-							}
-						});
-						if(validityState.valid){
-							oldSetCustomValidity[nodeName].call(elem, '');
-							webshims.data(elem, 'hasCustomError', false);
-						} else if(overrideNativeMessages && !setCustomMessage && !customError){
-							$.each(validityState, function(name, prop){
-								if(name !== 'valid' && prop){
-									oldSetCustomValidity[nodeName].call(elem, webshims.createValidationMessage(elem, name));
-									return false;
-								}
-							});
-						}
-						return validityState;
-					},
-					writeable: false
-					
-				}
-			});
-		});
-
-		validityChanger.forEach(function(prop){
-			webshims.onNodeNamesPropertyModify(validityElements, prop, function(s){
-				testValidity(this);
-			});
-		});
-		
-		if(doc.addEventListener){
-			var inputThrottle;
-			var testPassValidity = function(e){
-				if(!('form' in e.target)){return;}
-				var form = e.target.form;
-				clearTimeout(inputThrottle);
-				testValidity(e.target);
-				if(form && overrideNativeMessages){
-					$('input', form).each(function(){
-						if(this.type == 'password'){
-							testValidity(this);
-						}
-					});
-				}
-			};
-			
-			doc.addEventListener('change', testPassValidity, true);
-			
-			if(overrideNativeMessages){
-				doc.addEventListener('blur', testPassValidity, true);
-				doc.addEventListener('keydown', function(e){
-					if(e.keyCode != 13){return;}
-					testPassValidity(e);
-				}, true);
-			}
-			
-			doc.addEventListener('input', function(e){
-				clearTimeout(inputThrottle);
-				inputThrottle = setTimeout(function(){
-					testValidity(e.target);
-				}, 290);
-			}, true);
-		}
-		
-		var validityElementsSel = validityElements.join(',');	
-		
-		webshims.addReady(function(context, elem){
-			$(validityElementsSel, context).add(elem.filter(validityElementsSel)).each(function(){
-				$.prop(this, 'validity');
-			});
-		});
-		
-		
-		if(overrideNativeMessages){
-			webshims.ready('DOM form-message', function(){
-				webshims.activeLang({
-					register: 'form-core',
-					callback: function(){
-						$('input, select, textarea')
-							.getNativeElement()
-							.each(function(){
-								if(webshims.data(this, 'hasCustomError')){return;}
-								var elem = this;
-								var validity = $.prop(elem, 'validity') || {valid: true};
-								var nodeName;
-								if(validity.valid){return;}
-								nodeName = (elem.nodeName || '').toLowerCase();
-								$.each(validity, function(name, prop){
-									if(name !== 'valid' && prop){
-										oldSetCustomValidity[nodeName].call(elem, webshims.createValidationMessage(elem, name));
-										return false;
-									}
-								});
-							})
-						;
-					}
-				});
-			});
-		}
-		
-	} //end: overrideValidity
-	
-	webshims.defineNodeNameProperty('input', 'type', {
-		prop: {
-			get: function(){
-				var elem = this;
-				var type = (elem.getAttribute('type') || '').toLowerCase();
-				return (webshims.inputTypes[type]) ? type : elem.type;
-			}
-		}
-	});
-	
-	
-});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');
-			if(step === 'any'){
-				return step;
-			}
-			type = type || getType(elem);
-			if(!typeModels[type] || !typeModels[type].step){
-				return step;
-			}
-			step = typeProtos.number.asNumber(step);
-			return ((!isNaN(step) && step > 0) ? step : typeModels[type].step) * typeModels[type].stepScaleFactor;
-		};
-	}
-	if(!webshims.addMinMaxNumberToCache){
-		webshims.addMinMaxNumberToCache = function(attr, elem, cache){
-			if (!(attr+'AsNumber' in cache)) {
-				cache[attr+'AsNumber'] = typeModels[cache.type].asNumber(elem.attr(attr));
-				if(isNaN(cache[attr+'AsNumber']) && (attr+'Default' in typeModels[cache.type])){
-					cache[attr+'AsNumber'] = typeModels[cache.type][attr+'Default'];
-				}
-			}
-		};
-	}
-	
-	var nan = parseInt('NaN', 10),
-		doc = document,
-		typeModels = webshims.inputTypes,
-		isNumber = function(string){
-			return (typeof string == 'number' || (string && string == string * 1));
-		},
-		supportsType = function(type){
-			return ($('<input type="'+type+'" />').prop('type') === type);
-		},
-		getType = function(elem){
-			return (elem.getAttribute('type') || '').toLowerCase();
-		},
-		isDateTimePart = function(string){
-			return (isNumber(string) || (string && string == '0' + (string * 1)));
-		},
-		addMinMaxNumberToCache = webshims.addMinMaxNumberToCache,
-		addleadingZero = function(val, len){
-			val = ''+val;
-			len = len - val.length;
-			for(var i = 0; i < len; i++){
-				val = '0'+val;
-			}
-			return val;
-		},
-		EPS = 1e-7,
-		typeBugs = webshims.bugs.valueAsNumberSet || webshims.bugs.bustedValidity
-	;
-	
-	webshims.addValidityRule('stepMismatch', function(input, val, cache, validityState){
-		if(val === ''){return false;}
-		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;
-		if(typeModels[cache.type] && typeModels[cache.type].step){
-			if( !('step' in cache) ){
-				cache.step = webshims.getStep(input[0], cache.type);
-			}
-			
-			if(cache.step == 'any'){return false;}
-			
-			if(!('valueAsNumber' in cache)){
-				cache.valueAsNumber = typeModels[cache.type].asNumber( val );
-			}
-			if(isNaN(cache.valueAsNumber)){return false;}
-			
-			addMinMaxNumberToCache('min', input, cache);
-			base = cache.minAsNumber;
-			if(isNaN(base)){
-				base = typeModels[cache.type].stepBase || 0;
-			}
-			
-			ret =  Math.abs((cache.valueAsNumber - base) % cache.step);
-							
-			ret = !(  ret <= EPS || Math.abs(ret - cache.step) <= EPS  );
-		}
-		return ret;
-	});
-	
-	
-	
-	[{name: 'rangeOverflow', attr: 'max', factor: 1}, {name: 'rangeUnderflow', attr: 'min', factor: -1}].forEach(function(data, i){
-		webshims.addValidityRule(data.name, function(input, val, cache, validityState) {
-			var ret = (validityState || {})[data.name] || false;
-			if(val === ''){return ret;}
-			if (!('type' in cache)) {
-				cache.type = getType(input[0]);
-			}
-			if (typeModels[cache.type] && typeModels[cache.type].asNumber) {
-				if(!('valueAsNumber' in cache)){
-					cache.valueAsNumber = typeModels[cache.type].asNumber( val );
-				}
-				if(isNaN(cache.valueAsNumber)){
-					return false;
-				}
-				
-				addMinMaxNumberToCache(data.attr, input, cache);
-				
-				if(isNaN(cache[data.attr+'AsNumber'])){
-					return ret;
-				}
-				ret = ( cache[data.attr+'AsNumber'] * data.factor <  cache.valueAsNumber * data.factor - EPS );
-			}
-			return ret;
-		});
-	});
-	
-	webshims.reflectProperties(['input'], ['max', 'min', 'step']);
-	
-	
-	//IDLs and methods, that aren't part of constrain validation, but strongly tight to it
-	var valueAsNumberDescriptor = webshims.defineNodeNameProperty('input', 'valueAsNumber', {
-		prop: {
-			get: function(){
-				var elem = this;
-				var type = getType(elem);
-				var ret = (typeModels[type] && typeModels[type].asNumber) ? 
-					typeModels[type].asNumber($.prop(elem, 'value')) :
-					(valueAsNumberDescriptor.prop._supget && valueAsNumberDescriptor.prop._supget.apply(elem, arguments));
-				if(ret == null){
-					ret = nan;
-				}
-				return ret;
-			},
-			set: function(val){
-				var elem = this;
-				var type = getType(elem);
-				if(typeModels[type] && typeModels[type].numberToString){
-					//is NaN a number?
-					if(isNaN(val)){
-						$.prop(elem, 'value', '');
-						return;
-					}
-					var set = typeModels[type].numberToString(val);
-					if(set !==  false){
-						$.prop(elem, 'value', set);
-					} else {
-						webshims.warn('INVALID_STATE_ERR: DOM Exception 11');
-					}
-				} else {
-					valueAsNumberDescriptor.prop._supset && valueAsNumberDescriptor.prop._supset.apply(elem, arguments);
-				}
-			}
-		}
-	});
-	
-	var valueAsDateDescriptor = webshims.defineNodeNameProperty('input', 'valueAsDate', {
-		prop: {
-			get: function(){
-				var elem = this;
-				var type = getType(elem);
-				return (typeModels[type] && typeModels[type].asDate && !typeModels[type].noAsDate) ? 
-					typeModels[type].asDate($.prop(elem, 'value')) :
-					valueAsDateDescriptor.prop._supget && valueAsDateDescriptor.prop._supget.call(elem) || null;
-			},
-			set: function(value){
-				var elem = this;
-				var type = getType(elem);
-				if(typeModels[type] && typeModels[type].dateToString && !typeModels[type].noAsDate){
-					
-					if(value === null){
-						$.prop(elem, 'value', '');
-						return '';
-					}
-					var set = typeModels[type].dateToString(value);
-					if(set !== false){
-						$.prop(elem, 'value', set);
-						return set;
-					} else {
-						webshims.warn('INVALID_STATE_ERR: DOM Exception 11');
-					}
-				} else {
-					return valueAsDateDescriptor.prop._supset && valueAsDateDescriptor.prop._supset.apply(elem, arguments) || null;
-				}
-			}
-		}
-	});
-	
-	var typeProtos = {
-		
-		number: {
-			mismatch: function(val){
-				return !(isNumber(val));
-			},
-			step: 1,
-			//stepBase: 0, 0 = default
-			stepScaleFactor: 1,
-			asNumber: function(str){
-				return (isNumber(str)) ? str * 1 : nan;
-			},
-			numberToString: function(num){
-				return (isNumber(num)) ? num : false;
-			}
-		},
-		
-		range: {
-			minDefault: 0,
-			maxDefault: 100
-		},
-		
-		date: {
-			mismatch: function(val){
-				if(!val || !val.split || !(/\d$/.test(val))){return true;}
-				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){
-					ret = true;
-				}
-				return (val !== this.dateToString( this.asDate(val, true) ) );
-			},
-			step: 1,
-			//stepBase: 0, 0 = default
-			stepScaleFactor:  86400000,
-			asDate: function(val, _noMismatch){
-				if(!_noMismatch && this.mismatch(val)){
-					return null;
-				}
-				return new Date(this.asNumber(val, true));
-			},
-			asNumber: function(str, _noMismatch){
-				var ret = nan;
-				if(_noMismatch || !this.mismatch(str)){
-					str = str.split(/\u002D/);
-					ret = Date.UTC(str[0], str[1] - 1, str[2]);
-				}
-				return ret;
-			},
-			numberToString: function(num){
-				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;
-			}
-		},
-		time: {
-			mismatch: function(val, _getParsed){
-				if(!val || !val.split || !(/\d$/.test(val))){return true;}
-				val = val.split(/\u003A/);
-				if(val.length < 2 || val.length > 3){return true;}
-				var ret = false,
-					sFraction;
-				if(val[2]){
-					val[2] = val[2].split(/\u002E/);
-					sFraction = parseInt(val[2][1], 10);
-					val[2] = val[2][0];
-				}
-				$.each(val, function(i, part){
-					if(!isDateTimePart(part) || part.length !== 2){
-						ret = true;
-						return false;
-					}
-				});
-				if(ret){return true;}
-				if(val[0] > 23 || val[0] < 0 || val[1] > 59 || val[1] < 0){
-					return true;
-				}
-				if(val[2] && (val[2] > 59 || val[2] < 0 )){
-					return true;
-				}
-				if(sFraction && isNaN(sFraction)){
-					return true;
-				}
-				if(sFraction){
-					if(sFraction < 100){
-						sFraction *= 100;
-					} else if(sFraction < 10){
-						sFraction *= 10;
-					}
-				}
-				return (_getParsed === true) ? [val, sFraction] : false;
-			},
-			step: 60,
-			stepBase: 0,
-			stepScaleFactor:  1000,
-			asDate: function(val){
-				val = new Date(this.asNumber(val));
-				return (isNaN(val)) ? null : val;
-			},
-			asNumber: function(val){
-				var ret = nan;
-				val = this.mismatch(val, true);
-				if(val !== true){
-					ret = Date.UTC('1970', 0, 1, val[0][0], val[0][1], val[0][2] || 0);
-					if(val[1]){
-						ret += val[1];
-					}
-				}
-				return ret;
-			},
-			dateToString: function(date){
-				if(date && date.getUTCHours){
-					var str = addleadingZero(date.getUTCHours(), 2) +':'+ addleadingZero(date.getUTCMinutes(), 2),
-						tmp = date.getSeconds()
-					;
-					if(tmp != "0"){
-						str += ':'+ addleadingZero(tmp, 2);
-					}
-					tmp = date.getUTCMilliseconds();
-					if(tmp != "0"){
-						str += '.'+ addleadingZero(tmp, 3);
-					}
-					return str;
-				} else {
-					return false;
-				}
-			}
-		}
-//		,'datetime-local': {
-//			mismatch: function(val, _getParsed){
-//				if(!val || !val.split || (val+'special').split(/\u0054/).length !== 2){return true;}
-//				val = val.split(/\u0054/);
-//				return ( typeProtos.date.mismatch(val[0]) || typeProtos.time.mismatch(val[1], _getParsed) );
-//			},
-//			noAsDate: true,
-//			asDate: function(val){
-//				val = new Date(this.asNumber(val));
-//				
-//				return (isNaN(val)) ? null : val;
-//			},
-//			asNumber: function(val){
-//				var ret = nan;
-//				var time = this.mismatch(val, true);
-//				if(time !== true){
-//					val = val.split(/\u0054/)[0].split(/\u002D/);
-//					
-//					ret = Date.UTC(val[0], val[1] - 1, val[2], time[0][0], time[0][1], time[0][2] || 0);
-//					if(time[1]){
-//						ret += time[1];
-//					}
-//				}
-//				return ret;
-//			},
-//			dateToString: function(date, _getParsed){
-//				return typeProtos.date.dateToString(date) +'T'+ typeProtos.time.dateToString(date, _getParsed);
-//			}
-//		}
-	};
-	
-	if(typeBugs || !supportsType('range') || !supportsType('time')){
-		typeProtos.range = $.extend({}, typeProtos.number, typeProtos.range);
-		typeProtos.time = $.extend({}, typeProtos.date, typeProtos.time);
-//		typeProtos['datetime-local'] = $.extend({}, typeProtos.date, typeProtos.time, typeProtos['datetime-local']);
-	}
-	
-	if(typeBugs || !supportsType('number')){
-		webshims.addInputType('number', typeProtos.number);
-	}
-	
-	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']);
-//	}
-		
+jQuery.webshims.register('form-extend', function($, webshims, window, doc, undefined, options){
+	"use strict";
+	var Modernizr = window.Modernizr;
+	var modernizrInputTypes = Modernizr.inputtypes;
+	if(!Modernizr.formvalidation || webshims.bugs.bustedValidity){return;}
+	var typeModels = webshims.inputTypes;
+	var validityRules = {};
+	
+	webshims.addInputType = function(type, obj){
+		typeModels[type] = obj;
+	};
+	
+	webshims.addValidityRule = function(type, fn){
+		validityRules[type] = fn;
+	};
+	
+	webshims.addValidityRule('typeMismatch',function (input, val, cache, validityState){
+		if(val === ''){return false;}
+		var ret = validityState.typeMismatch;
+		if(!('type' in cache)){
+			cache.type = (input[0].getAttribute('type') || '').toLowerCase();
+		}
+		
+		if(typeModels[cache.type] && typeModels[cache.type].mismatch){
+			ret = typeModels[cache.type].mismatch(val, input);
+		}
+		return ret;
+	});
+	
+	var overrideNativeMessages = options.overrideMessages;	
+	
+	var overrideValidity = (!modernizrInputTypes.number || !modernizrInputTypes.time || !modernizrInputTypes.range || overrideNativeMessages);
+	var validityProps = ['customError','typeMismatch','rangeUnderflow','rangeOverflow','stepMismatch','tooLong','patternMismatch','valueMissing','valid'];
+	
+	var validityChanger = (overrideNativeMessages)? ['value', 'checked'] : ['value'];
+	var validityElements = [];
+	var testValidity = function(elem, init){
+		if(!elem){return;}
+		var type = (elem.getAttribute && elem.getAttribute('type') || elem.type || '').toLowerCase();
+		
+		if(!overrideNativeMessages && !typeModels[type]){
+			return;
+		}
+		
+		if(overrideNativeMessages && !init && type == 'radio' && elem.name){
+			$(doc.getElementsByName( elem.name )).each(function(){
+				$.prop(this, 'validity');
+			});
+		} else {
+			$.prop(elem, 'validity');
+		}
+	};
+	
+	var oldSetCustomValidity = {};
+	['input', 'textarea', 'select'].forEach(function(name){
+		var desc = webshims.defineNodeNameProperty(name, 'setCustomValidity', {
+			prop: {
+				value: function(error){
+					error = error+'';
+					var elem = (name == 'input') ? $(this).getNativeElement()[0] : this;
+					desc.prop._supvalue.call(elem, error);
+					
+					if(webshims.bugs.validationMessage){
+						webshims.data(elem, 'customvalidationMessage', error);
+					}
+					if(overrideValidity){
+						webshims.data(elem, 'hasCustomError', !!(error));
+						testValidity(elem);
+					}
+				}
+			}
+		});
+		oldSetCustomValidity[name] = desc.prop._supvalue;
+	});
+		
+	
+	if(overrideValidity || overrideNativeMessages){
+		validityChanger.push('min');
+		validityChanger.push('max');
+		validityChanger.push('step');
+		validityElements.push('input');
+	}
+	if(overrideNativeMessages){
+		validityChanger.push('required');
+		validityChanger.push('pattern');
+		validityElements.push('select');
+		validityElements.push('textarea');
+	}
+	
+	if(overrideValidity){
+		var stopValidity;
+		validityElements.forEach(function(nodeName){
+			
+			var oldDesc = webshims.defineNodeNameProperty(nodeName, 'validity', {
+				prop: {
+					get: function(){
+						if(stopValidity){return;}
+						var elem = (nodeName == 'input') ? $(this).getNativeElement()[0] : this;
+						
+						var validity = oldDesc.prop._supget.call(elem);
+						
+						if(!validity){
+							return validity;
+						}
+						var validityState = {};
+						validityProps.forEach(function(prop){
+							validityState[prop] = validity[prop];
+						});
+						
+						if( !$.prop(elem, 'willValidate') ){
+							return validityState;
+						}
+						stopValidity = true;
+						var jElm 			= $(elem),
+							cache 			= {type: (elem.getAttribute && elem.getAttribute('type') || '').toLowerCase(), nodeName: (elem.nodeName || '').toLowerCase()},
+							val				= jElm.val(),
+							customError 	= !!(webshims.data(elem, 'hasCustomError')),
+							setCustomMessage
+						;
+						stopValidity = false;
+						validityState.customError = customError;
+						
+						if( validityState.valid && validityState.customError ){
+							validityState.valid = false;
+						} else if(!validityState.valid) {
+							var allFalse = true;
+							$.each(validityState, function(name, prop){
+								if(prop){
+									allFalse = false;
+									return false;
+								}
+							});
+							
+							if(allFalse){
+								validityState.valid = true;
+							}
+							
+						}
+						
+						$.each(validityRules, function(rule, fn){
+							validityState[rule] = fn(jElm, val, cache, validityState);
+							if( validityState[rule] && (validityState.valid || !setCustomMessage) && (overrideNativeMessages || (typeModels[cache.type] && typeModels[cache.type].mismatch)) ) {
+								oldSetCustomValidity[nodeName].call(elem, webshims.createValidationMessage(elem, rule));
+								validityState.valid = false;
+								setCustomMessage = true;
+							}
+						});
+						if(validityState.valid){
+							oldSetCustomValidity[nodeName].call(elem, '');
+							webshims.data(elem, 'hasCustomError', false);
+						} else if(overrideNativeMessages && !setCustomMessage && !customError){
+							$.each(validityState, function(name, prop){
+								if(name !== 'valid' && prop){
+									oldSetCustomValidity[nodeName].call(elem, webshims.createValidationMessage(elem, name));
+									return false;
+								}
+							});
+						}
+						return validityState;
+					},
+					writeable: false
+					
+				}
+			});
+		});
+
+		validityChanger.forEach(function(prop){
+			webshims.onNodeNamesPropertyModify(validityElements, prop, function(s){
+				testValidity(this);
+			});
+		});
+		
+		if(doc.addEventListener){
+			var inputThrottle;
+			var testPassValidity = function(e){
+				if(!('form' in e.target)){return;}
+				var form = e.target.form;
+				clearTimeout(inputThrottle);
+				testValidity(e.target);
+				if(form && overrideNativeMessages){
+					$('input', form).each(function(){
+						if(this.type == 'password'){
+							testValidity(this);
+						}
+					});
+				}
+			};
+			
+			doc.addEventListener('change', testPassValidity, true);
+			
+			if(overrideNativeMessages){
+				doc.addEventListener('blur', testPassValidity, true);
+				doc.addEventListener('keydown', function(e){
+					if(e.keyCode != 13){return;}
+					testPassValidity(e);
+				}, true);
+			}
+			
+			doc.addEventListener('input', function(e){
+				clearTimeout(inputThrottle);
+				inputThrottle = setTimeout(function(){
+					testValidity(e.target);
+				}, 290);
+			}, true);
+		}
+		
+		var validityElementsSel = validityElements.join(',');	
+		
+		webshims.addReady(function(context, elem){
+			$(validityElementsSel, context).add(elem.filter(validityElementsSel)).each(function(){
+				$.prop(this, 'validity');
+			});
+		});
+		
+		
+		if(overrideNativeMessages){
+			webshims.ready('DOM form-message', function(){
+				webshims.activeLang({
+					register: 'form-core',
+					callback: function(){
+						$('input, select, textarea')
+							.getNativeElement()
+							.each(function(){
+								if(webshims.data(this, 'hasCustomError')){return;}
+								var elem = this;
+								var validity = $.prop(elem, 'validity') || {valid: true};
+								var nodeName;
+								if(validity.valid){return;}
+								nodeName = (elem.nodeName || '').toLowerCase();
+								$.each(validity, function(name, prop){
+									if(name !== 'valid' && prop){
+										oldSetCustomValidity[nodeName].call(elem, webshims.createValidationMessage(elem, name));
+										return false;
+									}
+								});
+							})
+						;
+					}
+				});
+			});
+		}
+		
+	} //end: overrideValidity
+	
+	webshims.defineNodeNameProperty('input', 'type', {
+		prop: {
+			get: function(){
+				var elem = this;
+				var type = (elem.getAttribute('type') || '').toLowerCase();
+				return (webshims.inputTypes[type]) ? type : elem.type;
+			}
+		}
+	});
+	
+	
+});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');
+			if(step === 'any'){
+				return step;
+			}
+			type = type || getType(elem);
+			if(!typeModels[type] || !typeModels[type].step){
+				return step;
+			}
+			step = typeProtos.number.asNumber(step);
+			return ((!isNaN(step) && step > 0) ? step : typeModels[type].step) * typeModels[type].stepScaleFactor;
+		};
+	}
+	if(!webshims.addMinMaxNumberToCache){
+		webshims.addMinMaxNumberToCache = function(attr, elem, cache){
+			if (!(attr+'AsNumber' in cache)) {
+				cache[attr+'AsNumber'] = typeModels[cache.type].asNumber(elem.attr(attr));
+				if(isNaN(cache[attr+'AsNumber']) && (attr+'Default' in typeModels[cache.type])){
+					cache[attr+'AsNumber'] = typeModels[cache.type][attr+'Default'];
+				}
+			}
+		};
+	}
+	
+	var nan = parseInt('NaN', 10),
+		doc = document,
+		typeModels = webshims.inputTypes,
+		isNumber = function(string){
+			return (typeof string == 'number' || (string && string == string * 1));
+		},
+		supportsType = function(type){
+			return ($('<input type="'+type+'" />').prop('type') === type);
+		},
+		getType = function(elem){
+			return (elem.getAttribute('type') || '').toLowerCase();
+		},
+		isDateTimePart = function(string){
+			return (isNumber(string) || (string && string == '0' + (string * 1)));
+		},
+		addMinMaxNumberToCache = webshims.addMinMaxNumberToCache,
+		addleadingZero = function(val, len){
+			val = ''+val;
+			len = len - val.length;
+			for(var i = 0; i < len; i++){
+				val = '0'+val;
+			}
+			return val;
+		},
+		EPS = 1e-7,
+		typeBugs = webshims.bugs.bustedValidity
+	;
+	
+	webshims.addValidityRule('stepMismatch', function(input, val, cache, validityState){
+		if(val === ''){return false;}
+		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;
+		if(typeModels[cache.type] && typeModels[cache.type].step){
+			if( !('step' in cache) ){
+				cache.step = webshims.getStep(input[0], cache.type);
+			}
+			
+			if(cache.step == 'any'){return false;}
+			
+			if(!('valueAsNumber' in cache)){
+				cache.valueAsNumber = typeModels[cache.type].asNumber( val );
+			}
+			if(isNaN(cache.valueAsNumber)){return false;}
+			
+			addMinMaxNumberToCache('min', input, cache);
+			base = cache.minAsNumber;
+			if(isNaN(base)){
+				base = typeModels[cache.type].stepBase || 0;
+			}
+			
+			ret =  Math.abs((cache.valueAsNumber - base) % cache.step);
+							
+			ret = !(  ret <= EPS || Math.abs(ret - cache.step) <= EPS  );
+		}
+		return ret;
+	});
+	
+	
+	
+	[{name: 'rangeOverflow', attr: 'max', factor: 1}, {name: 'rangeUnderflow', attr: 'min', factor: -1}].forEach(function(data, i){
+		webshims.addValidityRule(data.name, function(input, val, cache, validityState) {
+			var ret = (validityState || {})[data.name] || false;
+			if(val === ''){return ret;}
+			if (!('type' in cache)) {
+				cache.type = getType(input[0]);
+			}
+			if (typeModels[cache.type] && typeModels[cache.type].asNumber) {
+				if(!('valueAsNumber' in cache)){
+					cache.valueAsNumber = typeModels[cache.type].asNumber( val );
+				}
+				if(isNaN(cache.valueAsNumber)){
+					return false;
+				}
+				
+				addMinMaxNumberToCache(data.attr, input, cache);
+				
+				if(isNaN(cache[data.attr+'AsNumber'])){
+					return ret;
+				}
+				ret = ( cache[data.attr+'AsNumber'] * data.factor <  cache.valueAsNumber * data.factor - EPS );
+			}
+			return ret;
+		});
+	});
+	
+	webshims.reflectProperties(['input'], ['max', 'min', 'step']);
+	
+	
+	//IDLs and methods, that aren't part of constrain validation, but strongly tight to it
+	var valueAsNumberDescriptor = webshims.defineNodeNameProperty('input', 'valueAsNumber', {
+		prop: {
+			get: function(){
+				var elem = this;
+				var type = getType(elem);
+				var ret = (typeModels[type] && typeModels[type].asNumber) ? 
+					typeModels[type].asNumber($.prop(elem, 'value')) :
+					(valueAsNumberDescriptor.prop._supget && valueAsNumberDescriptor.prop._supget.apply(elem, arguments));
+				if(ret == null){
+					ret = nan;
+				}
+				return ret;
+			},
+			set: function(val){
+				var elem = this;
+				var type = getType(elem);
+				if(typeModels[type] && typeModels[type].numberToString){
+					//is NaN a number?
+					if(isNaN(val)){
+						$.prop(elem, 'value', '');
+						return;
+					}
+					var set = typeModels[type].numberToString(val);
+					if(set !==  false){
+						$.prop(elem, 'value', set);
+					} else {
+						webshims.warn('INVALID_STATE_ERR: DOM Exception 11');
+					}
+				} else {
+					valueAsNumberDescriptor.prop._supset && valueAsNumberDescriptor.prop._supset.apply(elem, arguments);
+				}
+			}
+		}
+	});
+	
+	var valueAsDateDescriptor = webshims.defineNodeNameProperty('input', 'valueAsDate', {
+		prop: {
+			get: function(){
+				var elem = this;
+				var type = getType(elem);
+				return (typeModels[type] && typeModels[type].asDate && !typeModels[type].noAsDate) ? 
+					typeModels[type].asDate($.prop(elem, 'value')) :
+					valueAsDateDescriptor.prop._supget && valueAsDateDescriptor.prop._supget.call(elem) || null;
+			},
+			set: function(value){
+				var elem = this;
+				var type = getType(elem);
+				if(typeModels[type] && typeModels[type].dateToString && !typeModels[type].noAsDate){
+					
+					if(value === null){
+						$.prop(elem, 'value', '');
+						return '';
+					}
+					var set = typeModels[type].dateToString(value);
+					if(set !== false){
+						$.prop(elem, 'value', set);
+						return set;
+					} else {
+						webshims.warn('INVALID_STATE_ERR: DOM Exception 11');
+					}
+				} else {
+					return valueAsDateDescriptor.prop._supset && valueAsDateDescriptor.prop._supset.apply(elem, arguments) || null;
+				}
+			}
+		}
+	});
+	
+	var typeProtos = {
+		
+		number: {
+			mismatch: function(val){
+				return !(isNumber(val));
+			},
+			step: 1,
+			//stepBase: 0, 0 = default
+			stepScaleFactor: 1,
+			asNumber: function(str){
+				return (isNumber(str)) ? str * 1 : nan;
+			},
+			numberToString: function(num){
+				return (isNumber(num)) ? num : false;
+			}
+		},
+		
+		range: {
+			minDefault: 0,
+			maxDefault: 100
+		},
+		
+		date: {
+			mismatch: function(val){
+				if(!val || !val.split || !(/\d$/.test(val))){return true;}
+				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){
+					ret = true;
+				}
+				return (val !== this.dateToString( this.asDate(val, true) ) );
+			},
+			step: 1,
+			//stepBase: 0, 0 = default
+			stepScaleFactor:  86400000,
+			asDate: function(val, _noMismatch){
+				if(!_noMismatch && this.mismatch(val)){
+					return null;
+				}
+				return new Date(this.asNumber(val, true));
+			},
+			asNumber: function(str, _noMismatch){
+				var ret = nan;
+				if(_noMismatch || !this.mismatch(str)){
+					str = str.split(/\u002D/);
+					ret = Date.UTC(str[0], str[1] - 1, str[2]);
+				}
+				return ret;
+			},
+			numberToString: function(num){
+				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;
+			}
+		},
+		time: {
+			mismatch: function(val, _getParsed){
+				if(!val || !val.split || !(/\d$/.test(val))){return true;}
+				val = val.split(/\u003A/);
+				if(val.length < 2 || val.length > 3){return true;}
+				var ret = false,
+					sFraction;
+				if(val[2]){
+					val[2] = val[2].split(/\u002E/);
+					sFraction = parseInt(val[2][1], 10);
+					val[2] = val[2][0];
+				}
+				$.each(val, function(i, part){
+					if(!isDateTimePart(part) || part.length !== 2){
+						ret = true;
+						return false;
+					}
+				});
+				if(ret){return true;}
+				if(val[0] > 23 || val[0] < 0 || val[1] > 59 || val[1] < 0){
+					return true;
+				}
+				if(val[2] && (val[2] > 59 || val[2] < 0 )){
+					return true;
+				}
+				if(sFraction && isNaN(sFraction)){
+					return true;
+				}
+				if(sFraction){
+					if(sFraction < 100){
+						sFraction *= 100;
+					} else if(sFraction < 10){
+						sFraction *= 10;
+					}
+				}
+				return (_getParsed === true) ? [val, sFraction] : false;
+			},
+			step: 60,
+			stepBase: 0,
+			stepScaleFactor:  1000,
+			asDate: function(val){
+				val = new Date(this.asNumber(val));
+				return (isNaN(val)) ? null : val;
+			},
+			asNumber: function(val){
+				var ret = nan;
+				val = this.mismatch(val, true);
+				if(val !== true){
+					ret = Date.UTC('1970', 0, 1, val[0][0], val[0][1], val[0][2] || 0);
+					if(val[1]){
+						ret += val[1];
+					}
+				}
+				return ret;
+			},
+			dateToString: function(date){
+				if(date && date.getUTCHours){
+					var str = addleadingZero(date.getUTCHours(), 2) +':'+ addleadingZero(date.getUTCMinutes(), 2),
+						tmp = date.getSeconds()
+					;
+					if(tmp != "0"){
+						str += ':'+ addleadingZero(tmp, 2);
+					}
+					tmp = date.getUTCMilliseconds();
+					if(tmp != "0"){
+						str += '.'+ addleadingZero(tmp, 3);
+					}
+					return str;
+				} else {
+					return false;
+				}
+			}
+		}
+//		,'datetime-local': {
+//			mismatch: function(val, _getParsed){
+//				if(!val || !val.split || (val+'special').split(/\u0054/).length !== 2){return true;}
+//				val = val.split(/\u0054/);
+//				return ( typeProtos.date.mismatch(val[0]) || typeProtos.time.mismatch(val[1], _getParsed) );
+//			},
+//			noAsDate: true,
+//			asDate: function(val){
+//				val = new Date(this.asNumber(val));
+//				
+//				return (isNaN(val)) ? null : val;
+//			},
+//			asNumber: function(val){
+//				var ret = nan;
+//				var time = this.mismatch(val, true);
+//				if(time !== true){
+//					val = val.split(/\u0054/)[0].split(/\u002D/);
+//					
+//					ret = Date.UTC(val[0], val[1] - 1, val[2], time[0][0], time[0][1], time[0][2] || 0);
+//					if(time[1]){
+//						ret += time[1];
+//					}
+//				}
+//				return ret;
+//			},
+//			dateToString: function(date, _getParsed){
+//				return typeProtos.date.dateToString(date) +'T'+ typeProtos.time.dateToString(date, _getParsed);
+//			}
+//		}
+	};
+	
+	if(typeBugs || !supportsType('range') || !supportsType('time')){
+		typeProtos.range = $.extend({}, typeProtos.number, typeProtos.range);
+		typeProtos.time = $.extend({}, typeProtos.date, typeProtos.time);
+//		typeProtos['datetime-local'] = $.extend({}, typeProtos.date, typeProtos.time, typeProtos['datetime-local']);
+	}
+	
+	if(typeBugs || !supportsType('number')){
+		webshims.addInputType('number', typeProtos.number);
+	}
+	
+	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']);
+//	}
+		
 });/* number-date-ui */
 /* https://github.com/aFarkas/webshim/issues#issue/23 */
 jQuery.webshims.register('form-number-date-ui', function($, webshims, window, document, undefined, options){
@@ -749,15 +749,15 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 	
 	replaceInputUI.common = function(orig, shim, methods){
 		if(Modernizr.formvalidation){
-			orig.bind('firstinvalid', function(e){
+			orig.on('firstinvalid', function(e){
 				if(!webshims.fromSubmit && isCheckValidity){return;}
-				orig.unbind('invalid.replacedwidgetbubble').bind('invalid.replacedwidgetbubble', function(evt){
+				orig.off('invalid.replacedwidgetbubble').on('invalid.replacedwidgetbubble', function(evt){
 					if(!e.isInvalidUIPrevented() && !evt.isDefaultPrevented()){
 						webshims.validityAlert.showFor( e.target );
 						e.preventDefault();
 						evt.preventDefault();
 					}
-					orig.unbind('invalid.replacedwidgetbubble');
+					orig.off('invalid.replacedwidgetbubble');
 				});
 			});
 		}
@@ -790,7 +790,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 		orig.after(shim);
 		
 		if(orig[0].form){
-			$(orig[0].form).bind('reset', function(e){
+			$(orig[0].form).on('reset', function(e){
 				if(e.originalEvent && !e.isDefaultPrevented()){
 					setTimeout(function(){orig.prop( 'value', orig.prop('value') );}, 0);
 				}
@@ -799,7 +799,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 		
 		if(label[0]){
 			shim.getShadowFocusElement().attr('aria-labelledby', webshims.getID(label));
-			label.bind('click', function(){
+			label.on('click', function(){
 				orig.getShadowFocusElement().focus();
 				return false;
 			});
@@ -838,16 +838,18 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 				focusedOut = false;
 			};
 			var data = datePicker
-				.bind('focusin', function(){
-					resetFocusHandler();
-					data.dpDiv.unbind('mousedown.webshimsmousedownhandler').bind('mousedown.webshimsmousedownhandler', function(){
-						stopFocusout = true;
-					});
-				})
-				.bind('focusout blur', function(e){
-					if(stopFocusout){
-						focusedOut = true;
-						e.stopImmediatePropagation();
+				.on({
+					focusin: function(){
+						resetFocusHandler();
+						data.dpDiv.unbind('mousedown.webshimsmousedownhandler').bind('mousedown.webshimsmousedownhandler', function(){
+							stopFocusout = true;
+						});
+					},
+					'focusout blur': function(e){
+						if(stopFocusout){
+							focusedOut = true;
+							e.stopImmediatePropagation();
+						}
 					}
 				})
 				.datepicker($.extend({
@@ -861,7 +863,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 						}
 					}
 				}, defaultDatepicker, options.datepicker, elem.data('datepicker')))
-				.bind('change', change)
+				.on('change', change)
 				.data('datepicker')
 			;
 			data.dpDiv.addClass('input-date-datepicker-control');
@@ -1063,7 +1065,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 			data = configureDatePicker(elem, date, change);
 			
 			$(elem)
-				.bind('updateshadowdom', function(){
+				.on('updateshadowdom', function(){
 					if (data.trigger[0]) {
 						elem.css({display: ''});
 						if(elem[0].offsetWidth || elem[0].offsetHeight){
@@ -1153,7 +1155,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 			
 			
 			elem
-				.bind('updateshadowdom', function(){
+				.on('updateshadowdom', function(){
 					elem.css({display: ''});
 					if (elem[0].offsetWidth || elem[0].offsetHeight) {
 						var attr = getDimensions(elem);
@@ -1170,11 +1172,16 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 			;
 			
 			
-			range.slider($.extend(true, {}, options.slider, elem.data('slider'))).bind('slide', change).bind('slidechange', function(e){
-				if(e.originalEvent){
-					triggerInlineForm(elem[0], 'change');
-				}
-			});
+			range.slider($.extend(true, {}, options.slider, elem.data('slider')))
+				.on({
+					slide: change,
+					slidechange: function(e){
+						if(e.originalEvent){
+							triggerInlineForm(elem[0], 'change');
+						}
+					}
+				})
+			;
 			
 			['disabled', 'min', 'max', 'step', 'value'].forEach(function(name){
 				var val = elem.prop(name);
@@ -1229,7 +1236,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 		};
 	}
 	
-	if(!webshims.bugs.valueAsNumberSet && (options.replaceUI || !Modernizr.inputtypes.date /*|| !Modernizr.inputtypes["datetime-local"]*/ || !Modernizr.inputtypes.range)){
+	if(options.replaceUI || !Modernizr.inputtypes.date /*|| !Modernizr.inputtypes["datetime-local"]*/ || !Modernizr.inputtypes.range){
 		var reflectFn = function(val){
 			if(webshims.data(this, 'hasShadow')){
 				$.prop(this, 'value', $.prop(this, 'value'));
@@ -1280,7 +1287,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 		$(document).unbind('jquery-uiReady.langchange input-widgetsReady.langchange');
 	};
 	
-	$(document).bind('jquery-uiReady.langchange input-widgetsReady.langchange', getDefaults);
+	$(document).on('jquery-uiReady.langchange input-widgetsReady.langchange', getDefaults);
 	getDefaults();
 	
 	//implement set/arrow controls
@@ -1402,7 +1409,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 
 		function init(){
 			blockChangeValue = $(elem)
-				.bind({
+				.on({
 					'change.stepcontrol focus.stepcontrol': function(e){
 						if(!blockBlurChange || e.type != 'focus'){
 							blockChangeValue = $.prop(elem, 'value');
@@ -1441,19 +1448,21 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 				var uiEvents = changeInput(elem, type);
 				var controls = $('<span class="step-controls" unselectable="on"><span class="step-up" /><span class="step-down" /></span>')	
 					.insertAfter(elem)
-					.bind('selectstart dragstart', function(){return false;})
-					.bind('mousedown mousepress', function(e){
-						if(!$(e.target).hasClass('step-controls')){
-							uiEvents.step(($(e.target).hasClass('step-up')) ? 1 : -1);
-						}
-						uiEvents.setFocus();
-						return false;
-					})
-					.bind('mousepressstart mousepressend', function(e){
-						if(e.type == 'mousepressend'){
-							uiEvents.triggerChange();
+					.on({
+						'selectstart dragstart': function(){return false;},
+						'mousedown mousepress': function(e){
+							if(!$(e.target).hasClass('step-controls')){
+								uiEvents.step(($(e.target).hasClass('step-up')) ? 1 : -1);
+							}
+							uiEvents.setFocus();
+							return false;
+						},
+						'mousepressstart mousepressend': function(e){
+							if(e.type == 'mousepressend'){
+								uiEvents.triggerChange();
+							}
+							$(e.target)[e.type == 'mousepressstart' ? 'addClass' : 'removeClass']('mousepress-ui');
 						}
-						$(e.target)[e.type == 'mousepressstart' ? 'addClass' : 'removeClass']('mousepress-ui');
 					})
 				;
 				var mwheelUpDown = function(e, d){
@@ -1471,13 +1480,13 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 						autocomplete: 'off',
 						role: 'spinbutton'
 					})
-					.bind('keyup', function(e){
+					.on('keyup', function(e){
 						var step = stepKeys[e.keyCode];
 						if(step){
 							uiEvents.triggerChange(step);
 						}
 					})
-					.bind(($.browser.msie) ? 'keydown' : 'keypress', function(e){
+					.on(($.browser.msie) ? 'keydown' : 'keypress', function(e){
 						var step = stepKeys[e.keyCode];
 						if(step){
 							uiEvents.step(step);
@@ -1487,7 +1496,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 				;
 				
 				if(allowedChars[type]){
-					jElm.bind('keypress', (function(){
+					jElm.on('keypress', (function(){
 						var chars = allowedChars[type];
 						return function(event){
 							var chr = String.fromCharCode(event.charCode == null ? event.keyCode : event.charCode);
@@ -1497,13 +1506,15 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 				}
 				
 				jElm
-					.bind('focus', function(){
-						jElm.add(controls).unbind('.mwhellwebshims')
-							.bind('mousewheel.mwhellwebshims', mwheelUpDown)
-						;
-					})
-					.bind('blur', function(){
-						$(elem).add(controls).unbind('.mwhellwebshims');
+					.on({
+						focus: function(){
+							jElm.add(controls).off('.mwhellwebshims')
+								.on('mousewheel.mwhellwebshims', mwheelUpDown)
+							;
+						},
+						blur: function(){
+							$(elem).add(controls).off('.mwhellwebshims');
+						}
 					})
 				;
 				
@@ -1511,7 +1522,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 				if(options.calculateWidth){
 					var init;
 					jElm
-						.bind('updateshadowdom', function(){
+						.on('updateshadowdom', function(){
 							if(!init && (elem.offsetWidth || elem.offsetHeight)){
 								init = true;
 								adjustInputWithBtn(jElm, controls);
@@ -1528,7 +1539,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 
 	
 	webshims.addReady(function(context, elem){
-		$(document).bind('jquery-uiReady.initinputui input-widgetsReady.initinputui', function(e){
+		$(document).on('jquery-uiReady.initinputui input-widgetsReady.initinputui', function(e){
 			if($.datepicker || $.fn.slider){
 				if($.datepicker && !defaultDatepicker.dateFormat){
 					defaultDatepicker.dateFormat = $.datepicker._defaults.dateFormat;