webshims-rails 1.12.0 → 1.12.2

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

@@ -609,7 +609,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 								setTimeout(trigger, 0);
 							}
 							
-						}, (e.type == 'resize' && !window.requestAnimationFrame) ? 50 : 0);
+						}, (e.type == 'resize' && !window.requestAnimationFrame) ? 50 : 9);
 					};
 				})(),
 				_create: function(){
@@ -634,7 +634,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 						setInterval(this.test, 600);
 						$(this.test);
 						webshims.ready('WINDOWLOAD', this.test);
-						$(document).on('updatelayout pageinit collapsibleexpand shown.bs.modal shown.bs.collapse slid.bs.carousel', this.handler);
+						$(document).on('updatelayout.webshim pageinit popupafteropen panelbeforeopen tabsactivate collapsibleexpand shown.bs.modal shown.bs.collapse slid.bs.carousel', this.handler);
 						$(window).on('resize', this.handler);
 						(function(){
 							var oldAnimate = $.fn.animate;
@@ -1081,10 +1081,10 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	});
 	
 	webshims.isReady('webshimLocalization', true);
-});
-//html5a11y
-(function($, document){
-	if(!$.webshims.assumeARIA || ('content' in document.createElement('template'))){return;}
+
+//html5a11y + hidden attribute
+(function(){
+	if(('content' in document.createElement('template'))){return;}
 	
 	$(function(){
 		var main = $('main').attr({role: 'main'});
@@ -1099,6 +1099,8 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		return;
 	}
 	
+	webshims.defineNodeNamesBooleanProperty(['*'], 'hidden');
+	
 	var elemMappings = {
 		article: "article",
 		aside: "complementary",
@@ -1139,7 +1141,9 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		}
 	});
 	
-})(webshims.$, document);;
+})();
+});
+;
 webshims.register('form-core', function($, webshims, window, document, undefined, options){
 	"use strict";
 
@@ -1617,6 +1621,9 @@ $.event.special.invalid = {
 		var notValid = !($(e.target).callProp('reportValidity'));
 		if(notValid){
 			e.stopImmediatePropagation();
+			if(!options.noFormInvalid){
+				$(e.target).trigger('invalid');
+			}
 			return false;
 		}
 	}
@@ -2652,7 +2659,13 @@ webshims.defineNodeNamesProperties(['input', 'button'], formSubmitterDescriptors
 				lazyLoad('WINDOWLOAD');
 				
 				if(webshims.isReady('form-datalist-lazy')){
-					this._lazyCreate(opts);
+					if(window.QUnit){
+						that._lazyCreate(opts);
+					} else {
+						setTimeout(function(){
+							that._lazyCreate(opts);
+						}, 9);
+					}
 				} else {
 					$(opts.input).one('focus', lazyLoad);
 					webshims.ready('form-datalist-lazy', function(){

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

@@ -1060,7 +1060,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 								setTimeout(trigger, 0);
 							}
 							
-						}, (e.type == 'resize' && !window.requestAnimationFrame) ? 50 : 0);
+						}, (e.type == 'resize' && !window.requestAnimationFrame) ? 50 : 9);
 					};
 				})(),
 				_create: function(){
@@ -1085,7 +1085,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 						setInterval(this.test, 600);
 						$(this.test);
 						webshims.ready('WINDOWLOAD', this.test);
-						$(document).on('updatelayout pageinit collapsibleexpand shown.bs.modal shown.bs.collapse slid.bs.carousel', this.handler);
+						$(document).on('updatelayout.webshim pageinit popupafteropen panelbeforeopen tabsactivate collapsibleexpand shown.bs.modal shown.bs.collapse slid.bs.carousel', this.handler);
 						$(window).on('resize', this.handler);
 						(function(){
 							var oldAnimate = $.fn.animate;
@@ -1532,10 +1532,10 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	});
 	
 	webshims.isReady('webshimLocalization', true);
-});
-//html5a11y
-(function($, document){
-	if(!$.webshims.assumeARIA || ('content' in document.createElement('template'))){return;}
+
+//html5a11y + hidden attribute
+(function(){
+	if(('content' in document.createElement('template'))){return;}
 	
 	$(function(){
 		var main = $('main').attr({role: 'main'});
@@ -1550,6 +1550,8 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		return;
 	}
 	
+	webshims.defineNodeNamesBooleanProperty(['*'], 'hidden');
+	
 	var elemMappings = {
 		article: "article",
 		aside: "complementary",
@@ -1590,7 +1592,9 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		}
 	});
 	
-})(webshims.$, document);;
+})();
+});
+;
 webshims.register('form-core', function($, webshims, window, document, undefined, options){
 	"use strict";
 
@@ -2068,6 +2072,9 @@ $.event.special.invalid = {
 		var notValid = !($(e.target).callProp('reportValidity'));
 		if(notValid){
 			e.stopImmediatePropagation();
+			if(!options.noFormInvalid){
+				$(e.target).trigger('invalid');
+			}
 			return false;
 		}
 	}
@@ -3103,7 +3110,13 @@ webshims.defineNodeNamesProperties(['input', 'button'], formSubmitterDescriptors
 				lazyLoad('WINDOWLOAD');
 				
 				if(webshims.isReady('form-datalist-lazy')){
-					this._lazyCreate(opts);
+					if(window.QUnit){
+						that._lazyCreate(opts);
+					} else {
+						setTimeout(function(){
+							that._lazyCreate(opts);
+						}, 9);
+					}
 				} else {
 					$(opts.input).one('focus', lazyLoad);
 					webshims.ready('form-datalist-lazy', function(){

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

@@ -620,8 +620,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 		_create: function(){
 			var i;
 			
-			
-			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.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 data-value="" data-valuetext="" /></span></span>');
 			this.trail = $('.ws-range-track', this.element);
 			this.range = $('.ws-range-progress', this.element);
 			this.thumb = $('.ws-range-thumb', this.trail);
@@ -643,7 +642,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 		},
 		value: $.noop,
 		_value: function(val, _noNormalize, animate){
-			var left, posDif, textValue;
+			var left, posDif;
 			var o = this.options;
 			var oVal = val;
 			var thumbStyle = {};
@@ -659,7 +658,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			left =  100 * ((val - o.min) / (o.max - o.min));
 			
 			if(this._init && val == o.value && oVal == val){return;}
-			this.options.value = val;
+			o.value = val;
 			
 			if($.fn.stop){
 				this.thumb.stop();
@@ -667,6 +666,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			}
 			
 			rangeStyle[this.dirs.width] = left+'%';
+			
 			if(this.vertical){
 				left = Math.abs(left - 100);
 			}
@@ -693,15 +693,26 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 				this.options._change(val);
 			}
 			
-			textValue = this.options.textValue ? this.options.textValue(this.options.value) : this.options.options[this.options.value] || this.options.value;
+			this._setValueMarkup();
+		},
+		_setValueMarkup: function(){
+			var o = this.options;
+			var textValue = o.textValue ? o.textValue(this.options.value) : o.options[o.value] || o.value;
 			this.element.attr({
 				'aria-valuenow': this.options.value,
 				'aria-valuetext': textValue
 			});
-			this.thumb.attr({
+			$('span', this.thumb).attr({
 				'data-value': this.options.value,
 				'data-valuetext': textValue
 			});
+			if(o.selectedOption){
+				$(o.selectedOption).removeClass('ws-selected-option');
+				o.selectedOption = null;
+			}
+			if(o.value in o.options){
+				o.selectedOption = $('[data-value="'+o.value+'"].ws-range-ticks').addClass('ws-selected-option');
+			}
 		},
 		initDataList: function(){
 			if(this.orig){
@@ -744,9 +755,9 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			$.each(o.options, function(val, label){
 				if(!isNumber(val) || val < min || val > max){return;}
 				var left = 100 * ((val - min) / (max - min));
-				var attr = '';
+				var attr = 'data-value="'+val+'"';
 				if(label){
-					attr += 'data-label="'+label+'"';
+					attr += ' data-label="'+label+'"';
 					if(o.showLabels){
 						attr += ' title="'+label+'"';
 					}
@@ -759,6 +770,9 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 					$('<span class="ws-range-ticks"'+ attr +' style="'+(that.dirs.left)+': '+left+'%;" />').appendTo(trail)
 				);
 			});
+			if(o.value in o.options){
+				this._setValueMarkup();
+			}
 		},
 		readonly: function(val){
 			val = !!val;
@@ -802,12 +816,13 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			var step = val == 'any' ? 'any' : retDefault(val, 1);
 			
 			if(o.stepping){
-				if(step != 'any' && o.stepping % step){
-					webshims.error('wrong stepping value for type range:'+ (o.stepping % step));
-				} else {
-					step = o.stepping;
-				}
+				webshims.error('stepping was removed. Use stepfactor instead.');
+			}
+
+			if(o.stepfactor && step != 'any'){
+				step *= o.stepfactor;
 			}
+
 			o.step = step;
 			this.value(this.options.value);
 		},
@@ -845,11 +860,11 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			var val, valModStep, alignValue, step;
 			
 			if(pos <= 0){
-				val = this.options[this.dirs.min];
+				val = this.options[this.dirs[this.isRtl ? 'max' : 'min']];
 			} else if(pos > 100) {
-				val = this.options[this.dirs.max];
+				val = this.options[this.dirs[this.isRtl ? 'min' : 'max']];
 			} else {
-				if(this.vertical){
+				if(this.vertical || this.isRtl){
 					pos = Math.abs(pos - 100);
 				}
 				val = ((this.options.max - this.options.min) * (pos / 100)) + this.options.min;
@@ -934,17 +949,20 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 					return e;
 				};
 			})();
+			var updateValue = function(val, animate){
+				if(val != o.value){
+					that.value(val, false, animate);
+					eventTimer.call('input', val);
+				}
+			};
 			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){
-					that.value(val, false, animate);
-					eventTimer.call('input', val);
-				}
+				updateValue(that.getStepedValueFromPos((e[that.dirs.mouse] - leftOffset) * widgetUnits), animate);
+				
 				if(e && e.type == 'mousemove'){
 					e.preventDefault();
 				}
@@ -982,7 +1000,12 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 					outerWidth = that.thumb[that.dirs.outerWidth]();
 					leftOffset = leftOffset[that.dirs.pos];
 					widgetUnits = 100 / widgetUnits;
-					setValueFromPos(e, o.animate);
+
+					if(e.target.className == 'ws-range-ticks'){
+						updateValue(e.target.getAttribute('data-value'), o.animate);
+					} else {
+						setValueFromPos(e, o.animate);
+					}
 					isActive = true;
 					$(document)
 						.on(e.type == 'touchstart' ?
@@ -1028,6 +1051,13 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 					var step = true;
 					var code = e.keyCode;
 					if(!o.readonly && !o.disabled){
+						if(that.isRtl){
+							if(code == 39){
+								code = 37;
+							} else if(code == 37){
+								code = 39;
+							}
+						}
 						if (code == 39 || code == 38) {
 							that.doStep(1);
 						} else if (code == 37 || code == 40) {
@@ -1127,10 +1157,17 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 				{mouse: 'pageY', pos: 'top', min: 'max', max: 'min', left: 'top', right: 'bottom', width: 'height', innerWidth: 'innerHeight', innerHeight: 'innerWidth', outerWidth: 'outerHeight', outerHeight: 'outerWidth', marginTop: 'marginLeft', marginLeft: 'marginTop'} :
 				{mouse: 'pageX', pos: 'left', min: 'min', max: 'max', left: 'left', right: 'right', width: 'width', innerWidth: 'innerWidth', innerHeight: 'innerHeight', outerWidth: 'outerWidth', outerHeight: 'outerHeight', marginTop: 'marginTop', marginLeft: 'marginLeft'}
 			;
+			if(!this.vertical && this.element.css('direction') == 'rtl'){
+				this.isRtl = true;
+				this.dirs.left = 'right';
+				this.dirs.right = 'left';
+				this.dirs.marginLeft = 'marginRight';
+			}
 			this.element
 				[this.vertical ? 'addClass' : 'removeClass']('vertical-range')
-				[this.vertical ? 'addClass' : 'removeClass']('horizontal-range')
+				[this.isRtl ? 'addClass' : 'removeClass']('ws-is-rtl')
 			;
+			this.updateMetrics = this.posCenter;
 			this.posCenter();
 		}
 	};
@@ -1167,7 +1204,8 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 	if(window.webshims && webshims.isReady){
 		webshims.isReady('range-ui', true);
 	}
-})(window.webshims ? webshims.$ : jQuery);;webshims.register('form-number-date-ui', function($, webshims, window, document, undefined, options){
+})(window.webshims ? webshims.$ : jQuery);
+;webshims.register('form-number-date-ui', function($, webshims, window, document, undefined, options){
 	"use strict";
 	var curCfg;
 	var formcfg = webshims.formcfg;
@@ -1177,9 +1215,9 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 		e.stopImmediatePropagation();
 	};
 	var getMonthOptions = function(opts){
-		var selectName = 'monthSelect'+opts.formatMonthNames;
+		var selectName = 'monthSelect'+opts.monthNames;
 		if(!curCfg[selectName]){
-			var labels = curCfg.date[opts.formatMonthNames] || monthDigits;
+			var labels = curCfg.date[opts.monthNames] || monthDigits;
 			curCfg[selectName] = ('<option value=""></option>')+$.map(monthDigits, function(val, i){
 				return '<option value="'+val+'"]>'+labels[i]+'</option>';
 			}).join('');
@@ -1204,13 +1242,39 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			curCfg.patterns[name+'Obj'] = obj;
 		}
 	};
+	var createYearSelect = function(obj, opts){
+		var options, nowY, max, min;
+		if(opts.yearSelect){
+			nowY = parseInt(opts.value.split('-')[0], 10);
+			max = opts.max.split('-');
+			min = opts.min.split('-');
+			options = webshims.picker.createYearSelect(nowY || parseInt(min[0], 10) || parseInt(max[0], 10) || nowYear, max, min);
+			options.unshift('<option />');
+			$(obj.elements)
+				.filter('select.yy')
+				.html(options.join(''))
+				.each(function(){
+					if(!nowY){
+						$('option[selected]', this).removeAttr('selected');
+						$(this).val();
+					}
+				})
+			;
+		}
+	};
 	var splitInputs = {
 		date: {
 			_create: function(opts){
 				var obj = {
-					splits: [$('<input type="text" class="yy" size="4" inputmode="numeric" maxlength="4" />')[0]] 
+					splits: [] 
 				};
 				
+				if(opts.yearSelect){
+					obj.splits.push($('<select class="yy"></select>')[0]);
+				} else {
+					obj.splits.push($('<input type="text" class="yy" size="4" inputmode="numeric" maxlength="4" />')[0]);
+				}
+				
 				if(opts.monthSelect){
 					obj.splits.push($('<select class="mm">'+getMonthOptions(opts)+'</select>')[0]);
 				} else {
@@ -1223,6 +1287,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 				}
 				
 				obj.elements = [obj.splits[0], $('<span class="ws-input-seperator" />')[0], obj.splits[1], $('<span class="ws-input-seperator" />')[0], obj.splits[2]];
+				createYearSelect(obj, opts);
 				return obj;
 			},
 			sort: function(element){
@@ -1247,8 +1312,15 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			_create: function(opts){
 				
 				var obj = {
-					splits: [$('<input type="text" class="yy" inputmode="numeric" size="4" />')[0]] 
+					splits: [] 
 				};
+				
+				if(opts.yearSelect){
+					obj.splits.push($('<select class="yy"></select>')[0]);
+				} else {
+					obj.splits.push($('<input type="text" class="yy" size="4" inputmode="numeric" maxlength="4" />')[0]);
+				}
+				
 				if(opts.monthSelect){
 					obj.splits.push($('<select class="mm">'+getMonthOptions(opts)+'</select>')[0]);
 				} else {
@@ -1259,6 +1331,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 				}
 				
 				obj.elements = [obj.splits[0], $('<span class="ws-input-seperator" />')[0], obj.splits[1]];
+				createYearSelect(obj, opts);
 				return obj;
 			},
 			sort: function(element){
@@ -1278,7 +1351,8 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 	};
 	
 	var nowDate = new Date(new Date().getTime() - (new Date().getTimezoneOffset() * 60 * 1000 ));
-	nowDate = new Date(nowDate.getFullYear(), nowDate.getMonth(), nowDate.getDate(), nowDate.getHours()).getTime()
+	var nowYear = nowDate.getFullYear();
+	nowDate = new Date(nowDate.getFullYear(), nowDate.getMonth(), nowDate.getDate(), nowDate.getHours()).getTime();
 	var steps = {
 		number: {
 			step: 1
@@ -1488,9 +1562,6 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			$(document).triggerHandler('wslocalechange');
 		};
 		
-		
-		
-		
 		curCfg = webshims.activeLang(formcfg);
 		
 		triggerLocaleChange();
@@ -1515,7 +1586,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 		
 		
 		var formatVal = {
-			number: function(val){
+			number: function(val, o){
 				return (val+'').replace(/\,/g, '').replace(/\./, curCfg.numberFormat['.']);
 			},
 			time: function(val){
@@ -1552,7 +1623,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 				var names;
 				var p = val.split('-');
 				if(p[0] && p[1]){
-					names = curCfg.date[options.formatMonthNames] || curCfg.date[options.monthNames] || curCfg.date.monthNames;
+					names = curCfg.date[options.monthNames] || curCfg.date.monthNames;
 					p[1] = names[(p[1] * 1) - 1];
 					if(options && options.splitInput){
 						val = [p[0] || '', p[1] || ''];
@@ -1873,7 +1944,15 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 					})
 					.on({
 						'change input focus focusin blur focusout': function(e){
+							var oVal, nVal;
 							$(e.target).trigger('ws__'+e.type);
+							if(o.toFixed && o.type == 'number' && e.type == 'change'){
+								oVal = that.element.prop('value');
+								nVal = that.toFixed(oVal, true);
+								if(oVal != nVal){
+									that.element[0].value = nVal;
+								}
+							}
 						}
 					})
 					
@@ -2022,11 +2101,14 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 					this.inputElements.attr('inputmode', 'numeric');
 				}
 				
-				
-				
 				if((!o.max && typeof o.relMax == 'number') || (!o.min && typeof o.relMin == 'number')){
-					webshims.error('relMax/relMin are not supported anymore')
+					webshims.error('relMax/relMin are not supported anymore calculate at set it your own.');
 				}
+
+				if(this.options.relDefaultValue){
+					webshims.warn('relDefaultValue was removed use startValue instead!');
+				}
+
 				this._init = true;
 			},
 			createOpts: ['step', 'min', 'max', 'readonly', 'title', 'disabled', 'tabindex', 'placeholder', 'defaultValue', 'value', 'required'],
@@ -2037,17 +2119,9 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 					this.inputElements = $(create.elements).prependTo(this.element).filter('input, select');
 				}
 			},
-			
-			getRelNumber: function(rel){
-				var start = steps[this.type].start || 0;
-				if(rel){
-					start += rel;
-				}
-				return start;
-			},
 			addZero: addZero,
 			_setStartInRange: function(){
-				var start = this.getRelNumber(this.options.relDefaultValue);
+				var start = this.options.startValue && this.asNumber( this.options.startValue ) || steps[this.type].start || 0;
 				if(!isNaN(this.minAsNumber) && start < this.minAsNumber){
 					start = this.minAsNumber;
 				} else if(!isNaN(this.maxAsNumber) && start > this.maxAsNumber){
@@ -2059,7 +2133,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			},
 			reorderInputs: function(){
 				if(splitInputs[this.type]){
-					var element = this.element;
+					var element = this.element.attr('dir', curCfg.date.isRTL ? 'rtl' : 'ltr');
 					splitInputs[this.type].sort(element, this.options);
 					setTimeout(function(){
 						var data = webshims.data(element);
@@ -2085,6 +2159,13 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 					this.elemHelper.prop('value', val);
 					this.options.defValue = "";
 				}
+			},
+			toFixed: function(val, force){
+				var o = this.options;
+				if(o.toFixed && o.type == 'number' && val && this.valueAsNumber && (force || !this.element.is(':focus')) && (!o.fixOnlyFloat || (this.valueAsNumber % 1)) && !$(this.orig).is(':invalid')){
+					val = formatVal[this.type](this.valueAsNumber.toFixed(o.toFixed), this.options);
+				}
+				return val;
 			}
 		});
 		
@@ -2097,7 +2178,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 					} else {
 						this.elemHelper.prop(name, val);
 					}
-					
+
 					val = formatVal[this.type](val, this.options);
 					if(this.options.splitInput){
 						$.each(this.splits, function(i, elem){
@@ -2109,7 +2190,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 							}
 						});
 					} else {
-						this.element.prop(name, val);
+						this.element.prop(name, this.toFixed(val));
 					}
 					this._propertyChange(name);
 					this.mirrorValidity();
@@ -2126,6 +2207,9 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 					this._setStartInRange();
 				}
 				this.options[name] = val;
+				if(this._init){
+					createYearSelect({elements: this.inputElements}, this.options);
+				}
 				this._propertyChange(name);
 				this.mirrorValidity();
 			};
@@ -2146,7 +2230,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 		
 		$.fn.spinbtnUI = function(opts){
 			opts = $.extend({
-				monthNames: 'monthNames'
+				monthNames: 'monthNamesShort'
 			}, opts);
 			return this.each(function(){
 				$.webshims.objectCreate(spinBtnProto, {
@@ -2176,6 +2260,53 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			isVisible: true
 		};
 		
+		picker.isInRange = function(value, max, min){
+			return !((min[0] && min[0] > value[0]) || (max[0] && max[0] < value[0]));
+		};
+		
+		
+		picker.createYearSelect = function(value, max, min, valueAdd, stepper){
+			if(!stepper){
+				stepper = {start: value, step: 1, label: value};
+			}
+			var temp;
+			var goUp = true;
+			var goDown = true;
+			var options = ['<option selected="">'+ stepper.label + '</option>'];
+			var i = 0;
+			var createOption = function(value, add){
+				var value2, label;
+				if(stepper.step > 1){
+					value2 = value + stepper.step - 1;
+					label = value+' – '+value2;
+				} else {
+					label = value;
+				}
+				
+				if(picker.isInRange([value], max, min) || (value2 && picker.isInRange([value2], max, min))){
+					options[add]('<option value="'+ (value+valueAdd) +'">'+ label +'</option>');
+					return true;
+				}
+			};
+			if(!valueAdd){
+				valueAdd = '';
+			}
+			while(i < 18 && (goUp || goDown)){
+				i++;
+				if(goUp){
+					temp = stepper.start - (i * stepper.step);
+					goUp = createOption(temp, 'unshift');
+				}
+				if(goDown){
+					temp = stepper.start + (i * stepper.step);
+					goDown = createOption(temp, 'push');
+				}
+				
+			}
+			
+			return options;
+		};
+		
 		picker._genericSetFocus = function(element, _noFocus){
 			element = $(element || this.activeButton);
 			
@@ -2185,12 +2316,12 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 					clearTimeout(that.timer);
 					that.timer = setTimeout(function(){
 						if(element[0]){
-							element[0].focus();
+							element.trigger('focus');
 							if(noTrigger !== true && !element.is(':focus')){
 								setFocus(true);
 							}
 						}
-					}, that.popover.isVisible ? 99 : 360);
+					}, that.popover.isVisible ? 0 : 360);
 				};
 				this.popover.activateElement(element);
 				setFocus();
@@ -2403,7 +2534,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 								popover.preventBlur();
 							}
 						},
-						mousedown: function(){
+						mousedown: function(e){
 							mouseFocus = true;
 							setTimeout(resetMouseFocus, 9);
 							if(options.buttonOnly && popover.isVisible && popover.activeElement){
@@ -2561,31 +2692,41 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			var updateStyles = function(){
 				$(data.orig).removeClass('ws-important-hide');
 				$.style( data.orig, 'display', '' );
-				var hasButtons, marginR, marginL;
+				var hasButtons, marginR, marginL, left, right, isRtl;
 				var correctWidth = 0.8;
 				if(!init || data.orig.offsetWidth){
 					hasButtons = data.buttonWrapper && data.buttonWrapper.filter(isVisible).length;
-					marginR = $.css( data.orig, 'marginRight');
-					data.element.css({
-						marginLeft: $.css( data.orig, 'marginLeft'),
-						marginRight: hasButtons ? 0 : marginR
-					});
+					
+					isRtl = hasButtons && data.buttonWrapper.css('direction') == 'rtl';
+					if(isRtl){
+						left = 'Right';
+						right = 'Left';
+					} else {
+						left = 'Left';
+						right = 'Right';
+					}
+					
+					marginR = $.css( data.orig, 'margin'+right);
+					
+					data.element
+						.css('margin'+left, $.css( data.orig, 'margin'+left))
+						.css('margin'+right, hasButtons ? 0 : marginR)
+					;
 					
 					if(hasButtons){
-						marginL = (parseInt(data.buttonWrapper.css('marginLeft'), 10) || 0);
-						data.element.css({paddingRight: ''});
+						data.buttonWrapper[isRtl ? 'addClass' : 'removeClass']('ws-is-rtl');
+						marginL = (parseInt(data.buttonWrapper.css('margin'+left), 10) || 0);
+						data.element.css('padding'+right, '');
 						
 						if(marginL < 0){
 							marginR = (parseInt(marginR, 10) || 0) + ((data.buttonWrapper.outerWidth() + marginL) * -1);
-							data.buttonWrapper.css('marginRight', marginR);
+							data.buttonWrapper.css('margin'+right, marginR);
 							data.element
-								.css({paddingRight: ''})
-								.css({
-									paddingRight: (parseInt( data.element.css('paddingRight'), 10) || 0) + data.buttonWrapper.outerWidth()
-								})
+								.css('padding'+right, '')
+								.css('padding'+right, (parseInt( data.element.css('padding'+right), 10) || 0) + data.buttonWrapper.outerWidth())
 							;
 						} else {
-							data.buttonWrapper.css('marginRight', marginR);
+							data.buttonWrapper.css('margin'+right, marginR);
 							correctWidth = data.buttonWrapper.outerWidth(true) + correctWidth;
 						}
 					}
@@ -2603,7 +2744,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			
 			var type = $.prop(this, 'type');
 			
-			var i, opts, data, optsName, labels;
+			var i, opts, data, optsName, labels, cNames;
 			if(inputTypes[type] && webshims.implement(this, 'inputwidgets')){
 				data = {};
 				optsName = type;
@@ -2641,17 +2782,38 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 						opts[optsName] = $.attr(this, copyAttrs[i]) || opts[optsName];
 					}
 				}
-				
-				if(opts.onlyMonthDigits || (!opts.formatMonthNames && opts.monthSelect)){
-					opts.formatMonthNames = 'monthDigits';
+				if(opts.formatMonthNames){
+					webshims.error('formatMonthNames was renamded to monthNames');
+				}
+				if(opts.onlyMonthDigits){
+					opts.monthNames = 'monthDigits';
 				}
 				data.shim = inputTypes[type]._create(opts);
-				
+
 				webshims.addShadowDom(this, data.shim.element, {
 					data: data.shim || {}
 				});
 				
 				data.shim.options.containerElements.push(data.shim.element[0]);
+				cNames = $.prop(this, 'className');
+				if(opts.classes){
+					cNames += ' '+opts.classes;
+				}
+				
+				if(opts.splitInput || type == 'range'){
+					cNames = cNames.replace('form-control', '');
+				}
+				
+				data.shim.element.on('change input', stopPropagation).addClass(cNames);
+				
+				if(data.shim.buttonWrapper){
+					
+					data.shim.buttonWrapper.addClass('input-button-size-'+(data.shim.buttonWrapper.children().filter(isVisible).length));
+					
+					if(data.shim.buttonWrapper.filter(isVisible).length){
+						data.shim.element.addClass('has-input-buttons');
+					}
+				}
 				
 				labelWidth($(this).getShadowFocusElement(), labels);
 				
@@ -2683,14 +2845,13 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 										$(opts.orig).trigger(hasFocus ? 'focusin' : 'focusout');
 									}
 									hasFocusTriggered = hasFocus;
-								}, 0);
+								}, 9);
 							}
 						})
 					;
 				})();
-								
 				
-				data.shim.element.on('change input', stopPropagation);
+				
 				
 				if(hasFormValidation){
 					$(opts.orig).on('firstinvalid', function(e){
@@ -2706,13 +2867,6 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 					});
 				}
 				
-				
-				if(data.shim.buttonWrapper && data.shim.buttonWrapper.filter(isVisible).length){
-					data.shim.element.addClass('has-input-buttons');
-				}
-				
-				data.shim.element.addClass($.prop(this, 'className'));
-				
 				if(opts.calculateWidth){
 					sizeInput(data.shim);
 				} else {
@@ -2774,7 +2928,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			if(!modernizrInputTypes[name] || replace[name]){
 				extendType(name, {
 					_create: function(opts, set){
-						if(opts.monthSelect || opts.daySelect){
+						if(opts.monthSelect || opts.daySelect || opts.yearSelect){
 							opts.splitInput = true;
 						}
 						if(opts.splitInput && !splitInputs[name]){
@@ -2793,7 +2947,6 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 						if(webshims.picker && webshims.picker[name]){
 							webshims.picker[name](data);
 						}
-						data.buttonWrapper.addClass('input-button-size-'+(data.buttonWrapper.children().filter(isVisible).length));
 						return data;
 					}
 				});