webshims-rails 1.11.6.1 → 1.12.0

data/vendor/assets/javascripts/webshims/shims/dom-extend.js

@@ -40,34 +40,6 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		webshims.ready('WINDOWLOAD', switch$);
 		
 	}
-//	(function(){
-//		var hostNames = {
-//			'afarkas.github.io': 1,
-//			localhost: 1,
-//			'127.0.0.1': 1
-//		};
-//		
-//		if( webshims.cfg.debug && (hostNames[location.hostname] || location.protocol == 'file:') ){
-//			var list = $('<ul class="webshims-debug-list" />');
-//			webshims.errorLog.push = function(message){
-//				list.appendTo('body');
-//				$('<li style="display: none;">'+ message +'</li>')
-//					.appendTo(list)
-//					.slideDown()
-//					.delay(3000)
-//					.slideUp(function(){
-//						$(this).remove();
-//						if(!$('li', list).length){
-//							list.detach();
-//						}
-//					})
-//				;
-//			};
-//			$.each(webshims.errorLog, function(i, message){
-//				webshims.errorLog.push(message);
-//			});
-//		}
-//	})();
 
 	//shortcus
 	var modules = webshims.modules;
@@ -509,11 +481,22 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			});
 		},
 		getOptions: (function(){
+			var normalName = /\-([a-z])/g;
 			var regs = {};
+			var nameRegs = {};
 			var regFn = function(f, upper){
 				return upper.toLowerCase();
 			};
-			return function(elem, name, bases){
+			var nameFn = function(f, dashed){
+				return dashed.toUpperCase();
+			};
+			return function(elem, name, bases, stringAllowed){
+				if(nameRegs[name]){
+					name = nameRegs[name];
+				} else {
+					nameRegs[name] = name.replace(normalName, nameFn);
+					name = nameRegs[name];
+				}
 				var data = elementData(elem, 'cfg'+name);
 				var dataName;
 				var cfg = {};
@@ -522,7 +505,12 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					return data;
 				}
 				data = $(elem).data();
-				
+				if(data && typeof data[name] == 'string'){
+					if(stringAllowed){
+						return elementData(elem, 'cfg'+name, data[name]);
+					}
+					webshims.error('data-'+ name +' attribute has to be a valid JSON, was: '+ data[name]);
+				}
 				if(!bases){
 					bases = [true, {}];
 				} else if(!Array.isArray(bases)){
@@ -531,12 +519,8 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					bases.unshift(true, {});
 				}
 				
-				if(data && data[name]){
-					if(typeof data[name] == 'object'){
-						bases.push(data[name]);
-					} else {
-						webshims.error('data-'+ name +' attribute has to be a valid JSON, was: '+ data[name]);
-					}
+				if(data && typeof data[name] == 'object'){
+					bases.push(data[name]);
 				}
 				
 				if(!regs[name]){
@@ -549,7 +533,6 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					}
 				}
 				bases.push(cfg);
-				
 				return elementData(elem, 'cfg'+name, $.extend.apply($, bases));
 			};
 		})(),
@@ -579,7 +562,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			var resizeTimer;
 			var lastHeight;
 			var lastWidth;
-			
+			var $window = $(window);
 			var docObserve = {
 				init: false,
 				runs: 0,
@@ -599,25 +582,36 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 						docObserve.runs = 0;
 					}
 				},
-				handler: function(e){
-					clearTimeout(resizeTimer);
-					resizeTimer = setTimeout(function(){
-						if(e.type == 'resize'){
-							var width = $(window).width();
-							var height = $(window).width();
-							if(height == lastHeight && width == lastWidth){
-								return;
+				handler: (function(){
+					var trigger = function(){
+						$(document).triggerHandler('updateshadowdom');
+					};
+					return function(e){
+						clearTimeout(resizeTimer);
+						resizeTimer = setTimeout(function(){
+							if(e.type == 'resize'){
+								var width = $window.width();
+								var height = $window.width();
+
+								if(height == lastHeight && width == lastWidth){
+									return;
+								}
+								lastHeight = height;
+								lastWidth = width;
+								
+								docObserve.height = docObserve.getHeight();
+								docObserve.width = docObserve.getWidth();
+							}
+
+							if(window.requestAnimationFrame){
+								requestAnimationFrame(trigger);
+							} else {
+								setTimeout(trigger, 0);
 							}
-							lastHeight = height;
-							lastWidth = width;
-							
-							docObserve.height = docObserve.getHeight();
-							docObserve.width = docObserve.getWidth();
 							
-						}
-						$(document).triggerHandler('updateshadowdom');
-					}, (e.type == 'resize') ? 50 : 9);
-				},
+						}, (e.type == 'resize' && !window.requestAnimationFrame) ? 50 : 0);
+					};
+				})(),
 				_create: function(){
 					$.each({ Height: "getHeight", Width: "getWidth" }, function(name, type){
 						var body = document.body;
@@ -955,13 +949,17 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			webshims.defineNodeNamesProperty(elementNames, prop, {
 				attr: {
 					set: function(val){
-						this.setAttribute(prop, val);
+						if(descs.useContentAttribute){
+							webshims.contentAttr(this, prop, val);
+						} else {
+							this.setAttribute(prop, val);
+						}
 						if(descs.set){
 							descs.set.call(this, true);
 						}
 					},
 					get: function(){
-						var ret = this.getAttribute(prop);
+						var ret = (descs.useContentAttribute) ? webshims.contentAttr(this, prop) : this.getAttribute(prop);
 						return (ret == null) ? undefined : prop;
 					}
 				},
@@ -1018,6 +1016,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					});
 				}
 			};
+			
 			var select = function(obj){
 				var oldLang = obj.__active;
 				var selectLang = function(i, lang){
@@ -1025,6 +1024,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					if(obj[lang] || obj.availableLangs.indexOf(lang) != -1){
 						if(obj[lang]){
 							obj.__active = obj[lang];
+							obj.__activeName = lang;
 						} else {
 							load(obj.langSrc+lang, obj, curLang.join());
 						}
@@ -1034,6 +1034,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				$.each(curLang, selectLang);
 				if(!obj.__active){
 					obj.__active = obj[''];
+					obj.__activeName = '';
 				}
 				if(oldLang != obj.__active){
 					$(obj).trigger('change');

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

@@ -139,7 +139,6 @@ webshims.register('form-combat', function($,webshims){
 	};
 	
 	webshims.addReady(function(context){
-		
 		setTimeout(function(){
 			find(context);
 		}, 4);

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

@@ -1,3 +1,4 @@
+
 webshims.register('form-core', function($, webshims, window, document, undefined, options){
 	"use strict";
 
@@ -62,6 +63,7 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 	};
 	
 	var extendSels = function(){
+		var matches, matchesOverride;
 		var exp = $.expr[":"];
 		$.extend(exp, {
 			"valid-element": function(elem){
@@ -86,7 +88,15 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 		});
 		
 		// sizzle/jQuery has a bug with :disabled/:enabled selectors
-		if(Modernizr.fieldsetdisabled && !$('<fieldset disabled=""><input /><fieldset>').find('input').is(':disabled')){
+		if(Modernizr.fieldsetdisabled && !$('<fieldset disabled=""><input /><input /></fieldset>').find(':disabled').filter(':disabled').is(':disabled')){
+			matches = $.find.matches;
+			matchesOverride = {':disabled': 1, ':enabled': 1};
+			$.find.matches = function(expr, elements){
+				if(matchesOverride[expr]){
+					return matches.call(this, '*'+expr, elements);
+				}
+				return matches.apply(this, arguments);
+			};
 			$.extend(exp, {
 				"enabled": function( elem ) {
 					return elem.disabled === false && !$(elem).is('fieldset[disabled] *');
@@ -190,7 +200,7 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 		if(webshims.errorbox && webshims.errorbox.initIvalContentMessage){
 			webshims.errorbox.initIvalContentMessage(elem);
 		}
-		var message = (webshims.getOptions && webshims.errorbox ? webshims.getOptions(elem, 'errormessage') : $(elem).data('errormessage')) || elem.getAttribute('x-moz-errormessage') || '';
+		var message = (webshims.getOptions && webshims.errorbox ? webshims.getOptions(elem, 'errormessage', false, true) : $(elem).data('errormessage')) || elem.getAttribute('x-moz-errormessage') || '';
 		if(key && message[key]){
 			message = message[key];
 		} else if(message) {
@@ -241,5 +251,4 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 		}
 	});
 	webshims.ready('WINDOWLOAD', lazyLoad);
-	
 });

data/vendor/assets/javascripts/webshims/shims/form-datalist-lazy.js

@@ -63,7 +63,8 @@ webshims.register('form-datalist-lazy', function($, webshims, window, document,
 			$(opts.input)
 				.attr({
 					//role: 'combobox',
-					'aria-haspopup': 'true'
+					'aria-haspopup': 'true',
+					'aria-autocomplete': 'both' //support only list?
 				})
 				.on({
 					'input.datalistWidget': function(){
@@ -239,7 +240,7 @@ webshims.register('form-datalist-lazy', function($, webshims, window, document,
 						value: this.options.noHtmlEscape ? value : value.replace(lReg, '<').replace(gReg, '>'),
 						label: $.trim($.attr(rElem, 'label')) || '',
 						className: rElem.className || '',
-						elem: options.getOptionContent ? rElem : null
+						elem: rElem
 					};
 					
 					if(rItem.label){
@@ -279,7 +280,7 @@ webshims.register('form-datalist-lazy', function($, webshims, window, document,
 		getOptionContent: function(item){
 			var content;
 			var args = [{instance: this, item: item}];
-			if( ( content = $(this.input).triggerHandler('getoptioncontent', args) || (this.options.getOptionContent && this.options.getOptionContent.apply(this.input, args)) ) && content.indexOf && content.indexOf('option-value') == -1 ){
+			if( ( content = $(this.input).triggerHandler('getoptioncontent', args) ) && content.indexOf && content.indexOf('option-value') == -1 ){
 				content += '<span class="option-value" style="display: none;">'+ item.value +'</span>';
 			} 
 			if(content == null){

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

@@ -63,7 +63,8 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			cache.type = getType(input[0]);
 		}
 		if(cache.type == 'week'){return false;}
-		var ret = (validityState || {}).stepMismatch || false, base;
+		var base, attrVal;
+		var ret = (validityState || {}).stepMismatch || false;
 		if(typeModels[cache.type] && typeModels[cache.type].step){
 			if( !('step' in cache) ){
 				cache.step = webshims.getStep(input[0], cache.type);
@@ -78,6 +79,11 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			
 			addMinMaxNumberToCache('min', input, cache);
 			base = cache.minAsNumber;
+			
+			if(isNaN(base) && (attrVal = input.prop('defaultValue'))){
+				base = typeModels[cache.type].asNumber( attrVal );
+			}
+			
 			if(isNaN(base)){
 				base = typeModels[cache.type].stepBase || 0;
 			}
@@ -192,7 +198,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 		var stepDescriptor = webshims.defineNodeNameProperty('input', name, {
 			prop: {
 				value: function(factor){
-					var step, val, dateVal, valModStep, alignValue, cache;
+					var step, val, dateVal, valModStep, alignValue, cache, base, attrVal;
 					var type = getType(this);
 					if(typeModels[type] && typeModels[type].asNumber){
 						cache = {type: type};
@@ -219,10 +225,21 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 						webshims.addMinMaxNumberToCache('min', $(this), cache);
 						webshims.addMinMaxNumberToCache('max', $(this), cache);
 						
+						base = cache.minAsNumber;
+						
+						if(isNaN(base) && (attrVal = $.prop(this, 'defaultValue'))){
+							base = typeModels[type].asNumber( attrVal );
+						}
+						
+						if(!base){
+							base = 0;
+						}
+						
 						step *= factor;
 						
 						val = (val + step).toFixed(5) * 1;
-						valModStep = (val - (cache.minAsNumber || 0)) % step;
+						
+						valModStep = (val - base) % step;
 						
 						if ( valModStep && (Math.abs(valModStep) > EPS) ) {
 							alignValue = val - valModStep;

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

@@ -2,21 +2,30 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 	"use strict";
 	var curCfg;
 	var formcfg = webshims.formcfg;
+	var hasFormValidation = Modernizr.formvalidation && !webshims.bugs.bustedValidity;
 	var monthDigits = ['01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12'];
 	var stopPropagation = function(e){
 		e.stopImmediatePropagation();
 	};
-	var getMonthOptions = (function(){
-		var str;
-		return function(){
-			if(!str){
-				str = ('<option value=""></option>')+$.map(monthDigits, function(val){
-					return '<option value="'+val+'"]>'+val+'</option>';
-				}).join('');
-			}
-			return str;
-		};
-	})();
+	var getMonthOptions = function(opts){
+		var selectName = 'monthSelect'+opts.formatMonthNames;
+		if(!curCfg[selectName]){
+			var labels = curCfg.date[opts.formatMonthNames] || monthDigits;
+			curCfg[selectName] = ('<option value=""></option>')+$.map(monthDigits, function(val, i){
+				return '<option value="'+val+'"]>'+labels[i]+'</option>';
+			}).join('');
+		}
+		return curCfg[selectName];
+	};
+	var daySelect = '<select class="dd"><option value=""></option>'+ (function(){
+		var i = 1;
+		var opts = [];
+		while(i < 32){
+			opts.push('<option>'+ ((i < 10) ? '0'+ i : i) +'</option>' );
+			i++;
+		}
+		return opts.join('');
+	})() +'</select>';
 	var createFormat = function(name){
 		if(!curCfg.patterns[name+'Obj']){
 			var obj = {};
@@ -30,15 +39,19 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		date: {
 			_create: function(opts){
 				var obj = {
-					splits: [$('<input type="text" class="yy" size="4" inputmode="numeric" />')[0]] 
+					splits: [$('<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 {
 					obj.splits.push($('<input type="text" class="mm" inputmode="numeric" maxlength="2" size="2" />')[0]);
 				}
-				obj.splits.push($('<input type="text" class="dd ws-spin" inputmode="numeric" maxlength="2" size="2" />')[0]);
-				
+				if(opts.daySelect){
+					obj.splits.push($(daySelect)[0]);
+				} else {
+					obj.splits.push($('<input type="text" class="dd ws-spin" inputmode="numeric" maxlength="2" size="2" />')[0]);
+				}
 				
 				obj.elements = [obj.splits[0], $('<span class="ws-input-seperator" />')[0], obj.splits[1], $('<span class="ws-input-seperator" />')[0], obj.splits[2]];
 				return obj;
@@ -68,7 +81,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(opts)+'</select>')[0]);
+					obj.splits.push($('<select class="mm">'+getMonthOptions(opts)+'</select>')[0]);
 				} else {
 					obj.splits.push($('<input type="text" class="mm ws-spin" />')[0]);
 					if(opts.onlyMonthDigits){
@@ -472,18 +485,30 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			},
 			date: function(val, opts, noCorrect){
 				createFormat('d');
-				var i;
-				var obj;
+				var tmp, obj;
+				var ret = '';
 				if(opts.splitInput){
 					obj = {yy: 0, mm: 1, dd: 2};
 				} else {
 					obj = curCfg.patterns.dObj;
 					val = val.split(curCfg.dFormat);
 				}
-				
-				return (val.length == 3 && val[0] && val[1] && val[2] && (!noCorrect || (val[obj.yy].length > 3 && val[obj.mm].length == 2 && val[obj.dd].length == 2))) ? 
-					([addZero(val[obj.yy]), addZero(val[obj.mm]), addZero(val[obj.dd])]).join('-') : 
-					''
+				if(val.length == 3 && val[0] && val[1] && val[2] && (!noCorrect || (val[obj.yy].length > 3 && val[obj.mm].length == 2 && val[obj.dd].length == 2))){
+					if(val[obj.mm] > 12 && val[obj.dd] < 13){
+						tmp = val[obj.dd];
+						val[obj.dd] = val[obj.mm];
+						val[obj.mm] = tmp;
+					}
+					if(val[obj.yy].length < 4){
+						tmp = ((new Date()).getFullYear() +'').substr(0, 4 - val[obj.yy].length);
+						if(val[obj.yy] > 50){
+							tmp--;
+						}
+						val[obj.yy] = tmp + val[obj.yy];
+					}
+					ret = ([addZero(val[obj.yy]), addZero(val[obj.mm]), addZero(val[obj.dd])]).join('-');
+				}
+				return ret
 				;
 			},
 			color: function(val, opts){
@@ -583,7 +608,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				this.buttonWrapper = $('<span class="input-buttons '+this.type+'-input-buttons"></span>').insertAfter(this.element);
 				this.options.containerElements.push(this.buttonWrapper[0]);
 				
-				o.mirrorValidity = o.mirrorValidity && this.orig && Modernizr.formvalidation && !webshims.bugs.bustedValidity;
+				o.mirrorValidity = o.mirrorValidity && this.orig && hasFormValidation;
 				
 				if(o.splitInput && this._addSplitInputs){
 					if(o.monthSelect){
@@ -687,7 +712,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				
 				if(this.type != 'color'){
 					(function(){
-						var localeChange ;
+						var localeChange, select, selectVal;
 						if(!o.splitInput){
 							localeChange = function(){
 								
@@ -702,6 +727,12 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 						} else {
 							localeChange = function(){
 								that.reorderInputs();
+								if(o.monthSelect){
+									select = that.inputElements.filter('select.mm');
+									selectVal = select.prop('value');
+									select.html(getMonthOptions(o));
+									select.prop('value', selectVal);
+								}
 							};
 							that.reorderInputs();
 						}
@@ -735,7 +766,11 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				}
 				if(options.splitInput && typeof placeholder == 'object'){
 					$.each(this.splits, function(i, elem){
-						$.prop(elem, 'placeholder', placeholder[i]);
+						if($.nodeName(elem, 'select')){
+							$(elem).children('option:first-child').text(placeholder[i]);
+						} else {
+							$.prop(elem, 'placeholder', placeholder[i]);
+						}
 					});
 				} else {
 					this.element.prop('placeholder', placeholder);
@@ -819,14 +854,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				}
 				
 				
-				if(!o.min && typeof o.relMin == 'number'){
-					o.min = this.asValue(this.getRelNumber(o.relMin));
-					$.prop(this.orig, 'min', o.min);
-				}
 				
-				if(!o.max && typeof o.relMax == 'number'){
-					o.max = this.asValue(this.getRelNumber(o.relMax));
-					$.prop(this.orig, 'max', o.max);
+				if((!o.max && typeof o.relMax == 'number') || (!o.min && typeof o.relMin == 'number')){
+					webshims.error('relMax/relMin are not supported anymore')
 				}
 				this._init = true;
 			},
@@ -895,6 +925,8 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				if(!this._init || force || this.options[name] !== val){
 					if(isValue){
 						this._beforeValue(val);
+					} else {
+						this.elemHelper.prop(name, val);
 					}
 					
 					val = formatVal[this.type](val, this.options);
@@ -945,9 +977,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		
 		$.fn.spinbtnUI = function(opts){
 			opts = $.extend({
-				monthNames: 'monthNames',
-				size: 1,
-				startView: 0
+				monthNames: 'monthNames'
 			}, opts);
 			return this.each(function(){
 				$.webshims.objectCreate(spinBtnProto, {
@@ -1019,10 +1049,12 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		
 		
 		picker.commonInit = function(data, popover){
+			if(data._commonInit){return;}
+			data._commonInit = true;
 			var tabbable;
 			
 			popover.isDirty = true;
-			
+
 			popover.element.on('updatepickercontent pickerchange', function(){
 				tabbable = false;
 			});
@@ -1062,6 +1094,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				return function(prop){
 					if(prop == 'value' && !data.options.inlinePicker){return;}
 					popover.isDirty = true;
+					
 					if(popover.isVisible){
 						clearTimeout(timer);
 						timer = setTimeout(update, 9);
@@ -1129,30 +1162,6 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			
 			options.containerElements.push(popover.element[0]);
 			
-			if(data.type != 'color'){
-				if(options.yearButtons){
-					options.startView = 2;
-				} 
-				if(!options.startView){
-					options.startView = 0;
-				}
-				
-				if(data.type == 'time'){
-					options.minView = 3;
-					options.startView = 3;
-				}
-				if(!options.minView){
-					options.minView = 0;
-				}
-				if(options.startView < options.minView){
-					options.startView = options.minView;
-					webshims.warn("wrong config for minView/startView.");
-				}
-				if(!options.size){
-					options.size = 1;
-				}
-			}
-			
 			popover.element
 				.addClass(data.type+'-popover input-picker')
 				.attr({role: 'application'})
@@ -1213,12 +1222,12 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					};
 					data.inputElements.on({
 						keydown: function(e){
-							if(e.keyCode == 40 && e.altKey){
+							if(e.keyCode == 40 && e.altKey && !$.nodeName(e.target, 'select')){
 								open();
 							}
 						},
-						focus: function(){
-							if(!popover.stopOpen && (options.buttonOnly || options.openOnFocus || (mouseFocus && options.openOnMouseFocus))){
+						focus: function(e){
+							if(!popover.stopOpen && (options.buttonOnly || options.openOnFocus || (mouseFocus && options.openOnMouseFocus)) && !$.nodeName(e.target, 'select')){
 								popover.openedByFocus = options.buttonOnly ? false : !options.noInput;
 								show();
 							} else {
@@ -1235,7 +1244,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 									popover.activeElement.focus();
 								}, 4);
 							}
-							if(data.element.is(':focus')){
+							if(data.element.is(':focus')  && !$.nodeName(e.target, 'select')){
 								popover.openedByFocus = options.buttonOnly ? false : !options.noInput;
 								show();
 							}
@@ -1463,10 +1472,8 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 						opts[optsName] = $.attr(this, copyAttrs[i]) || opts[optsName];
 					}
 				}
-				if(opts.monthSelect){
-					opts.onlyMonthDigits = true;
-				}
-				if(opts.onlyMonthDigits){
+				
+				if(opts.onlyMonthDigits || (!opts.formatMonthNames && opts.monthSelect)){
 					opts.formatMonthNames = 'monthDigits';
 				}
 				data.shim = inputTypes[type]._create(opts);
@@ -1516,11 +1523,11 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				
 				data.shim.element.on('change input', stopPropagation);
 				
-				if(Modernizr.formvalidation){
+				if(hasFormValidation){
 					$(opts.orig).on('firstinvalid', function(e){
 						if(!webshims.fromSubmit && isCheckValidity){return;}
 						$(opts.orig).off('invalid.replacedwidgetbubble').on('invalid.replacedwidgetbubble', function(evt){
-							if(!e.isInvalidUIPrevented() && !evt.isDefaultPrevented()){
+							if(!evt.isDefaultPrevented()){
 								webshims.validityAlert.showFor( e.target );
 								e.preventDefault();
 								evt.preventDefault();
@@ -1547,7 +1554,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		};
 		
 		
-		if(Modernizr.formvalidation){
+		if(hasFormValidation){
 			['input', 'form'].forEach(function(name){
 				var desc = webshims.defineNodeNameProperty(name, 'checkValidity', {
 					prop: {
@@ -1598,7 +1605,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			if(!modernizrInputTypes[name] || replace[name]){
 				extendType(name, {
 					_create: function(opts, set){
-						if(opts.monthSelect){
+						if(opts.monthSelect || opts.daySelect){
 							opts.splitInput = true;
 						}
 						if(opts.splitInput && !splitInputs[name]){