webshims-rails 1.10.9 → 1.10.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWI2OGRjYmRhYTU5ZDRhOWZmM2Y3ODlmNzkwYzA0Y2FmOGQ4NWNjOQ==
+    MWYxOTgxNWIyNzYwNzllNGJiOGM1YzQ4ZGFmNjRlODNhMDQ3NGE3Yg==
   data.tar.gz: !binary |-
-    ZTRlODMwMTM0YzNmMzA2YmZlYTIwNDllZWQ2YTgxZWNmYTQ2MjBhMw==
+    NTZkYmY1Yzk5YmJlODcyYjQ3NWE0ZTM2YjhiOTg3Y2MwYzM1MTE3Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWE1M2U1YmE0YTlhNGRhMDdmM2Y0NWY3MDNiNjljM2YwNzk5NzYyYzUwM2Q3
-    NGQ4NjE2YzNiZDg2NGIyOTdjMTJlMDFlZDQxYzY1ZDAxZjhkYWM5OGI5ZjIz
-    NWQ0ZGY4MDcyMjc2ZGViNjI2NDNkMDE5ODVlYTBiNjlkNzM0ZDc=
+    ZGY4MjZiY2VkY2UzNGY5Y2I1NGY3YjkyYTI2ZWRjMDE1YTAxZmExOTZlMmM1
+    YmZmZWYyMWFhOWQ3YjVkZDc4NGM1MDZkNThkMTE0ZWE1ZGNkYjA4OTZjNzM4
+    NDVkNzE0YTUyN2M4ZjNkMGFhOTg2OTk5MTgxNGVjODFmNGNhOGQ=
   data.tar.gz: !binary |-
-    YjgyM2U1YzYwMTljNTAxMTE3OGZmNWNjMzg0MjdmYzZjYTMxMTQ2ZjI1NDAx
-    NGY1NjQ1ZTY1ZDJjOGQ1ODM4NTEzZWQ4NmE5MTY1NmI4MTY2ZThlNGYxZDRi
-    YjM1NjgxNzcxMzkzMmE5MzkyNDBmZWVmMzE3OGVlN2JjMDNlZmU=
+    MDQ2N2QyN2M4ODY4NWJhZGViNTZmYzBjZjQxZDVlMWY5NWJmMzkwOTkxZGY0
+    ZDZiZGUyNThjZDFlNzEzNDE4MWNhMmQ5MTExNjg4OGY1Mzc1ZWIzYWRhZTg2
+    MmI2YmQ2NjM0MGE5MjJjNWFmZDZmMjUwNTkzZTI2ZGYwYjAzODI=

data/lib/webshims-rails/version.rb

@@ -1,6 +1,6 @@
 module Webshims
   module Rails
-    VERSION = "1.10.9"
-    WEBSHIMS_VERSION = "1.10.9"
+    VERSION = "1.10.10"
+    WEBSHIMS_VERSION = "1.10.10"
   end
 end

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

@@ -25,12 +25,9 @@
 		Modernizr.ES5 = false;
 	}
 	
-	if(!$.event.customEvent){
-		$.event.customEvent = {};
-	}
 	
 	var webshims = {
-		version: '1.10.9',
+		version: '1.10.10',
 		cfg: {
 			useImportantStyles: true,
 			//addCacheBuster: false,
@@ -946,6 +943,7 @@
 		var fNuAPI = 'form-number-date-api';
 		var select = $('<select required="" name="a"><option disabled="" /></select>')[0];
 		var bustedValidity = false;
+		var bustedWidgetUi = false;
 		
 		var initialFormTest = function(){
 			if(!initialFormTest.run){
@@ -965,9 +963,10 @@
 				}
 				
 				if(Modernizr[formvalidation]){
-					bugs.bustedValidity = bustedValidity = !modernizrInputAttrs.list || window.opera || Modernizr.formattribute === false || !Modernizr.fieldsetdisabled || !('value' in document.createElement('progress')) || !('value' in document.createElement('output')) || !($('<input type="date" value="1488-12-11" />')[0].validity || {valid: true}).valid || !('required' in select) || (select.validity || {}).valid;
+					bustedWidgetUi = window.opera || Modernizr.formattribute === false || !Modernizr.fieldsetdisabled || !('value' in document.createElement('progress')) || !('value' in document.createElement('output')) || !($('<input type="date" value="1488-12-11" />')[0].validity || {valid: true}).valid || !('required' in select) || (select.validity || {}).valid;
+					bugs.bustedValidity = bustedValidity = bustedWidgetUi || !modernizrInputAttrs.list;
 				}
-				
+
 				formExtend = Modernizr[formvalidation] && !bustedValidity ? 'form-native-extend' : fShim;
 				
 			}
@@ -1003,7 +1002,7 @@
 //					,fieldWrapper: undefined
 //					,fx: 'slide'
 				},
-				availabeLangs: ['ar', 'ch-ZN', 'el', 'es', 'fr', 'he', 'hi', 'hu', 'it', 'ja', 'lt', 'nl', 'pt-PT', 'ru', 'sv'] //en and de are directly implemented in core
+				availabeLangs: ['ar', 'ch-ZN', 'el', 'es', 'fr', 'he', 'hi', 'hu', 'it', 'ja', 'lt', 'nl', 'pl', 'pt-PT', 'ru', 'sv'] //en and de are directly implemented in core
 	//			,customMessages: false,
 	//			overridePlaceholder: false, // might be good for IE10
 	//			replaceValidationUI: false
@@ -1054,7 +1053,7 @@
 		addPolyfill(fNuAPI, {
 			f: 'forms-ext',
 			options: {
-				types: 'range date time number month'
+				types: 'month date time range number'
 			},
 			test: function(){
 				var ret = true;
@@ -1095,7 +1094,7 @@
 				var o = this.options;
 				initialFormTest();
 				//input widgets on old on old androids can't be trusted
-				if(fShim == formExtend && (/Android/i).test(navigator.userAgent)){
+				if(bustedWidgetUi && !o.replaceUI && (/Android/i).test(navigator.userAgent)){
 					o.replaceUI = true;
 				}
 				return !o.replaceUI && modules[fNuAPI].test();

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

@@ -8,7 +8,7 @@ var swfmini = function() {
 	
 	var UNDEF = "undefined",
 		OBJECT = "object",
-		webshims = jQuery.webshims || window.webshims,
+		webshims = window.webshims,
 		SHOCKWAVE_FLASH = "Shockwave Flash",
 		SHOCKWAVE_FLASH_AX = "ShockwaveFlash.ShockwaveFlash",
 		FLASH_MIME_TYPE = "application/x-shockwave-flash",
@@ -573,6 +573,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 {
@@ -595,10 +596,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 = {};
@@ -645,6 +654,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};
@@ -733,8 +747,9 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 	})();
 });
 
-(function($, Modernizr, webshims){
+(function(Modernizr, webshims){
 	"use strict";
+	var $ = webshims.$;
 	var hasNative = Modernizr.audio && Modernizr.video;
 	var supportsLoop = false;
 	var bugs = webshims.bugs;
@@ -838,6 +853,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 	hasSwf = swfmini.hasFlashPlayerVersion('9.0.115');
 	$('html').addClass(hasSwf ? 'swf' : 'no-swf');
 	var mediaelement = webshims.mediaelement;
+	
 	mediaelement.parseRtmp = function(data){
 		var src = data.src.split('://');
 		var paths = src[1].split('/');
@@ -1007,7 +1023,6 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 			var src = getSrcObj(mediaElem, nodeName);
 			
 			if(!src.src){
-				
 				$('source', mediaElem).each(function(){
 					src = getSrcObj(this, nodeName);
 					if(src.src){srces.push(src);}
@@ -1022,18 +1037,10 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 				srces = [srces]; 
 			}
 			srces.forEach(function(src){
-				var source = document.createElement('source');
 				if(typeof src == 'string'){
 					src = {src: src};
 				} 
-				source.setAttribute('src', src.src);
-				if(src.type){
-					source.setAttribute('type', src.type);
-				}
-				if(src.media){
-					source.setAttribute('media', src.media);
-				}
-				mediaElem.append(source);
+				mediaElem.append($(document.createElement('source')).attr(src));
 			});
 			
 		}
@@ -1181,6 +1188,9 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 		
 		if(!_srces.length || !parent || parent.nodeType != 1 || stopParent.test(parent.nodeName || '')){return;}
 		data = data || webshims.data(elem, 'mediaelement');
+		if(mediaelement.sortMedia){
+			_srces.sort(mediaelement.sortMedia);
+		}
 		stepSources(elem, data, options.preferFlash || undefined, _srces);
 	};
 	mediaelement.selectSource = selectSource;
@@ -1355,4 +1365,4 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 	}
 	webshims.ready('track', loadTrackUi);
 });
-})(jQuery, Modernizr, webshims);
+})(Modernizr, webshims);

data/vendor/assets/javascripts/webshims/shims/combos/10.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);
 
 (function($){
 	
@@ -1583,14 +1586,14 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			 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']){
@@ -1661,6 +1664,10 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		number: {
 			step: 1
 		},
+//		week: {
+//			step: 1,
+//			start: new Date(nowDate)
+//		},
 		time: {
 			step: 60
 		},
@@ -1863,6 +1870,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;
@@ -1912,6 +1922,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;
 			},
@@ -2048,6 +2061,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]]);
@@ -2059,6 +2076,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){
@@ -2139,7 +2161,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;
 					}
 				};
@@ -2511,12 +2533,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]);
 					}
 				}
 			};
@@ -2803,9 +2831,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);
@@ -2894,8 +2923,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();
@@ -2904,8 +2933,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();
@@ -2916,8 +2952,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);
 				}
 			});
 			
@@ -2926,6 +2964,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');
@@ -3177,10 +3216,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/11.js

@@ -493,14 +493,14 @@
 			 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']){
@@ -571,6 +571,10 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		number: {
 			step: 1
 		},
+//		week: {
+//			step: 1,
+//			start: new Date(nowDate)
+//		},
 		time: {
 			step: 60
 		},
@@ -773,6 +777,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;
@@ -822,6 +829,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;
 			},
@@ -958,6 +968,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]]);
@@ -969,6 +983,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){
@@ -1049,7 +1068,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;
 					}
 				};
@@ -1421,12 +1440,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]);
 					}
 				}
 			};
@@ -1713,9 +1738,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);
@@ -1804,8 +1830,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();
@@ -1814,8 +1840,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();
@@ -1826,8 +1859,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);
 				}
 			});
 			
@@ -1836,6 +1871,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');
@@ -2087,10 +2123,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');
 				}
 			}