webshims-rails 1.10.9 → 1.10.10

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

@@ -12,14 +12,14 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		webshims.error("Webshims needs jQuery 1.8+ to work properly. Please update your jQuery version or downgrade webshims.");
 	}
 	
-	if(webshims.cfg.extendNative == 1){
+	if(webshims.cfg.extendNative === 1){
 		webshims.warn("extendNative configuration will be set to false by default with next release. In case you rely on it set it to 'true' otherwise to 'false'. See http://bit.ly/16OOTQO");
 	}
 	
 	if (!webshims.cfg.no$Switch) {
 		var switch$ = function(){
 			if (window.jQuery && (!window.$ || window.jQuery == window.$) && !window.jQuery.webshims) {
-				webshims.error("jQuery was included more than once. Make sure to include it only once or try the $.noConflict(extreme) feature! Webshims and other Plugins might not work properly..");
+				webshims.error("jQuery was included more than once. Make sure to include it only once or try the $.noConflict(extreme) feature! Webshims and other Plugins might not work properly. Or set webshims.cfg.no$Switch to 'true'.");
 				if (window.$) {
 					window.$ = webshims.$;
 				}
@@ -561,6 +561,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 						setInterval(this.test, 600);
 						$(this.test);
 						webshims.ready('WINDOWLOAD', this.test);
+						$(document).on('updatelayout', this.handler);
 						$(window).bind('resize', this.handler);
 						(function(){
 							var oldAnimate = $.fn.animate;
@@ -608,7 +609,9 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					
 					$(nativeElem).on('remove', function(e){
 						if (!e.originalEvent) {
-							$(shadowElem).remove();
+							setTimeout(function(){
+								$(shadowElem).remove();
+							}, 4);
 						}
 					});
 					
@@ -1086,7 +1089,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		}
 	});
 	
-})(jQuery, document);
+})(webshims.$, document);
 
 webshims.register('form-core', function($, webshims, window, document, undefined, options){
 	"use strict";
@@ -1165,6 +1168,7 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 		$.expr[":"][name] = $.expr.filters[name+"-element"];
 	});
 	
+	//bug was partially fixed in 1.10.0 for IE9, but not IE8 (move to es5 as soon as 1.10.2 is used) 
 	var pseudoFocus = $.expr[":"].focus;
 	$.expr[":"].focus = function(){
 		try {
@@ -1187,10 +1191,18 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 	};
 	
 	var transClass = ('transitionDelay' in document.documentElement.style) ?  '' : ' no-transition';
+	var poCFG = webshims.cfg.wspopover;
+	if(!poCFG.position && poCFG.position !== false){
+		poCFG.position = {
+			at: 'left bottom',
+			my: 'left top',
+			collision: 'fit flip'
+		};
+	}
 	webshims.wsPopover = {
 		id: 0,
 		_create: function(){
-			this.options = $.extend({}, webshims.cfg.wspopover, this.options);
+			this.options = $.extend(true, {}, poCFG, this.options);
 			this.id = webshims.wsPopover.id++;
 			this.eventns = '.wsoverlay' + this.id;
 			this.timers = {};
@@ -1237,6 +1249,11 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 		var message = $(elem).data('errormessage') || elem.getAttribute('x-moz-errormessage') || '';
 		if(key && message[key]){
 			message = message[key];
+		} else if(message) {
+			validity = validity || $.prop(elem, 'validity') || {valid: 1};
+			if(validity.valid){
+				message = '';
+			}
 		}
 		if(typeof message == 'object'){
 			validity = validity || $.prop(elem, 'validity') || {valid: 1};

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

@@ -12,14 +12,14 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		webshims.error("Webshims needs jQuery 1.8+ to work properly. Please update your jQuery version or downgrade webshims.");
 	}
 	
-	if(webshims.cfg.extendNative == 1){
+	if(webshims.cfg.extendNative === 1){
 		webshims.warn("extendNative configuration will be set to false by default with next release. In case you rely on it set it to 'true' otherwise to 'false'. See http://bit.ly/16OOTQO");
 	}
 	
 	if (!webshims.cfg.no$Switch) {
 		var switch$ = function(){
 			if (window.jQuery && (!window.$ || window.jQuery == window.$) && !window.jQuery.webshims) {
-				webshims.error("jQuery was included more than once. Make sure to include it only once or try the $.noConflict(extreme) feature! Webshims and other Plugins might not work properly..");
+				webshims.error("jQuery was included more than once. Make sure to include it only once or try the $.noConflict(extreme) feature! Webshims and other Plugins might not work properly. Or set webshims.cfg.no$Switch to 'true'.");
 				if (window.$) {
 					window.$ = webshims.$;
 				}
@@ -561,6 +561,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 						setInterval(this.test, 600);
 						$(this.test);
 						webshims.ready('WINDOWLOAD', this.test);
+						$(document).on('updatelayout', this.handler);
 						$(window).bind('resize', this.handler);
 						(function(){
 							var oldAnimate = $.fn.animate;
@@ -608,7 +609,9 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					
 					$(nativeElem).on('remove', function(e){
 						if (!e.originalEvent) {
-							$(shadowElem).remove();
+							setTimeout(function(){
+								$(shadowElem).remove();
+							}, 4);
 						}
 					});
 					
@@ -1086,7 +1089,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		}
 	});
 	
-})(jQuery, document);
+})(webshims.$, document);
 
 webshims.register('form-message', function($, webshims, window, document, undefined, options){
 	"use strict";
@@ -1266,6 +1269,10 @@ webshims.register('form-message', function($, webshims, window, document, undefi
 	});
 	
 	implementProperties.forEach(function(messageProp){
+		var skipNames = {
+			valid: 1,
+			badInput: 1
+		};
 		webshims.defineNodeNamesProperty(['fieldset', 'output', 'button'], messageProp, {
 			prop: {
 				value: '',
@@ -1294,13 +1301,16 @@ webshims.register('form-message', function($, webshims, window, document, undefi
 							if(message){return message;}
 						}
 						$.each(validity, function(name, prop){
-							if(name == 'valid' || !prop){return;}
+							if(skipNames[name] || !prop){return;}
 							
 							message = webshims.createValidationMessage(elem, name);
 							if(message){
 								return false;
 							}
 						});
+						if(!message && validity.badInput){
+							message = webshims.createValidationMessage(elem, 'typeMismatch') || webshims.createValidationMessage(elem, 'valueMissing');
+						}
 						return message || '';
 					},
 					writeable: false

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

@@ -272,7 +272,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 		if(!('type' in cache)){
 			cache.type = getType(input[0]);
 		}
-		
+		if(cache.type == 'week'){return false;}
 		var ret = (validityState || {}).stepMismatch || false, base;
 		if(typeModels[cache.type] && typeModels[cache.type].step){
 			if( !('step' in cache) ){
@@ -460,6 +460,29 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 		});
 	});
 	
+	/*
+	 * ToDO: WEEK
+	 */
+//	var getWeek = function(date){
+//		var time;
+//		var checkDate = new Date(date.getTime());
+//
+//		checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
+//
+//		time = checkDate.getTime();
+//		checkDate.setMonth(0);
+//		checkDate.setDate(1);
+//		return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+//	};
+//	
+//	var setWeek = function(year, week){
+//		var date = new Date(year, 0, 1);
+//		
+//		week = (week - 1) * 86400000 * 7;
+//		date = new Date(date.getTime() + week);
+//		date.setDate(date.getDate() + 1 - (date.getDay() || 7));
+//		return date;
+//	};
 	
 	var typeProtos = {
 		
@@ -536,6 +559,56 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 				return (date && date.getFullYear) ? addleadingZero(date.getUTCFullYear(), 4) +'-'+ addleadingZero(date.getUTCMonth()+1, 2) +'-'+ addleadingZero(date.getUTCDate(), 2) : false;
 			}
 		},
+		/*
+		 * ToDO: WEEK
+		 */
+//		week: {
+//			mismatch: function(val){
+//				if(!val || !val.split){return true;}
+//				var valA = val.split('-W');
+//				var ret = true;
+//				if(valA.length == 2 && valA[0].length > 3 && valA.length == 2){
+//					ret = this.dateToString(setWeek(valA[0], valA[1])) != val;
+//				}
+//				return ret;
+//			},
+//			step: 1,
+//			stepScaleFactor: 604800000,
+//			stepBase: -259200000,
+//			asDate: function(str, _noMismatch){
+//				var ret = null;
+//				if(_noMismatch || !this.mismatch(str)){
+//					ret = str.split('-W');
+//					ret = setWeek(ret[0], ret[1]);
+//				}
+//				return ret;
+//			},
+//			asNumber: function(str, _noMismatch){
+//				var ret = nan;
+//				var date = this.asDate(str, _noMismatch);
+//				if(date && date.getUTCFullYear){
+//					ret = date.getTime();
+//				}
+//				return ret;
+//			},
+//			dateToString: function(date){
+//				var week, checkDate;
+//				var ret = false;
+//				if(date && date.getFullYear){
+//					week = getWeek(date);
+//					if(week == 1){
+//						checkDate = new Date(date.getTime());
+//						checkDate.setDate(checkDate.getDate() + 7);
+//						date.setUTCFullYear(checkDate.getUTCFullYear());
+//					}
+//					ret = addleadingZero(date.getUTCFullYear(), 4) +'-W'+addleadingZero(week, 2);
+//				}
+//				return ret;
+//			},
+//			numberToString: function(num){
+//				return (isNumber(num)) ? this.dateToString(new Date( num * 1)) : false;
+//			}
+//		},
 		time: {
 			mismatch: function(val, _getParsed){
 				if(!val || !val.split || !(/\d$/.test(val))){return true;}
@@ -694,8 +767,6 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 //		typeProtos['datetime-local'] = $.extend({}, typeProtos.date, typeProtos.time, typeProtos['datetime-local']);
 	}
 	
-	
-	
 	//'datetime-local'
 	['number', 'month', 'range', 'date', 'time', 'color'].forEach(function(type){
 		if(typeBugs || !supportsType(type)){
@@ -1223,14 +1294,14 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			 webshims._polyfill(['es5']);
 		}
 	}
-})(jQuery);
+})(window.webshims ? webshims.$ : jQuery);
 webshims.register('form-number-date-ui', function($, webshims, window, document, undefined, options){
 	"use strict";
 	var curCfg;
 	var formcfg = webshims.formcfg;
 	
 	var stopPropagation = function(e){
-		e.stopImmediatePropagation(e);
+		e.stopImmediatePropagation();
 	};
 	var createFormat = function(name){
 		if(!curCfg.patterns[name+'Obj']){
@@ -1301,6 +1372,10 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		number: {
 			step: 1
 		},
+//		week: {
+//			step: 1,
+//			start: new Date(nowDate)
+//		},
 		time: {
 			step: 60
 		},
@@ -1503,6 +1578,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			time: function(val){
 				return val;
 			},
+			week: function(val){
+				return val;
+			},
 			//todo empty val for month/split
 			month: function(val, options){
 				var names;
@@ -1552,6 +1630,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			number: function(val){
 				return (val+'').replace(curCfg.numberFormat[','], '').replace(curCfg.numberFormat['.'], '.');
 			},
+//			week: function(val){
+//				return val;
+//			},
 			time: function(val){
 				return val;
 			},
@@ -1688,6 +1769,10 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					steps[this.type].start = this.asNumber(steps[this.type].start);
 				}
 				
+				if(!webshims.picker[this.type]){
+					o.buttonOnly = false;
+				}
+				
 				for(i = 0; i < createOpts.length; i++){
 					if(o[createOpts[i]] != null){
 						this[createOpts[i]](o[createOpts[i]], o[createOpts[i]]);
@@ -1699,6 +1784,11 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				this.addBindings();
 				$(this.element).data('wsWidget'+o.type, this);
 				
+				
+				if(o.buttonOnly){
+					this.inputElements.prop({readOnly: true});
+				}
+				
 				this._init = true;
 				
 				if(o.mirrorValidity){
@@ -1779,7 +1869,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					if(preventBlur.prevent){
 						e.preventDefault();
 						(isFocused || that.element.getShadowFocusElement()).focus();
-						e.stopImmediatePropagation();
+						stopPropagation(e);
 						return true;
 					}
 				};
@@ -2151,12 +2241,18 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		['readonly', 'disabled'].forEach(function(name){
 			var isDisabled = name == 'disabled';
 			wsWidgetProto[name] = function(val, boolVal){
-				if(this.options[name] != boolVal || !this._init){
-					this.options[name] = !!boolVal;
-					this.inputElements.prop(name, this.options[name]);
-					this.buttonWrapper[this.options[name] ? 'addClass' : 'removeClass']('ws-'+name);
+				var options = this.options;
+				if(options[name] != boolVal || !this._init){
+					options[name] = !!boolVal;
+					
+					if(!isDisabled && options.buttonOnly){
+						this.inputElements.attr({'aria-readonly': options[name]});
+					} else {
+						this.inputElements.prop(name, options[name]);
+					}
+					this.buttonWrapper[options[name] ? 'addClass' : 'removeClass']('ws-'+name);
 					if(isDisabled){
-						$('button', this.buttonWrapper).prop('disabled', this.options[name]);
+						$('button', this.buttonWrapper).prop('disabled', options[name]);
 					}
 				}
 			};
@@ -2443,9 +2539,10 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		
 		
 		picker._common = function(data){
-			var popover = webshims.objectCreate(webshims.wsPopover, {}, {prepareFor: data.element});
-			var opener = $('<button type="button" class="ws-popover-opener"><span /></button>').appendTo(data.buttonWrapper);
 			var options = data.options;
+			var popover = webshims.objectCreate(webshims.wsPopover, {}, {prepareFor: data.element, position: options.widgetPosition});
+			var opener = $('<button type="button" class="ws-popover-opener"><span /></button>').appendTo(data.buttonWrapper);
+			
 			
 			var showPickerContent = function(){
 				(picker[data.type].showPickerContent || picker.showPickerContent)(data, popover);
@@ -2534,8 +2631,8 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				};
 				data.inputElements.on({
 					focus: function(){
-						if(!popover.stopOpen && (data.options.openOnFocus || (mouseFocus && options.openOnMouseFocus))){
-							popover.openedByFocus = !options.noInput;
+						if(!popover.stopOpen && (options.buttonOnly || options.openOnFocus || (mouseFocus && options.openOnMouseFocus))){
+							popover.openedByFocus = options.buttonOnly ? false : !options.noInput;
 							show();
 						} else {
 							popover.preventBlur();
@@ -2544,8 +2641,15 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					mousedown: function(){
 						mouseFocus = true;
 						setTimeout(resetMouseFocus, 9);
+						if(options.buttonOnly && popover.isVisible && popover.activeElement){
+							popover.openedByFocus = false;
+							setTimeout(function(){
+								popover.openedByFocus = false;
+								popover.activeElement.focus();
+							}, 4);
+						}
 						if(data.element.is(':focus')){
-							popover.openedByFocus = !options.noInput;
+							popover.openedByFocus = options.buttonOnly ? false : !options.noInput;
 							show();
 						}
 						popover.preventBlur();
@@ -2556,8 +2660,10 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			data.opener = opener;
 			$(data.orig).on('remove', function(e){
 				if(!e.originalEvent){
-					opener.remove();
-					popover.element.remove();
+					setTimeout(function(){
+						opener.remove();
+						popover.element.remove();
+					}, 4);
 				}
 			});
 			
@@ -2566,6 +2672,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		
 		picker.month = picker._common;
 		picker.date = picker._common;
+//		picker.week = picker._common;
 		picker.color = function(data){
 			var ret = picker._common.apply(this, arguments);
 			var alpha = $(data.orig).data('alphacontrol');
@@ -2817,10 +2924,12 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					data.shim.element.addClass('has-input-buttons');
 				}
 				
+				data.shim.element.addClass($.prop(this, 'className'));
+				
 				if(opts.calculateWidth){
 					sizeInput(data.shim);
 				} else {
-					$(this).css({display: 'none'});
+					$(this).addClass('ws-important-hide');
 				}
 			}
 			

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

@@ -272,7 +272,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 		if(!('type' in cache)){
 			cache.type = getType(input[0]);
 		}
-		
+		if(cache.type == 'week'){return false;}
 		var ret = (validityState || {}).stepMismatch || false, base;
 		if(typeModels[cache.type] && typeModels[cache.type].step){
 			if( !('step' in cache) ){
@@ -460,6 +460,29 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 		});
 	});
 	
+	/*
+	 * ToDO: WEEK
+	 */
+//	var getWeek = function(date){
+//		var time;
+//		var checkDate = new Date(date.getTime());
+//
+//		checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
+//
+//		time = checkDate.getTime();
+//		checkDate.setMonth(0);
+//		checkDate.setDate(1);
+//		return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+//	};
+//	
+//	var setWeek = function(year, week){
+//		var date = new Date(year, 0, 1);
+//		
+//		week = (week - 1) * 86400000 * 7;
+//		date = new Date(date.getTime() + week);
+//		date.setDate(date.getDate() + 1 - (date.getDay() || 7));
+//		return date;
+//	};
 	
 	var typeProtos = {
 		
@@ -536,6 +559,56 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 				return (date && date.getFullYear) ? addleadingZero(date.getUTCFullYear(), 4) +'-'+ addleadingZero(date.getUTCMonth()+1, 2) +'-'+ addleadingZero(date.getUTCDate(), 2) : false;
 			}
 		},
+		/*
+		 * ToDO: WEEK
+		 */
+//		week: {
+//			mismatch: function(val){
+//				if(!val || !val.split){return true;}
+//				var valA = val.split('-W');
+//				var ret = true;
+//				if(valA.length == 2 && valA[0].length > 3 && valA.length == 2){
+//					ret = this.dateToString(setWeek(valA[0], valA[1])) != val;
+//				}
+//				return ret;
+//			},
+//			step: 1,
+//			stepScaleFactor: 604800000,
+//			stepBase: -259200000,
+//			asDate: function(str, _noMismatch){
+//				var ret = null;
+//				if(_noMismatch || !this.mismatch(str)){
+//					ret = str.split('-W');
+//					ret = setWeek(ret[0], ret[1]);
+//				}
+//				return ret;
+//			},
+//			asNumber: function(str, _noMismatch){
+//				var ret = nan;
+//				var date = this.asDate(str, _noMismatch);
+//				if(date && date.getUTCFullYear){
+//					ret = date.getTime();
+//				}
+//				return ret;
+//			},
+//			dateToString: function(date){
+//				var week, checkDate;
+//				var ret = false;
+//				if(date && date.getFullYear){
+//					week = getWeek(date);
+//					if(week == 1){
+//						checkDate = new Date(date.getTime());
+//						checkDate.setDate(checkDate.getDate() + 7);
+//						date.setUTCFullYear(checkDate.getUTCFullYear());
+//					}
+//					ret = addleadingZero(date.getUTCFullYear(), 4) +'-W'+addleadingZero(week, 2);
+//				}
+//				return ret;
+//			},
+//			numberToString: function(num){
+//				return (isNumber(num)) ? this.dateToString(new Date( num * 1)) : false;
+//			}
+//		},
 		time: {
 			mismatch: function(val, _getParsed){
 				if(!val || !val.split || !(/\d$/.test(val))){return true;}
@@ -694,8 +767,6 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 //		typeProtos['datetime-local'] = $.extend({}, typeProtos.date, typeProtos.time, typeProtos['datetime-local']);
 	}
 	
-	
-	
 	//'datetime-local'
 	['number', 'month', 'range', 'date', 'time', 'color'].forEach(function(type){
 		if(typeBugs || !supportsType(type)){
@@ -1223,14 +1294,14 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			 webshims._polyfill(['es5']);
 		}
 	}
-})(jQuery);
+})(window.webshims ? webshims.$ : jQuery);
 webshims.register('form-number-date-ui', function($, webshims, window, document, undefined, options){
 	"use strict";
 	var curCfg;
 	var formcfg = webshims.formcfg;
 	
 	var stopPropagation = function(e){
-		e.stopImmediatePropagation(e);
+		e.stopImmediatePropagation();
 	};
 	var createFormat = function(name){
 		if(!curCfg.patterns[name+'Obj']){
@@ -1301,6 +1372,10 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		number: {
 			step: 1
 		},
+//		week: {
+//			step: 1,
+//			start: new Date(nowDate)
+//		},
 		time: {
 			step: 60
 		},
@@ -1503,6 +1578,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			time: function(val){
 				return val;
 			},
+			week: function(val){
+				return val;
+			},
 			//todo empty val for month/split
 			month: function(val, options){
 				var names;
@@ -1552,6 +1630,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			number: function(val){
 				return (val+'').replace(curCfg.numberFormat[','], '').replace(curCfg.numberFormat['.'], '.');
 			},
+//			week: function(val){
+//				return val;
+//			},
 			time: function(val){
 				return val;
 			},
@@ -1688,6 +1769,10 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					steps[this.type].start = this.asNumber(steps[this.type].start);
 				}
 				
+				if(!webshims.picker[this.type]){
+					o.buttonOnly = false;
+				}
+				
 				for(i = 0; i < createOpts.length; i++){
 					if(o[createOpts[i]] != null){
 						this[createOpts[i]](o[createOpts[i]], o[createOpts[i]]);
@@ -1699,6 +1784,11 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				this.addBindings();
 				$(this.element).data('wsWidget'+o.type, this);
 				
+				
+				if(o.buttonOnly){
+					this.inputElements.prop({readOnly: true});
+				}
+				
 				this._init = true;
 				
 				if(o.mirrorValidity){
@@ -1779,7 +1869,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					if(preventBlur.prevent){
 						e.preventDefault();
 						(isFocused || that.element.getShadowFocusElement()).focus();
-						e.stopImmediatePropagation();
+						stopPropagation(e);
 						return true;
 					}
 				};
@@ -2151,12 +2241,18 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		['readonly', 'disabled'].forEach(function(name){
 			var isDisabled = name == 'disabled';
 			wsWidgetProto[name] = function(val, boolVal){
-				if(this.options[name] != boolVal || !this._init){
-					this.options[name] = !!boolVal;
-					this.inputElements.prop(name, this.options[name]);
-					this.buttonWrapper[this.options[name] ? 'addClass' : 'removeClass']('ws-'+name);
+				var options = this.options;
+				if(options[name] != boolVal || !this._init){
+					options[name] = !!boolVal;
+					
+					if(!isDisabled && options.buttonOnly){
+						this.inputElements.attr({'aria-readonly': options[name]});
+					} else {
+						this.inputElements.prop(name, options[name]);
+					}
+					this.buttonWrapper[options[name] ? 'addClass' : 'removeClass']('ws-'+name);
 					if(isDisabled){
-						$('button', this.buttonWrapper).prop('disabled', this.options[name]);
+						$('button', this.buttonWrapper).prop('disabled', options[name]);
 					}
 				}
 			};
@@ -2443,9 +2539,10 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		
 		
 		picker._common = function(data){
-			var popover = webshims.objectCreate(webshims.wsPopover, {}, {prepareFor: data.element});
-			var opener = $('<button type="button" class="ws-popover-opener"><span /></button>').appendTo(data.buttonWrapper);
 			var options = data.options;
+			var popover = webshims.objectCreate(webshims.wsPopover, {}, {prepareFor: data.element, position: options.widgetPosition});
+			var opener = $('<button type="button" class="ws-popover-opener"><span /></button>').appendTo(data.buttonWrapper);
+			
 			
 			var showPickerContent = function(){
 				(picker[data.type].showPickerContent || picker.showPickerContent)(data, popover);
@@ -2534,8 +2631,8 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				};
 				data.inputElements.on({
 					focus: function(){
-						if(!popover.stopOpen && (data.options.openOnFocus || (mouseFocus && options.openOnMouseFocus))){
-							popover.openedByFocus = !options.noInput;
+						if(!popover.stopOpen && (options.buttonOnly || options.openOnFocus || (mouseFocus && options.openOnMouseFocus))){
+							popover.openedByFocus = options.buttonOnly ? false : !options.noInput;
 							show();
 						} else {
 							popover.preventBlur();
@@ -2544,8 +2641,15 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					mousedown: function(){
 						mouseFocus = true;
 						setTimeout(resetMouseFocus, 9);
+						if(options.buttonOnly && popover.isVisible && popover.activeElement){
+							popover.openedByFocus = false;
+							setTimeout(function(){
+								popover.openedByFocus = false;
+								popover.activeElement.focus();
+							}, 4);
+						}
 						if(data.element.is(':focus')){
-							popover.openedByFocus = !options.noInput;
+							popover.openedByFocus = options.buttonOnly ? false : !options.noInput;
 							show();
 						}
 						popover.preventBlur();
@@ -2556,8 +2660,10 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			data.opener = opener;
 			$(data.orig).on('remove', function(e){
 				if(!e.originalEvent){
-					opener.remove();
-					popover.element.remove();
+					setTimeout(function(){
+						opener.remove();
+						popover.element.remove();
+					}, 4);
 				}
 			});
 			
@@ -2566,6 +2672,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		
 		picker.month = picker._common;
 		picker.date = picker._common;
+//		picker.week = picker._common;
 		picker.color = function(data){
 			var ret = picker._common.apply(this, arguments);
 			var alpha = $(data.orig).data('alphacontrol');
@@ -2817,10 +2924,12 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					data.shim.element.addClass('has-input-buttons');
 				}
 				
+				data.shim.element.addClass($.prop(this, 'className'));
+				
 				if(opts.calculateWidth){
 					sizeInput(data.shim);
 				} else {
-					$(this).css({display: 'none'});
+					$(this).addClass('ws-important-hide');
 				}
 			}