webshims-rails 1.10.10 → 1.10.11

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

@@ -32,22 +32,24 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 		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;
+	$.each({typeMismatch: 'mismatch', badInput: 'bad'}, function(name, fn){
+		webshims.addValidityRule(name, function (input, val, cache, validityState){
+			if(val === ''){return false;}
+			var ret = validityState[name];
+			if(!('type' in cache)){
+				cache.type = (input[0].getAttribute('type') || '').toLowerCase();
+			}
+			
+			if(typeModels[cache.type] && typeModels[cache.type][fn]){
+				ret = typeModels[cache.type][fn](val, input);
+			}
+			return ret || false;
+		});
 	});
 	
 	var formsExtModule = webshims.modules['form-number-date-api'];
 	var overrideValidity = formsExtModule.loaded && !formsExtModule.test();
-	var validityProps = ['customError','typeMismatch','rangeUnderflow','rangeOverflow','stepMismatch','tooLong','patternMismatch','valueMissing','valid'];
+	var validityProps = ['customError', 'badInput','typeMismatch','rangeUnderflow','rangeOverflow','stepMismatch','tooLong','patternMismatch','valueMissing','valid'];
 	
 	var validityChanger = ['value'];
 	var validityElements = [];
@@ -113,7 +115,7 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 						}
 						stopValidity = true;
 						var jElm 			= $(elem),
-							cache 			= {type: (elem.getAttribute && elem.getAttribute('type') || '').toLowerCase(), nodeName: (elem.nodeName || '').toLowerCase()},
+							cache 			= {type: (elem.getAttribute && elem.getAttribute('type') || elem.type || '').toLowerCase(), nodeName: (elem.nodeName || '').toLowerCase()},
 							val				= jElm.val(),
 							customError 	= !!(webshims.data(elem, 'hasCustomError')),
 							setCustomMessage
@@ -140,7 +142,7 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 						
 						$.each(validityRules, function(rule, fn){
 							validityState[rule] = fn(jElm, val, cache, validityState);
-							if( validityState[rule] && (validityState.valid || !setCustomMessage) && ((typeModels[cache.type] && typeModels[cache.type].mismatch)) ) {
+							if( validityState[rule] && (validityState.valid || !setCustomMessage) && ((typeModels[cache.type])) ) {
 								oldSetCustomValidity[nodeName].call(elem, webshims.createValidationMessage(elem, rule));
 								validityState.valid = false;
 								setCustomMessage = true;
@@ -359,8 +361,8 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 					} else {
 						webshims.error('INVALID_STATE_ERR: DOM Exception 11');
 					}
-				} else {
-					valueAsNumberDescriptor.prop._supset && valueAsNumberDescriptor.prop._supset.apply(elem, arguments);
+				} else if(valueAsNumberDescriptor.prop._supset) {
+					 valueAsNumberDescriptor.prop._supset.apply(elem, arguments);
 				}
 			}
 		}
@@ -487,7 +489,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 	var typeProtos = {
 		
 		number: {
-			mismatch: function(val){
+			bad: function(val){
 				return !(isNumber(val));
 			},
 			step: 1,
@@ -506,7 +508,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			maxDefault: 100
 		},
 		color: {
-			mismatch: (function(){
+			bad: (function(){
 				var cReg = /^\u0023[a-f0-9]{6}$/;
 				return function(val){
 					return (!val || val.length != 7 || !(cReg.test(val)));
@@ -514,7 +516,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			})()
 		},
 		date: {
-			mismatch: function(val){
+			bad: function(val){
 				if(!val || !val.split || !(/\d$/.test(val))){return true;}
 				var i;
 				var valA = val.split(/\u002D/);
@@ -539,14 +541,14 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			//stepBase: 0, 0 = default
 			stepScaleFactor:  86400000,
 			asDate: function(val, _noMismatch){
-				if(!_noMismatch && this.mismatch(val)){
+				if(!_noMismatch && this.bad(val)){
 					return null;
 				}
 				return new Date(this.asNumber(val, true));
 			},
 			asNumber: function(str, _noMismatch){
 				var ret = nan;
-				if(_noMismatch || !this.mismatch(str)){
+				if(_noMismatch || !this.bad(str)){
 					str = str.split(/\u002D/);
 					ret = Date.UTC(str[0], str[1] - 1, str[2]);
 				}
@@ -563,7 +565,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 		 * ToDO: WEEK
 		 */
 //		week: {
-//			mismatch: function(val){
+//			bad: function(val){
 //				if(!val || !val.split){return true;}
 //				var valA = val.split('-W');
 //				var ret = true;
@@ -577,7 +579,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 //			stepBase: -259200000,
 //			asDate: function(str, _noMismatch){
 //				var ret = null;
-//				if(_noMismatch || !this.mismatch(str)){
+//				if(_noMismatch || !this.bad(str)){
 //					ret = str.split('-W');
 //					ret = setWeek(ret[0], ret[1]);
 //				}
@@ -610,7 +612,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 //			}
 //		},
 		time: {
-			mismatch: function(val, _getParsed){
+			bad: 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;}
@@ -655,7 +657,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			},
 			asNumber: function(val){
 				var ret = nan;
-				val = this.mismatch(val, true);
+				val = this.bad(val, true);
 				if(val !== true){
 					ret = Date.UTC('1970', 0, 1, val[0][0], val[0][1], val[0][2] || 0);
 					if(val[1]){
@@ -683,8 +685,8 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			}
 		},
 		month: {
-			mismatch: function(val){
-				return typeProtos.date.mismatch(val+'-01');
+			bad: function(val){
+				return typeProtos.date.bad(val+'-01');
 			},
 			step: 1,
 			stepScaleFactor:  false,
@@ -695,7 +697,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			asNumber: function(val){
 				//1970-01
 				var ret = nan;
-				if(val && !this.mismatch(val)){
+				if(val && !this.bad(val)){
 					val = val.split(/\u002D/);
 					val[0] = (val[0] * 1) - 1970;
 					val[1] = (val[1] * 1) - 1;
@@ -729,46 +731,46 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 				}
 			}
 		}
-//		,'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);
-//			}
-//		}
+		,'datetime-local': {
+			bad: function(val, _getParsed){
+				if(!val || !val.split || (val+'special').split(/\u0054/).length !== 2){return true;}
+				val = val.split(/\u0054/);
+				return ( typeProtos.date.bad(val[0]) || typeProtos.time.bad(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.bad(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') || !supportsType('month')){
+	if(typeBugs || !supportsType('range') || !supportsType('time') || !supportsType('month') || !supportsType('datetime-local')){
 		typeProtos.range = $.extend({}, typeProtos.number, typeProtos.range);
 		typeProtos.time = $.extend({}, typeProtos.date, typeProtos.time);
 		typeProtos.month = $.extend({}, typeProtos.date, typeProtos.month);
-//		typeProtos['datetime-local'] = $.extend({}, typeProtos.date, typeProtos.time, typeProtos['datetime-local']);
+		typeProtos['datetime-local'] = $.extend({}, typeProtos.date, typeProtos.time, typeProtos['datetime-local']);
 	}
 	
-	//'datetime-local'
-	['number', 'month', 'range', 'date', 'time', 'color'].forEach(function(type){
+	//
+	['number', 'month', 'range', 'date', 'time', 'color', 'datetime-local'].forEach(function(type){
 		if(typeBugs || !supportsType(type)){
 			webshims.addInputType(type, typeProtos[type]);
 		}
@@ -1299,10 +1301,21 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 	"use strict";
 	var curCfg;
 	var formcfg = webshims.formcfg;
-	
+	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></option>')+$.map(monthDigits, function(val){
+					return '<option>'+val+'</option>';
+				}).join('');
+			}
+			return str;
+		};
+	})();
 	var createFormat = function(name){
 		if(!curCfg.patterns[name+'Obj']){
 			var obj = {};
@@ -1314,10 +1327,18 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 	};
 	var splitInputs = {
 		date: {
-			_create: function(){
+			_create: function(opts){
 				var obj = {
-					splits: [$('<input type="text" class="yy" size="4" inputmode="numeric" />')[0], $('<input type="text" class="mm" inputmode="numeric" maxlength="2" size="2" />')[0], $('<input type="text" class="dd ws-spin" inputmode="numeric" maxlength="2" size="2" />')[0]] 
+					splits: [$('<input type="text" class="yy" size="4" inputmode="numeric" />')[0]] 
 				};
+				if(opts.monthSelect){
+					obj.splits.push($('<select class="mm">'+getMonthOptions()+'</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]);
+				
+				
 				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;
 			},
@@ -1325,7 +1346,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				createFormat('d');
 				var i = 0;
 				var seperators = $('.ws-input-seperator', element).html(curCfg.dFormat);
-				var inputs = $('input', element);
+				var inputs = $('input, select', element);
 				$.each(curCfg.patterns.dObj, function(name, value){
 					var input = inputs.filter('.'+ name);
 					if(input[0]){
@@ -1343,17 +1364,23 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			_create: function(opts){
 				
 				var obj = {
-					splits: [$('<input type="text" class="yy" inputmode="numeric" size="4" />')[0], $('<input type="text" class="mm ws-spin" />')[0]] 
+					splits: [$('<input type="text" class="yy" inputmode="numeric" size="4" />')[0]] 
 				};
-				if(opts.onlyMonthDigits){
-					$(obj.splits[1]).attr({inputmode: 'numeric', size: 2, maxlength: 2});
+				if(opts.monthSelect){
+					obj.splits.push($('<select class="mm ws-spin">'+getMonthOptions()+'</select>')[0]);
+				} else {
+					obj.splits.push($('<input type="text" class="mm ws-spin" />')[0]);
+					if(opts.onlyMonthDigits){
+						$(obj.splits[1]).attr({inputmode: 'numeric', size: 2, maxlength: 2});
+					}
 				}
+				
 				obj.elements = [obj.splits[0], $('<span class="ws-input-seperator" />')[0], obj.splits[1]];
 				return obj;
 			},
 			sort: function(element){
 				var seperator = $('.ws-input-seperator', element).html(curCfg.dFormat);
-				var mm = $('input.mm', element);
+				var mm = $('input.mm, select.mm', element);
 				var action;
 				if(curCfg.date.showMonthAfterYear){
 					mm.appendTo(element);
@@ -1367,7 +1394,8 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		}
 	};
 	
-	var nowDate = new Date().getTime() - (new Date().getTimezoneOffset() * 60 * 1000 );
+	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 steps = {
 		number: {
 			step: 1
@@ -1376,6 +1404,10 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 //			step: 1,
 //			start: new Date(nowDate)
 //		},
+		'datetime-local': {
+			step: 60,
+			start: new Date(nowDate).getTime()
+		},
 		time: {
 			step: 60
 		},
@@ -1411,7 +1443,6 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 	
 		
 	(function(){
-		var monthDigits = ['01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12'];
 		
 		formcfg.de = $.extend(true, {
 			numberFormat: {
@@ -1461,6 +1492,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			patterns: {
 				d: "mm/dd/yy"
 			},
+			meridian: ['AM', 'PM'],
 			month:  {
 				currentText: 'This month'
 			},
@@ -1514,12 +1546,18 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				langCfg.date.monthkeys = {};
 				langCfg.date.monthDigits = monthDigits;
 				langCfg.numberSigns += '-';
+				if(langCfg.meridian){
+					langCfg.timeSigns += langCfg.meridian[0] + langCfg.meridian[1];
+				}
 				$.each(langCfg.date.monthNames, create);
 				$.each(langCfg.date.monthNamesShort, create);
 			}
 			if(!langCfg.colorSigns){
 				langCfg.colorSigns = '#abcdefABCDEF';
 			}
+			if(!langCfg['datetime-localSigns']){
+				langCfg['datetime-localSigns'] = langCfg.dateSigns+langCfg.timeSigns;
+			}
 		};
 		var triggerLocaleChange = function(){
 			processLangCFG(curCfg);
@@ -1576,11 +1614,31 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				return (val+'').replace(/\,/g, '').replace(/\./, curCfg.numberFormat['.']);
 			},
 			time: function(val){
+				var fVal;
+				if(val && curCfg.meridian){
+					val = val.split(':');
+					fVal = (val[0] * 1);
+					if(fVal && fVal >= 12){
+						val[0] = addZero(fVal - 12+'');
+						fVal = 1;
+						
+					} else {
+						fVal = 0;
+					}
+					val = $.trim(val.join(':')) + ' '+ curCfg.meridian[fVal];
+				}
 				return val;
 			},
-			week: function(val){
+			'datetime-local': function(val, o){
+				var fVal = $.trim(val || '').split('T');
+				if(fVal.length == 2){
+					val = this.date(fVal[0], o) +' '+this.time(fVal[1], o);
+				}
 				return val;
 			},
+//			week: function(val){
+//				return val;
+//			},
 			//todo empty val for month/split
 			month: function(val, options){
 				var names;
@@ -1633,7 +1691,32 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 //			week: function(val){
 //				return val;
 //			},
+			'datetime-local': function(val, o){
+				var tmp;
+				var fVal = $.trim(val || '').split(/\s+/);
+				if(fVal.length == 2){
+					if(fVal[0].indexOf(':') != -1 && fVal[1].indexOf(':') == -1){
+						tmp = fVal[1];
+						fVal[1] = fVal[0];
+						fVal[0] = tmp;
+					}
+					val = this.date(fVal[0], o) +'T'+ this.time(fVal[1], o);
+				}
+				return val;
+			},
 			time: function(val){
+				var fVal;
+				if(val && curCfg.meridian){
+					if(val.indexOf(curCfg.meridian[1]) != -1){
+						val = val.split(':');
+						fVal = (val[0] * 1);
+						if(!isNaN(fVal)){
+							val[0] = fVal + 12;
+						}
+						val = val.join(':');
+					}
+					val = $.trim(val.replace(curCfg.meridian[0], '').replace(curCfg.meridian[1], ''));
+				}
 				return val;
 			},
 			month: function(val, opts, noCorrect){
@@ -1734,8 +1817,16 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 							var type = (typeof val == 'object') ? 'valueAsDate' : 'valueAsNumber';
 							return input.prop(type, val).prop('value');
 						},
-						isValid: function(val){
-							return input.prop('value', val).is(':valid') && input.prop('value') == val;
+						isValid: function(val, attrs){
+							if(attrs && (attrs.nodeName || attrs.jquery)){
+								attrs = {
+									min: $(attrs).prop('min') || '',
+									max: $(attrs).prop('max') || '',
+									step: $(attrs).prop('step') || 'any'
+								};
+							}
+							attrs = $.extend({step: 'any', min: '', max: ''}, attrs || {});
+							return input.attr(attrs).prop('value', val).is(':valid') && input.prop('value') == val;
 						}
 					};
 				}
@@ -1760,6 +1851,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				o.mirrorValidity = o.mirrorValidity && this.orig && Modernizr.formvalidation && !webshims.bugs.bustedValidity;
 				
 				if(o.splitInput && this._addSplitInputs){
+					if(o.monthSelect){
+						this.element.addClass('ws-month-select');
+					}
 					this._addSplitInputs();
 				} else {
 					this.inputElements = this.element;
@@ -2011,7 +2105,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 										try {
 											$(this)
 												.next()
-												.next('input')
+												.next('input, select')
 												.each(select)
 											;
 										} catch(er){}
@@ -2089,7 +2183,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 							}
 						};
 						spinEvents.keydown = function(e){
-							if(o.list || e.isDefaultPrevented() || $.attr(this, 'list')){return;}
+							if(o.list || e.isDefaultPrevented() || (e.altKey && e.keyCode == 40) || $.attr(this, 'list')){return;}
 							var stepped = true;
 							var code = e.keyCode;
 							if (code == 38) {
@@ -2212,7 +2306,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				return [options, datalist.data('label')];
 			},
 			list: function(val){
-				if(this.type == 'number' || this.type == 'time'){
+				if(this.type == 'number'){
 					this.element.attr('list', $.attr(this.orig, 'list'));
 				}
 				this.options.list = val;
@@ -2295,7 +2389,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				if(!this.inputElements){
 					var create = splitInputs[this.type]._create(this.options);
 					this.splits = create.splits;
-					this.inputElements = $(create.elements).prependTo(this.element).filter('input');
+					this.inputElements = $(create.elements).prependTo(this.element).filter('input, select');
 				}
 			},
 			
@@ -2321,11 +2415,11 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			reorderInputs: function(){
 				if(splitInputs[this.type]){
 					var element = this.element;
-					splitInputs[this.type].sort(element);
+					splitInputs[this.type].sort(element, this.options);
 					setTimeout(function(){
 						var data = webshims.data(element);
 						if(data && data.shadowData){
-							data.shadowData.shadowFocusElement = element.find('input')[0] || element[0];
+							data.shadowData.shadowFocusElement = element.find('input, select')[0] || element[0];
 						}
 					}, 9);
 				}
@@ -2428,8 +2522,21 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			options: options
 		});
 		
+		webshims.inlinePopover = {
+			_create: function(){
+				this.element = $('<div class="ws-inline-picker"><div class="ws-po-box" /></div>').data('wspopover', this);
+				this.contentElement = $('.ws-po-box', this.element);
+				this.element.insertAfter(this.options.prepareFor);
+			},
+			show: $.noop,
+			hide: $.noop,
+			preventBlur: $.noop,
+			isVisible: true
+		};
+		
 		picker._genericSetFocus = function(element, _noFocus){
 			element = $(element || this.activeButton);
+			
 			if(!this.popover.openedByFocus && !_noFocus){
 				var that = this;
 				var setFocus = function(noTrigger){
@@ -2454,12 +2561,14 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				data.setChange(val);
 			},
 			cancel: function(val, popover, data){
-				popover.stopOpen = true;
-				data.element.getShadowFocusElement().focus();
-				setTimeout(function(){
-					popover.stopOpen = false;
-				}, 9);
-				popover.hide();
+				if(!data.options.inlinePicker){
+					popover.stopOpen = true;
+					data.element.getShadowFocusElement().focus();
+					setTimeout(function(){
+						popover.stopOpen = false;
+					}, 9);
+					popover.hide();
+				}
 			}
 		};
 		
@@ -2472,28 +2581,31 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			popover.element.on('updatepickercontent pickerchange', function(){
 				tabbable = false;
 			});
-			popover.contentElement.on({
-				keydown: function(e){
-					if(e.keyCode == 9){
-						if(!tabbable){
-							tabbable = $('input:not(:disabled), [tabindex="0"]:not(:disabled)', this).filter(':visible');
-						}
-						var index = tabbable.index(e.target);
-						if(e.shiftKey && index <= 0){
-							tabbable.last().focus();
-							return false;
-						}
-						if(!e.shiftKey && index >= tabbable.length - 1){
-							tabbable.first().focus();
+			
+			if(!data.options.inlinePicker){
+				popover.contentElement.on({
+					keydown: function(e){
+						if(e.keyCode == 9){
+							if(!tabbable){
+								tabbable = $('input:not(:disabled), [tabindex="0"]:not(:disabled)', this).filter(':visible');
+							}
+							var index = tabbable.index(e.target);
+							if(e.shiftKey && index <= 0){
+								tabbable.last().focus();
+								return false;
+							}
+							if(!e.shiftKey && index >= tabbable.length - 1){
+								tabbable.first().focus();
+								return false;
+							}
+						} else if(e.keyCode == 27){
+							data.element.getShadowFocusElement().focus();
+							popover.hide();
 							return false;
 						}
-					} else if(e.keyCode == 27){
-						data.element.getShadowFocusElement().focus();
-						popover.hide();
-						return false;
 					}
-				}
-			});
+				});
+			}
 			
 			data._propertyChange = (function(){
 				var timer;
@@ -2503,7 +2615,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					}
 				};
 				return function(prop){
-					if(prop == 'value'){return;}
+					if(prop == 'value' && !data.options.inlinePicker){return;}
 					popover.isDirty = true;
 					if(popover.isVisible){
 						clearTimeout(timer);
@@ -2540,7 +2652,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		
 		picker._common = function(data){
 			var options = data.options;
-			var popover = webshims.objectCreate(webshims.wsPopover, {}, {prepareFor: data.element, position: options.widgetPosition});
+			var popover = webshims.objectCreate(options.inlinePicker ? webshims.inlinePopover : webshims.wsPopover, {}, {prepareFor: options.inlinePicker ? data.buttonWrapper : data.element, position: options.widgetPosition});
 			var opener = $('<button type="button" class="ws-popover-opener"><span /></button>').appendTo(data.buttonWrapper);
 			
 			
@@ -2549,18 +2661,34 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			};
 			var show = function(){
 				var type = loadPicker(data.type, 'DOM');
-				if(!options.disabled && !options.readonly && !popover.isVisible){
+				if(!options.disabled && !options.readonly && (options.inlinePicker || !popover.isVisible)){
 					webshims.ready(type, showPickerContent);
 					popover.show(data.element);
 				}
 			};
+			var open = function(){
+				if((options.inlinePicker || popover.isVisible) && popover.activeElement){
+					popover.openedByFocus = false;
+					popover.activeElement.focus();
+				}
+				show();
+			};
+			
 			
 			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;
 				}
@@ -2590,6 +2718,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 						if(popover.activeElement){
 							popover.activeElement.removeClass('ws-focus');
 						}
+						if(options.inlinePicker){
+							popover.openedByFocus = true;
+						}
 					}
 				})
 			;
@@ -2605,57 +2736,63 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				opener.prop({disabled: true});
 			}
 			
-			opener
-				.on({
-					mousedown: function(){
-						stopPropagation.apply(this, arguments);
-						popover.preventBlur();
-					},
-					click: function(){
-						if(popover.isVisible && popover.activeElement){
-							popover.openedByFocus = false;
-							popover.activeElement.focus();
-						}
-						show();
-					},
-					focus: function(){
-						popover.preventBlur();
-					}
-				})
-			;
 			
-			(function(){
-				var mouseFocus = false;
-				var resetMouseFocus = function(){
-					mouseFocus = false;
-				};
-				data.inputElements.on({
-					focus: function(){
-						if(!popover.stopOpen && (options.buttonOnly || options.openOnFocus || (mouseFocus && options.openOnMouseFocus))){
-							popover.openedByFocus = options.buttonOnly ? false : !options.noInput;
-							show();
-						} else {
+			opener.on({click: open});
+			
+			if(options.inlinePicker){
+				popover.openedByFocus = true;
+			} else {
+				opener
+					.on({
+						mousedown: function(){
+							stopPropagation.apply(this, arguments);
+							popover.preventBlur();
+						},
+						focus: function(){
 							popover.preventBlur();
 						}
-					},
-					mousedown: function(){
-						mouseFocus = true;
-						setTimeout(resetMouseFocus, 9);
-						if(options.buttonOnly && popover.isVisible && popover.activeElement){
-							popover.openedByFocus = false;
-							setTimeout(function(){
+					})
+				;
+				
+				(function(){
+					var mouseFocus = false;
+					var resetMouseFocus = function(){
+						mouseFocus = false;
+					};
+					data.inputElements.on({
+						keydown: function(e){
+							if(e.keyCode == 40 && e.altKey){
+								open();
+							}
+						},
+						focus: function(){
+							if(!popover.stopOpen && (options.buttonOnly || options.openOnFocus || (mouseFocus && options.openOnMouseFocus))){
+								popover.openedByFocus = options.buttonOnly ? false : !options.noInput;
+								show();
+							} else {
+								popover.preventBlur();
+							}
+						},
+						mousedown: function(){
+							mouseFocus = true;
+							setTimeout(resetMouseFocus, 9);
+							if(options.buttonOnly && popover.isVisible && popover.activeElement){
 								popover.openedByFocus = false;
-								popover.activeElement.focus();
-							}, 4);
-						}
-						if(data.element.is(':focus')){
-							popover.openedByFocus = options.buttonOnly ? false : !options.noInput;
-							show();
+								setTimeout(function(){
+									popover.openedByFocus = false;
+									popover.activeElement.focus();
+								}, 4);
+							}
+							if(data.element.is(':focus')){
+								popover.openedByFocus = options.buttonOnly ? false : !options.noInput;
+								show();
+							}
+							popover.preventBlur();
 						}
-						popover.preventBlur();
-					}
-				});
-			})();
+					});
+				})();
+			}
+			
 			data.popover = popover;
 			data.opener = opener;
 			$(data.orig).on('remove', function(e){
@@ -2666,12 +2803,16 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					}, 4);
 				}
 			});
-			
+			if(options.inlinePicker){
+				show();
+			}
 			loadPicker(data.type, 'WINDOWLOAD');
 		};
 		
 		picker.month = picker._common;
 		picker.date = picker._common;
+		picker.time = picker._common;
+		picker['datetime-local'] = picker._common;
 //		picker.week = picker._common;
 		picker.color = function(data){
 			var ret = picker._common.apply(this, arguments);
@@ -2855,6 +2996,9 @@ 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){
 					opts.formatMonthNames = 'monthDigits';
 				}
@@ -2960,11 +3104,14 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			});
 		}
 		
-		var isStupid = navigator.userAgent.indexOf('MSIE 10.0') != -1 && navigator.userAgent.indexOf('Touch') == -1;
-		['number', 'time', 'month', 'date', 'color'].forEach(function(name){
+		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)){
 				extendType(name, {
 					_create: function(opts, set){
+						if(opts.monthSelect){
+							opts.splitInput = true;
+						}
 						if(opts.splitInput && !splitInputs[name]){
 							webshims.warn('splitInput not supported for '+ name);
 							opts.splitInput = false;
@@ -3097,34 +3244,6 @@ webshims.register('form-datalist', function($, webshims, window, document, undef
 				}
 			};
 			
-			if(formsCFG.customDatalist && (!listSupport || !('selectedOption' in $('<input />')[0]))){
-				//currently not supported x-browser (FF4 has not implemented and is not polyfilled )
-				inputListProto.selectedOption = {
-					prop: {
-						writeable: false,
-						get: function(){
-							var elem = this;
-							var list = $.prop(elem, 'list');
-							var ret = null;
-							var value, options;
-							if(!list){return ret;}
-							value = $.prop(elem, 'value');
-							if(!value){return ret;}
-							options = $.prop(list, 'options');
-							if(!options.length){return ret;}
-							$.each(options, function(i, option){
-								if(value == $.prop(option, 'value')){
-									ret = option;
-									return false;
-								}
-							});
-							return ret;
-						}
-					}
-				};
-			}
-			
-			
 			if(listSupport){
 				//options only return options, if option-elements are rooted: but this makes this part of HTML5 less backwards compatible
 				if(!($('<datalist><select><option></option></select></datalist>').prop('options') || []).length ){