webshims-rails 1.11.1 → 1.11.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDQzM2Q1ZDU3NDMyYzk3MTQ4ZTk5ZWU2MTE5MDczMTM4NTY2YTA1MQ==
+    NjVkNmUzNDI2Nzc2YzQ2YzEyZmU2OGU4YzNkMDhkODVkYjRiZDgzZQ==
   data.tar.gz: !binary |-
-    ZmMyMTI4YzI3ZmE0NWRmZDczZjVjMTdlMTVlZGI2OWU3ODY4ZTI5MQ==
+    NWRiNWEzN2FlYTVlOWFmNGEwNzI3NzNkMTk3MWYyMzZkZGMxNDJmNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTZkYjFjZjU3NmIzNDc3MDdhMGM0ZTQ0OGE1NTNhOWM3ZTAxYTU0Y2I2OTcx
-    YjVmMmJlZTg3ZTUwYTRjYjkyYTdhNTRkMjU4MzRjZjllMGYwZjNhMzZkZjM0
-    YjAzOTkyMjRkYWRlNDVlNGM1Y2Q3MTliNDE2ZWE1NTEzNTBmNTI=
+    ODdjNWY5MWQ2ZGI3NmQ5OTZjYzUzZGQ0ZmMwMzE3ZjE2MmU4MWYwN2E0OGM4
+    ZDllYWE5YWI5ZTNmYzY1YzI4ZjBkZDFmMjI0ZWE5MjU2NGNhY2Q2MTI0YTYx
+    MzU0MTlhZWE1YTM3NmI4M2UwOTgwOTAyOTg1OGQwMDFhNzg2MjU=
   data.tar.gz: !binary |-
-    MjNjN2U5ZGY1OTI4ZWIxZGVlMmM0M2EzNTdkNzdmNDE5ZWE3MWFmOGUxZjVi
-    Nzk1ZDcwMGJiN2Y2Yjk2NGVkN2I4ZTExZjI2ZjNhNmJhZjlkZWFmZDg4NDk0
-    ZGZhZWFkNzM0ODFhN2UwZWE1Y2ZlZmY4NjMyYjU2OThlNDM1Zjk=
+    YmExN2NjMmFjNTFlNzVkMDgxMWJhNGZmZjg0ZTNiY2QxYjA1ZTJhY2M3NjQx
+    MjIyODI4YTEyMzM3M2QxYjJiZjJkNGE5MDkwZDFhMWFhY2QyMDNhYzQ1ODdm
+    MTVlZGQ1MTc1OTMxODdlYWJlZGVkYzU5MWFhZDg2ZmUxZDgzYTA=

data/lib/webshims-rails/version.rb

@@ -1,6 +1,6 @@
 module Webshims
   module Rails
-    VERSION = "1.11.1"
-    WEBSHIMS_VERSION = "1.11.1"
+    VERSION = "1.11.2"
+    WEBSHIMS_VERSION = "1.11.2"
   end
 end

data/vendor/assets/javascripts/webshims/polyfiller.js

@@ -27,7 +27,7 @@
 	
 	
 	var webshims = {
-		version: '1.11.1',
+		version: '1.11.2',
 		cfg: {
 			
 			//addCacheBuster: false,
@@ -35,7 +35,7 @@
 //			extendNative: false,
 			loadStyles: true,
 			disableShivMethods: true,
-			wspopover: {appendTo: 'body', hideOnBlur: true},
+			wspopover: {appendTo: 'auto', hideOnBlur: true},
 			basePath: (function(){
 				var script = jScripts.filter('[src*="polyfiller.js"]');
 				var path;
@@ -841,7 +841,7 @@
 		f: DOMSUPPORT,
 		noAutoCallback: true,
 		d: ['es5'],
-		c: [16, 7, 2, 15, 30, 3, 8, 4, 9, 10, 14, 25, 19, 20, 26, 28, 31]
+		c: [16, 7, 2, 15, 30, 3, 8, 4, 9, 10, 14, 25, 19, 20, 26, 31]
 	});
 		
 	
@@ -938,11 +938,12 @@
 		var modernizrInputTypes = Modernizr.inputtypes;
 		var formvalidation = 'formvalidation';
 		var fNuAPI = 'form-number-date-api';
-		var select = $('<select required="" name="a"><option disabled="" /></select>')[0];
+		var select = $('<select required=""><option disabled="" /></select>')[0];
 		var bustedValidity = false;
 		var bustedWidgetUi = false;
 		
 		var initialFormTest = function(){
+			var range, rangeCSS;
 			if(!initialFormTest.run){
 				addTest(formvalidation, function(){
 					return !!(modernizrInputAttrs.required && modernizrInputAttrs.pattern);
@@ -953,15 +954,25 @@
 					return 'elements' in fieldset && 'disabled' in fieldset;
 				});
 				
-				if(modernizrInputTypes){
+				if(modernizrInputTypes && modernizrInputTypes.range && !window.opera){
+					range = $('<input type="range" style="-webkit-appearance: slider-horizontal; -moz-appearance: range;" />').appendTo('html');
+					rangeCSS = range.css('appearance');
+					range.remove();
+					
+					addTest('csstrackrange', function(){
+						return rangeCSS == null || rangeCSS == 'range';
+					});
+					addTest('cssrangeinput', function(){
+						return rangeCSS == 'slider-horizontal' || rangeCSS == 'range';
+					});
 					addTest('styleableinputrange', function(){
-						return modernizrInputTypes.range && !window.opera;
+						return Modernizr.csstrackrange || Modernizr.cssrangeinput;
 					});
 				}
 				
 				if(Modernizr[formvalidation]){
-					bustedWidgetUi = window.opera || Modernizr.formattribute === false || !Modernizr.fieldsetdisabled || !('value' in document.createElement('progress')) || !('value' in document.createElement('output')) || !($('<input type="date" value="1488-12-11" />')[0].validity || {valid: true}).valid || !('required' in select) || (select.validity || {}).valid;
-					bugs.bustedValidity = bustedValidity = bustedWidgetUi || !modernizrInputAttrs.list;
+					bustedWidgetUi = !Modernizr.fieldsetdisabled || !('value' in document.createElement('progress')) || !('value' in document.createElement('output')) || !('required' in select) || (select.validity || {}).valid;
+					bugs.bustedValidity = bustedValidity = window.opera || bustedWidgetUi || !modernizrInputAttrs.list;
 				}
 
 				formExtend = Modernizr[formvalidation] && !bustedValidity ? 'form-native-extend' : fShim;
@@ -999,7 +1010,7 @@
 //					,fieldWrapper: undefined
 //					,fx: 'slide'
 				},
-				availabeLangs: ['ar', 'ch-ZN', 'el', 'es', 'fr', 'he', 'hi', 'hu', 'it', 'ja', 'lt', 'nl', 'pl', 'pt-PT', 'ru', 'sv'] //en and de are directly implemented in core
+				availableLangs: ['ar', 'ch-ZN', 'el', 'es', 'fr', 'he', 'hi', 'hu', 'it', 'ja', 'lt', 'nl', 'pl', 'pt-PT', 'ru', 'sv'] //en and de are directly implemented in core
 	//			,customMessages: false,
 	//			overridePlaceholder: false, // might be good for IE10
 	//			replaceValidationUI: false
@@ -1026,7 +1037,16 @@
 				return Modernizr[formvalidation] && !bustedValidity;
 			},
 			d: ['form-core', DOMSUPPORT],
-			c: [16, 15]
+			c: [16, 15, 24]
+		});
+		
+		addPolyfill(fShim+'2', {
+			f: 'forms',
+			test: function(){
+				return Modernizr[formvalidation] && !bustedWidgetUi;
+			},
+			d: [fShim],
+			c: [24]
 		});
 		
 		addPolyfill('form-message', {
@@ -1040,8 +1060,7 @@
 		
 		formExtras = {
 			noAutoCallback: true,
-			options: formOptions,
-			c: [24]
+			options: formOptions
 		};
 		addModule('form-validation', $.extend({d: ['form-message', 'form-core']}, formExtras));
 		
@@ -1090,13 +1109,14 @@
 			test: function(){
 				var o = this.options;
 				initialFormTest();
-				//input widgets on old on old androids can't be trusted
+				//input widgets on old androids can't be trusted
 				if(bustedWidgetUi && !o.replaceUI && (/Android/i).test(navigator.userAgent)){
 					o.replaceUI = true;
 				}
 				return !o.replaceUI && modules[fNuAPI].test();
 			},
 			d: ['forms', DOMSUPPORT, fNuAPI, 'range-ui'],
+			css: 'styles/forms-ext.css',
 			options: {
 				
 				widgets: {
@@ -1121,12 +1141,14 @@
 	})();
 	//>
 	
+	//<filereader
 	addPolyfill('filereader', {
 		test: 'FileReader' in window,
 		d: ['swfmini', DOMSUPPORT],
 		c: [25, 26, 27]
 //		,nM: 'filereader'
 	});
+	//>
 	
 	//<details
 	if(!('details' in Modernizr)){
@@ -1179,12 +1201,12 @@
 				if(options.preferFlash && !modules.swfmini.test()){
 					options.preferFlash = false;
 				}
-				return !( options.preferFlash && window.swfmini.hasFlashPlayerVersion('9.0.115') );
+				return !( options.preferFlash && swfmini.hasFlashPlayerVersion('9.0.115') );
 			},
-			c: [21, 19, 25, 20, 28]
+			c: [21, 19, 25, 20]
 		});
 		
-		bugs.track = (Modernizr.track && (!Modernizr.texttrackapi || typeof (document.createElement('track').track || {}).mode != 'string'));
+		bugs.track = !Modernizr.texttrackapi;
 		
 		addPolyfill('track', {
 			options: {
@@ -1192,18 +1214,17 @@
 				override: bugs.track
 			},
 			test: function(){
-				return Modernizr.track && !this.options.override && !bugs.track;
+				return !this.options.override && !bugs.track;
 			},
 			d: ['mediaelement', DOMSUPPORT],
 			methodNames: ['addTextTrack'],
-			c: [21, 12, 13, 22, 29],
+			c: [21, 12, 13, 22],
 			nM: 'texttrackapi'
 		});
 		
 		
 		addModule('track-ui', {
-			d: ['track', DOMSUPPORT],
-			c: [29]
+			d: ['track', DOMSUPPORT]
 		});
 		
 	})();

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

@@ -6,7 +6,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	webshims.assumeARIA = supportGetSetAttribute || Modernizr.canvas || Modernizr.video || Modernizr.boxsizing;
 	
 	if($('<input type="email" />').attr('type') == 'text' || $('<form />').attr('novalidate') === "" || ('required' in $('<input />')[0].attributes)){
-		webshims.error("IE browser modes are busted in IE10. Please test your HTML/CSS/JS with a real IE version or at least IETester or similiar tools");
+		webshims.error("IE browser modes are busted in IE10+. Please test your HTML/CSS/JS with a real IE version or at least IETester or similiar tools");
 	}
 	
 	if(!$.parseHTML){
@@ -559,7 +559,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 						$(this.test);
 						webshims.ready('WINDOWLOAD', this.test);
 						$(document).on('updatelayout', this.handler);
-						$(window).bind('resize', this.handler);
+						$(window).on('resize', this.handler);
 						(function(){
 							var oldAnimate = $.fn.animate;
 							var animationTimer;
@@ -581,6 +581,13 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			webshims.docObserve = function(){
 				webshims.ready('DOM', function(){
 					docObserve.start();
+					if($.support.boxSizing == null){
+						$(function(){
+							if($.support.boxSizing){
+								docObserve.handler({type: 'boxsizing'});
+							}
+						});
+					}
 				});
 			};
 			return function(nativeElem, shadowElem, opts){
@@ -741,7 +748,12 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			havePolyfill[prop] = true;
 						
 			if(descs.reflect){
-				webshims.propTypes[descs.propType || 'standard'](descs, prop);
+				if(descs.propType && !webshims.propTypes[descs.propType]){
+					webshims.error('could not finde propType '+ descs.propType);
+				} else {
+					webshims.propTypes[descs.propType || 'standard'](descs, prop);
+				}
+				
 			}
 			
 			['prop', 'attr', 'removeAttr'].forEach(function(type){
@@ -927,7 +939,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			var notLocal = /:\/\/|^\.*\//;
 			var loadRemoteLang = function(data, lang, options){
 				var langSrc;
-				if(lang && options && $.inArray(lang, options.availabeLangs || []) !== -1){
+				if(lang && options && $.inArray(lang, options.availableLangs || options.availabeLangs || []) !== -1){
 					data.loading = true;
 					langSrc = options.langSrc;
 					if(!notLocal.test(langSrc)){
@@ -1087,7 +1099,6 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	});
 	
 })(webshims.$, document);
-
 (function($){
 	
 	var id = 0;
@@ -1106,9 +1117,9 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			var i;
 			
 			
-			this.element.addClass('ws-range').attr({role: 'slider'}).append('<span class="ws-range-min" /><span class="ws-range-rail"><span class="ws-range-thumb" /></span>');
-			this.trail = $('.ws-range-rail', this.element);
-			this.range = $('.ws-range-min', this.element);
+			this.element.addClass('ws-range').attr({role: 'slider'}).append('<span class="ws-range-min ws-range-progress" /><span class="ws-range-rail ws-range-track"><span class="ws-range-thumb" /></span>');
+			this.trail = $('.ws-range-track', this.element);
+			this.range = $('.ws-range-progress ', this.element);
 			this.thumb = $('.ws-range-thumb', this.trail);
 			
 			this.updateMetrics();
@@ -1118,6 +1129,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			for(i = 0; i < createOpts.length; i++){
 				this[createOpts[i]](this.options[createOpts[i]]);
 			}
+			
 			this.value = this._value;
 			this.value(this.options.value);
 			this.initDataList();
@@ -1356,7 +1368,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			}
 		},
 		addBindings: function(){
-			var leftOffset, widgetUnits, hasFocus;
+			var leftOffset, widgetUnits, hasFocus, isActive;
 			var that = this;
 			var o = this.options;
 			
@@ -1386,8 +1398,28 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					}
 				};
 			})();
-			
+			var normalizeTouch = (function(){
+				var types = {
+					touchstart: 1,
+					touchend: 1,
+					touchmove: 1
+				};
+				var normalize = ['pageX', 'pageY'];
+				return function(e){
+					if(types[e.type] && e.originalEvent && e.originalEvent.touches && e.originalEvent.touches.length){
+						for(var i = 0; i < normalize.length; i++){
+							e[normalize[i]] = e.originalEvent.touches[0][normalize[i]];
+						}
+						
+					}
+					return e;
+				};
+			})();
 			var setValueFromPos = function(e, animate){
+				if(e.type == 'touchmove'){
+					e.preventDefault();
+					normalizeTouch(e);
+				}
 				
 				var val = that.getStepedValueFromPos((e[that.dirs.mouse] - leftOffset) * widgetUnits);
 				if(val != o.value){
@@ -1404,18 +1436,25 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					eventTimer.call('change', o.value);
 				}
 				that.addRemoveClass('ws-active');
-				$(document).off('mousemove', setValueFromPos).off('mouseup', remove);
+				$(document).off('mousemove touchmove', setValueFromPos).off('mouseup touchend', remove);
 				$(window).off('blur', removeWin);
+				isActive = false;
 			};
 			var removeWin = function(e){
 				if(e.target == window){remove();}
 			};
 			var add = function(e){
 				var outerWidth;
+				
+				if(isActive || (e.type == 'touchstart' && (!e.originalEvent || !e.originalEvent.touches || e.originalEvent.touches.length != 1))){
+					return;
+				}
 				e.preventDefault();
-				$(document).off('mousemove', setValueFromPos).off('mouseup', remove);
+				
+				$(document).off('mousemove touchmove', setValueFromPos).off('mouseup touchend', remove);
 				$(window).off('blur', removeWin);
 				if(!o.readonly && !o.disabled){
+					normalizeTouch(e);
 					that.element.focus();
 					that.addRemoveClass('ws-active', true);
 					leftOffset = that.element.focus().offset();
@@ -1425,20 +1464,27 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					leftOffset = leftOffset[that.dirs.pos];
 					widgetUnits = 100 / widgetUnits;
 					setValueFromPos(e, o.animate);
+					isActive = true;
 					$(document)
-						.on({
-							mouseup: remove,
-							mousemove: setValueFromPos
-						})
+						.on(e.type == 'touchstart' ?
+							{
+								touchend: remove,
+								touchmove: setValueFromPos
+							} :
+							{
+								mouseup: remove,
+								mousemove: setValueFromPos
+							}
+						)
 					;
 					$(window).on('blur', removeWin);
 					e.stopPropagation();
 				}
 			};
 			var elementEvts = {
-				mousedown: add,
+				'touchstart mousedown': add,
 				focus: function(e){
-					if(!o.disabled){
+					if(!o.disabled && !hasFocus){
 						eventTimer.init('input', o.value);
 						eventTimer.init('change', o.value);
 						that.addRemoveClass('ws-focus', true);
@@ -1501,6 +1547,20 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			this.thumb.on({
 				mousedown: add
 			});
+			
+			if(this.orig){
+				$(this.orig).jProp('form').on('reset', function(){
+					var val = $.prop(that.orig, 'value');
+					that.value(val);
+					setTimeout(function(){
+						var val2 = $.prop(that.orig, 'value');
+						if(val != val2){
+							that.value(val2);
+						}
+					}, 4);
+				});
+			}
+			
 			if (window.webshims) {
 				webshims.ready('WINDOWLOAD', function(){
 					webshims.ready('dom-support', function(){
@@ -1606,8 +1666,8 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		var str;
 		return function(){
 			if(!str){
-				str = ('<option></option>')+$.map(monthDigits, function(val){
-					return '<option>'+val+'</option>';
+				str = ('<option value=""></option>')+$.map(monthDigits, function(val){
+					return '<option value="'+val+'"]>'+val+'</option>';
 				}).join('');
 			}
 			return str;
@@ -1629,7 +1689,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					splits: [$('<input type="text" class="yy" size="4" inputmode="numeric" />')[0]] 
 				};
 				if(opts.monthSelect){
-					obj.splits.push($('<select class="mm">'+getMonthOptions()+'</select>')[0]);
+					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]);
 				}
@@ -1664,7 +1724,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					splits: [$('<input type="text" class="yy" inputmode="numeric" size="4" />')[0]] 
 				};
 				if(opts.monthSelect){
-					obj.splits.push($('<select class="mm ws-spin">'+getMonthOptions()+'</select>')[0]);
+					obj.splits.push($('<select class="mm ws-spin">'+getMonthOptions(opts)+'</select>')[0]);
 				} else {
 					obj.splits.push($('<input type="text" class="mm ws-spin" />')[0]);
 					if(opts.onlyMonthDigits){
@@ -1756,6 +1816,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			month:  {
 				currentText: 'Aktueller Monat'
 			},
+			time:  {
+				currentText: 'Jetzt'
+			},
 			date: {
 				close: 'schließen',
 				clear: 'Löschen',
@@ -1793,6 +1856,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			month:  {
 				currentText: 'This month'
 			},
+			time: {
+				"currentText": "Now"
+			},
 			date: {
 				"closeText": "Done",
 				clear: 'Clear',
@@ -1855,6 +1921,12 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			if(!langCfg['datetime-localSigns']){
 				langCfg['datetime-localSigns'] = langCfg.dateSigns+langCfg.timeSigns;
 			}
+			if(!langCfg['datetime-local']){
+				langCfg['datetime-local'] = {};
+			}
+			if(!langCfg['datetime-local'].currentText && langCfg.time.currentText){
+				langCfg['datetime-local'].currentText = langCfg.time.currentText;
+			}
 		};
 		var triggerLocaleChange = function(){
 			processLangCFG(curCfg);
@@ -1922,6 +1994,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					} else {
 						fVal = 0;
 					}
+					if(val[0] === '00'){ 
+						val[0] = '12';
+					}
 					val = $.trim(val.join(':')) + ' '+ curCfg.meridian[fVal];
 				}
 				return val;
@@ -2006,6 +2081,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			time: function(val){
 				var fVal;
 				if(val && curCfg.meridian){
+					if(val.substr(0,2) === "12"){ 
+						val = "00" + val.substr(2);
+					}
 					if(val.indexOf(curCfg.meridian[1]) != -1){
 						val = val.split(':');
 						fVal = (val[0] * 1);
@@ -2091,7 +2169,10 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				if(hintValue.length == 2){
 					hintValue = opts.splitInput ? 
 						hintValue : 
-						curCfg.patterns.d.replace('yy', hintValue[0]).replace('mm', hintValue[1]);
+						curCfg.date.showMonthAfterYear ?
+							hintValue[0] +' '+hintValue[1] :
+							
+							hintValue[1] +' '+ hintValue[0];
 				} else {
 					hintValue = opts.splitInput ?
 						[val, val] :
@@ -2466,10 +2547,18 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 								}
 								try {
 									that.elemHelper[name](factor);
+									
 									ret = that.elemHelper.prop('value');
+									
+								} catch (er) {
+									if(!o.value && that.maxAsNumber >= that.minAsNumber){
+										ret = o.defValue;
+									}
+								}
+								if(ret !== false && o.value != ret){
 									that.value(ret);
 									eventTimer.call('input', ret);
-								} catch (er) {}
+								}
 								return ret;
 							}
 						};
@@ -2535,15 +2624,6 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				
 				initChangeEvents();
 			},
-			value: function(val, force){
-				if(!this._init || force || val !== this.options.value){
-					this.element.val(this.formatValue(val));
-					this.options.value = val;
-					this._propertyChange('value');
-					this.mirrorValidity();
-				}
-				
-			},
 			required: function(val, boolVal){
 				this.inputElements.attr({'aria-required': ''+boolVal});
 				this.mirrorValidity();
@@ -2560,7 +2640,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			formatValue: function(val, noSplit){
 				return formatVal[this.type](val, noSplit === false ? false : this.options);
 			},
-			createOpts: ['readonly', 'title', 'disabled', 'tabindex', 'placeholder', 'value', 'required'],
+			createOpts: ['readonly', 'title', 'disabled', 'tabindex', 'placeholder', 'defaultValue', 'value', 'required'],
 			placeholder: function(val){
 				var options = this.options;
 				options.placeholder = val;
@@ -2630,6 +2710,16 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			}
 		};
 		
+		['defaultValue', 'value'].forEach(function(name){
+			wsWidgetProto[name] = function(val, force){
+				if(!this._init || force || val !== this.options[name]){
+					this.element.prop(name, this.formatValue(val));
+					this.options[name] = val;
+					this._propertyChange(name);
+					this.mirrorValidity();
+				}
+			};
+		});
 		
 		['readonly', 'disabled'].forEach(function(name){
 			var isDisabled = name == 'disabled';
@@ -2683,7 +2773,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				}
 				this._init = true;
 			},
-			createOpts: ['step', 'min', 'max', 'readonly', 'title', 'disabled', 'tabindex', 'placeholder', 'value', 'required'],
+			createOpts: ['step', 'min', 'max', 'readonly', 'title', 'disabled', 'tabindex', 'placeholder', 'defaultValue', 'value', 'required'],
 			_addSplitInputs: function(){
 				if(!this.inputElements){
 					var create = splitInputs[this.type]._create(this.options);
@@ -2753,9 +2843,47 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				this.options.step = val;
 				this.elemHelper.prop('step', retDefault(val, defStep.step));
 				this.mirrorValidity();
+			},
+			_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 {
+					this.elemHelper.prop('value', val);
+					this.options.defValue = "";
+				}
 			}
 		});
 		
+		['defaultValue', 'value'].forEach(function(name){
+			var isValue = name == 'value';
+			spinBtnProto[name] = function(val, force){
+				if(!this._init || force || this.options[name] !== val){
+					if(isValue){
+						this._beforeValue(val);
+					}
+					
+					val = formatVal[this.type](val, this.options);
+					if(this.options.splitInput){
+						$.each(this.splits, function(i, elem){
+							var setOption;
+							if(!(name in elem) && !isValue && $.nodeName(elem, 'select')){
+								$('option[value="'+ val[i] +'"]', elem).prop('defaultSelected', true);
+							} else {
+								$.prop(elem, name, val[i]);
+							}
+						});
+					} else {
+						this.element.prop(name, val);
+					}
+					this._propertyChange(name);
+					this.mirrorValidity();
+				}
+			};
+		});
+		
 		$.each({min: 1, max: -1}, function(name, factor){
 			var numName = name +'AsNumber';
 			spinBtnProto[name] = function(val){
@@ -3159,10 +3287,12 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		var inputTypes = {
 			
 		};
+		var boolAttrs = {disabled: 1, required: 1, readonly: 1};
 		var copyProps = [
 			'disabled',
 			'readonly',
 			'value',
+			'defaultValue',
 			'min',
 			'max',
 			'step',
@@ -3180,14 +3310,18 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				if(!stopCircular){
 					var shadowData = webshims.data(this, 'shadowData');
 					if(shadowData && shadowData.data && shadowData.nativeElement === this && shadowData.data[fnName]){
-						shadowData.data[fnName](val, boolVal);
+						if(boolAttrs[fnName]){
+							shadowData.data[fnName](val, boolVal);
+						} else {
+							shadowData.data[fnName](val);
+						}
 					}
 				}
 			});
 		});
 		
 		if(options.replaceUI && 'valueAsNumber' in document.createElement('input')){
-			var reflectFn = function(val){
+			var reflectFn = function(){
 				if(webshims.data(this, 'hasShadow')){
 					$.prop(this, 'value', $.prop(this, 'value'));
 				}
@@ -3195,6 +3329,20 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			
 			webshims.onNodeNamesPropertyModify('input', 'valueAsNumber', reflectFn);
 			webshims.onNodeNamesPropertyModify('input', 'valueAsDate', reflectFn);
+			$.each({stepUp: 1, stepDown: -1}, function(name, stepFactor){
+				var stepDescriptor = webshims.defineNodeNameProperty('input', name, {
+					prop: {
+						value: function(){
+							var ret;
+							if(stepDescriptor.prop && stepDescriptor.prop._supvalue){
+								ret = stepDescriptor.prop._supvalue.apply(this, arguments);
+								reflectFn.apply(this, arguments);
+							}
+							return ret;
+						}
+					}
+				});
+			});
 		}
 		
 		var extendType = (function(){
@@ -3214,7 +3362,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				$(data.orig).removeClass('ws-important-hide');
 				$.style( data.orig, 'display', '' );
 				var hasButtons, marginR, marginL;
-				var correctWidth = 0.6;
+				var correctWidth = 0.8;
 				if(!init || data.orig.offsetWidth){
 					hasButtons = data.buttonWrapper && data.buttonWrapper.filter(isVisible).length;
 					marginR = $.css( data.orig, 'marginRight');
@@ -3238,7 +3386,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 							;
 						} else {
 							data.buttonWrapper.css('marginRight', marginR);
-							correctWidth = data.buttonWrapper.outerWidth(true) + 0.6;
+							correctWidth = data.buttonWrapper.outerWidth(true) + correctWidth;
 						}
 					}
 					
@@ -3396,7 +3544,29 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			});
 		}
 		
-		if(!modernizrInputTypes.range || options.replaceUI){
+		var replace = {};
+		
+		
+		if(options.replaceUI){
+			if( $.isPlainObject(options.replaceUI) ){
+				$.extend(replace, options.replaceUI);
+			} else {
+				$.extend(replace, {
+					'range': 1,
+					'number': 1,
+					'time': 1, 
+					'month': 1, 
+					'date': 1, 
+					'color': 1, 
+					'datetime-local': 1
+				});
+			}
+		}
+		if(modernizrInputTypes.number && navigator.userAgent.indexOf('Touch') == -1 && ((/MSIE 1[0|1]\.\d/.test(navigator.userAgent)) || (/Trident\/7\.0/.test(navigator.userAgent)))){
+			replace.number = 1;
+		}
+		
+		if(!modernizrInputTypes.range || replace.range){
 			extendType('range', {
 				_create: function(opts, set){
 					var data = $('<span />').insertAfter(opts.orig).rangeUI(opts).data('rangeUi');
@@ -3405,9 +3575,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			});
 		}
 		
-		var isStupid = modernizrInputTypes.number && navigator.userAgent.indexOf('Touch') == -1 && ((/MSIE 1[0|1]\.\d/.test(navigator.userAgent)) || (/Trident\/7\.0/.test(navigator.userAgent)));
+		
 		['number', 'time', 'month', 'date', 'color', 'datetime-local'].forEach(function(name){
-			if(!modernizrInputTypes[name] || options.replaceUI || (name == 'number' && isStupid)){
+			if(!modernizrInputTypes[name] || replace[name]){
 				extendType(name, {
 					_create: function(opts, set){
 						if(opts.monthSelect){