webshims-rails 1.14.1 → 1.14.3

data/vendor/assets/javascripts/webshims/shims/filereader.js

@@ -109,12 +109,6 @@ webshim.register('filereader', function($, webshim, window, document, undefined,
 					}
 
 					return inputValueDesc.prop._supget.call(this);
-				},
-				set: function(val){
-					if(val === '' && this.type == 'file' && $(this).hasClass('ws-filereader')){
-						webshim.data(this, 'fileList', []);
-					}
-					inputValueDesc.prop._supset.call(this);
 				}
 			}
 		}
@@ -312,10 +306,10 @@ webshim.register('filereader', function($, webshim, window, document, undefined,
 	}
 
 	if(!featureOptions.swfpath){
-		featureOptions.swfpath = shimMoxiePath+'flash/Moxie.cdn.swf';
+		featureOptions.swfpath = shimMoxiePath+'flash/Moxie.min.swf';
 	}
 	if(!featureOptions.xappath){
-		featureOptions.xappath = shimMoxiePath+'silverlight/Moxie.cdn.xap';
+		featureOptions.xappath = shimMoxiePath+'silverlight/Moxie.min.xap';
 	}
 
 	if($.support.cors !== false || !window.XDomainRequest){
@@ -365,6 +359,13 @@ webshim.register('filereader', function($, webshim, window, document, undefined,
 		}
 	});
 
+	webshim.onNodeNamesPropertyModify('input', 'value', function(value, boolVal, type){
+		if(value === '' && this.type == 'file' && $(this).hasClass('ws-filereader')){
+			webshim.data(this, 'fileList', []);
+		}
+	});
+
+
 	window.FileReader = notReadyYet;
 	window.FormData = notReadyYet;
 	webshim.ready('moxie', function(){
@@ -399,7 +400,7 @@ webshim.register('filereader', function($, webshim, window, document, undefined,
 					if(inputName && !$(appendData[i]).is(':disabled')){
 						files = $.prop(appendData[i], 'files') || [];
 						if(files.length){
-							if(files.length > 1){
+							if(files.length > 1 || (moxieData.hasBlob && moxieData.hasBlob())){
 								webshim.error('FormData shim can only handle one file per ajax. Use multiple ajax request. One per file.');
 							}
 							for(fileI = 0, fileLen = files.length; fileI < fileLen; fileI++){

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

@@ -701,11 +701,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				if( steps[this.type] && typeof steps[this.type].start == 'object'){
 					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]]);
@@ -935,7 +931,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				wsWidgetProto._create.apply(this, arguments);
 				this._init = false;
 				
-				this.buttonWrapper.html('<span unselectable="on" class="step-controls"><span class="step-up"></span><span class="step-down"></span></span>');
+				this.buttonWrapper.html('<span unselectable="on" class="step-controls"><span class="step-up step-control"></span><span class="step-down step-control"></span></span>');
 				
 				if(this.type == 'number'){
 					this.inputElements.attr('inputmode', 'numeric');
@@ -1118,7 +1114,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					}
 
 					touch = changedTouches[0];
-					if(Math.abs(touchData.x - touch.pageX) > 40 || Math.abs(touchData.y - touch.pageY) > 40 || Date.now() - touchData.now > 600){
+					if(Math.abs(touchData.x - touch.pageX) > 40 || Math.abs(touchData.y - touch.pageY) > 40 || Date.now() - touchData.now > 300){
 						return;
 					}
 					e.preventDefault();
@@ -1316,7 +1312,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					}
 				};
 				return function(prop){
-					if(prop == 'value' && !data.options.inlinePicker){return;}
+					if(prop == 'value' && (!data.options.inlinePicker || data._handledValue )){return;}
 					popover.isDirty = true;
 					
 					if(popover.isVisible){
@@ -1375,6 +1371,13 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				}
 				show();
 			};
+			var toogle = function(){
+				if(popover.openedByFocus || !popover.isVisible){
+					open();
+				} else {
+					popover.hide();
+				}
+			}
 			
 			
 			options.containerElements.push(popover.element[0]);
@@ -1415,7 +1418,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			}
 			
 			
-			opener.wsTouchClick(open);
+			opener.wsTouchClick(toogle);
 			
 			if(options.inlinePicker){
 				popover.openedByFocus = true;
@@ -1767,9 +1770,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				}
 				
 				data.shim.element.on('change input', stopPropagation).addClass(cNames+' '+webshims.shadowClass);
-				
+
 				if(data.shim.buttonWrapper){
-					
+
 					data.shim.buttonWrapper.addClass('input-button-size-'+(data.shim.buttonWrapper.children().filter(isVisible).length)+' '+webshims.shadowClass);
 					
 					if(data.shim.buttonWrapper.filter(isVisible).length){
@@ -1926,6 +1929,32 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				;
 			});
 		};
+
+
+		if($('<input />').prop('labels') == null){
+			webshims.defineNodeNamesProperty('button, input, keygen, meter, output, progress, select, textarea', 'labels', {
+				prop: {
+					get: function(){
+						if(this.type == 'hidden'){return null;}
+						var id = this.id;
+						var labels = $(this)
+								.closest('label')
+								.filter(function(){
+									var hFor = (this.attributes['for'] || {});
+									return (!hFor.specified || hFor.value == id);
+								})
+							;
+
+						if(id) {
+							labels = labels.add('label[for="'+ id +'"]');
+						}
+						return labels.get();
+					},
+					writeable: false
+				}
+			});
+		}
+
 		if(formcfg._isLoading){
 			$(formcfg).one('change', init);
 		} else {

data/vendor/assets/javascripts/webshims/shims/form-shim-extend.js

@@ -110,12 +110,13 @@ var getGroupElements = function(elem){
 		} else {
 			form = elem.prop('form');
 			ret = $(document.getElementsByName(name)).filter(function(){
-				return this.type == 'radio' && this.name == name && $.prop(this, 'form') == form;
+				return this.type == 'radio' && $.prop(this, 'form') == form && this.name == name;
 			});
 		}
 	}
 	return ret;
 };
+
 var patternTypes = {url: 1, email: 1, text: 1, search: 1, tel: 1, password: 1};
 var lengthTypes = $.extend({textarea: 1}, patternTypes);
 
@@ -194,6 +195,8 @@ $.each({typeMismatch: 'mismatch', badInput: 'bad'}, function(name, fn){
 	};
 });
 
+webshims.modules["form-core"].getGroupElements = getGroupElements;
+
 webshims.addValidityRule = function(type, fn){
 	validityRules[type] = fn;
 };

data/vendor/assets/javascripts/webshims/shims/form-shim-extend2.js

@@ -583,6 +583,7 @@ webshims.register('form-shim-extend2', function($, webshims, window, document, u
 					} else {
 						webshims.info("you should use label elements for your prgogress elements");
 					}
+					$(this).addClass('ws-style');
 					if($(this).css('direction') == 'rtl'){
 						$(this).addClass('ws-is-rtl');
 					}
@@ -1200,7 +1201,7 @@ webshims.register('form-shim-extend2', function($, webshims, window, document, u
 
 
 				}
-			;
+				;
 			var observe = function(newInput){
 				unbind();
 

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

@@ -9,9 +9,6 @@ webshims.register('form-validation', function($, webshims, window, document, und
 	
 	var iVal = options.iVal;
 
-	if(!iVal.fieldWrapper){
-		iVal.fieldWrapper = ':not(span):not(label):not(em):not(strong):not(p):not(.ws-custom-file)';
-	}
 	var invalidClass = iVal.errorClass || (iVal.errorClass = 'user-error');
 	var validClass = iVal.successClass || (iVal.successClass = 'user-success');
 	
@@ -30,8 +27,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 	var nonFormFilter = function(){
 		return !$.prop(this, 'form');
 	};
-	//TODO: cache + perftest
-	var getGroupElements = function(elem){
+	var getGroupElements = webshims.modules["form-core"].getGroupElements || function(elem){
 		elem = $(elem);
 		var name;
 		var form;
@@ -202,6 +198,14 @@ webshims.register('form-validation', function($, webshims, window, document, und
 		iVal.events += ' ';
 	}
 
+	if(!iVal.fieldWrapper){
+		iVal.fieldWrapper = ':not(span):not(label):not(em):not(strong):not(p):not(.ws-custom-file)';
+	}
+
+	if(!webshims.modules["form-core"].getGroupElements){
+		webshims.modules["form-core"].getGroupElements = getGroupElements;
+	}
+
 	$(document.body || 'html')
 		.on(iVal.events+'refreshvalidityui updatevalidation.webshims invalid', switchValidityClass)
 		.on('reset resetvalidation.webshims resetvalui', function(e){
@@ -242,13 +246,23 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			$(document.documentElement)
 		;
 	};
-	var minWidth = (Modernizr.boxSizing || Modernizr['display-table'] || $.support.getSetAttribute || $.support.boxSizing) ?
-		'minWidth' :
-		'width'
-	;
 	var hasTransition = ('transitionDelay' in document.documentElement.style);
 	var resetPos = {display: 'inline-block', left: 0, top: 0, marginTop: 0, marginLeft: 0, marginRight: 0, marginBottom: 0};
-	
+	var fx = {
+		slide: {
+			show: 'slideDown',
+			hide: 'slideUp'
+		},
+		fade: {
+			show: 'fadeIn',
+			hide: 'fadeOut'
+		},
+		no: {
+			show: 'show',
+			hide: 'hide'
+		}
+	};
+
 	setRoot();
 	webshims.ready('DOM', setRoot);
 	
@@ -328,6 +342,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			return ret;
 		},
 		show: function(element){
+			var showAction;
 			if(this.isVisible){return;}
 			var e = $.Event('wspopoverbeforeshow');
 			this.element.trigger(e);
@@ -356,17 +371,25 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			};
 
 			this.clear();
-			this.element.removeClass('ws-po-visible').css('display', 'none');
+			this.element.css('display', 'none');
 			
 			this.prepareFor(element, visual);
 			
 			this.position(visual);
-			that.timers.show = setTimeout(function(){
-				that.element.css('display', '');
+
+			if(this.options.inline){
+				showAction = (fx[this.options.inline] || fx.slide).show;
+				that.element[showAction]().trigger('wspopovershow');
+			} else {
+				this.element.removeClass('ws-po-visible');
 				that.timers.show = setTimeout(function(){
-					that.element.addClass('ws-po-visible').trigger('wspopovershow');
-				}, 14);
-			}, 4);
+					that.element.css('display', '');
+					that.timers.show = setTimeout(function(){
+						that.element.addClass('ws-po-visible').trigger('wspopovershow');
+					}, 14);
+				}, 4);
+			}
+
 
 			$(document.body)
 				.on('focusin'+this.eventns+' mousedown'+this.eventns, closeOnOutSide)
@@ -404,7 +427,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			this.lastOpts = opts;
 			this.lastElement = $(element).getShadowFocusElement();
 			if(!this.prepared || !this.options.prepareFor){
-				if(opts.appendTo == 'element'){
+				if(opts.appendTo == 'element' || (opts.inline && opts.appendTo == 'auto')){
 					parentElem = element.parent();
 				} else if(opts.appendTo == 'auto'){
 					parentElem = this._getAutoAppendElement(element);
@@ -420,11 +443,23 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				'data-class': element.prop('className'),
 				'data-id': element.prop('id')
 			});
-			
-			css[minWidth] = opts.constrainWidth ? visual.outerWidth() : '';
-			
+
+			if(opts.constrainWidth){
+				this.element.addClass('ws-popover-constrained-width');
+				css.minWidth = visual.outerWidth();
+			} else {
+				this.element.removeClass('ws-popover-constrained-width');
+				css.minWidth = '';
+			}
+
+			if(opts.inline){
+				this.element.addClass('ws-popinline ws-po-visible');
+			} else {
+				this.element.removeClass('ws-popinline');
+			}
+
 			this.element.css(css);
-			
+
 			if(opts.hideOnBlur){
 				onBlur = function(e){
 					if(that.stopBlur){
@@ -438,8 +473,6 @@ webshims.register('form-validation', function($, webshims, window, document, und
 					that.lastElement.off(that.eventns).on('focusout'+that.eventns + ' blur'+that.eventns, onBlur);
 					that.lastElement.getNativeElement().off(that.eventns);
 				}, 10);
-				
-				
 			}
 			
 			this.prepared = true;
@@ -460,6 +493,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			});
 		},
 		hide: function(){
+			var hideAction;
 			var e = $.Event('wspopoverbeforehide');
 			this.element.trigger(e);
 			if(e.isDefaultPrevented() || !this.isVisible){return;}
@@ -473,18 +507,30 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				}
 			};
 			this.clear();
-			this.element.removeClass('ws-po-visible').trigger('wspopoverhide');
-			$(window).on('resize'+this.eventns, forceHide);
-			if(hasTransition){
-				this.element.off('transitionend'+this.eventns).on('transitionend'+this.eventns, forceHide);
+
+			if(this.options.inline){
+				hideAction = (fx[this.options.inline] || fx.slide).hide;
+				this.element[hideAction]();
+			} else {
+				this.element.removeClass('ws-po-visible');
+				$(window).on('resize'+this.eventns, forceHide);
+				if(hasTransition){
+					this.element.off('transitionend'+this.eventns).on('transitionend'+this.eventns, forceHide);
+				}
+
+				that.timers.forcehide = setTimeout(forceHide, hasTransition ? 600 : 40);
 			}
-			
-			that.timers.forcehide = setTimeout(forceHide, hasTransition ? 600 : 40);
+			this.element.trigger('wspopoverhide');
+
 		},
 		position: function(element){
-			var offset = webshims.getRelOffset(this.element.removeAttr('hidden'), element, (this.lastOpts || this.options).position);
-			
-			this.element.css(offset);
+			var offset;
+			var opts = this.lastOpts || this.options;
+			if(!opts.inline){
+				offset = webshims.getRelOffset(this.element.removeAttr('hidden'), element, (this.lastOpts || this.options).position);
+
+				this.element.css(offset);
+			}
 		}
 	});
 	
@@ -569,20 +615,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 		return api;
 	})();
 	
-	var fx = {
-		slide: {
-			show: 'slideDown',
-			hide: 'slideUp'
-		},
-		fade: {
-			show: 'fadeIn',
-			hide: 'fadeOut'
-		},
-		no: {
-			show: 'show',
-			hide: 'hide'
-		}
-	};
+
 	if(!iVal.fx || !fx[iVal.fx]){
 		iVal.fx = 'slide';
 	}
@@ -843,7 +876,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 		})
 	;
 	
-	webshims.modules["form-core"].getGroupElements = getGroupElements;
+
 	
 	if(/[\s\:\>\~\+]/.test(iVal.sel || '')){
 		webshims.error('please use a simple selector for iVal.sel: for example .validate');

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

@@ -182,17 +182,28 @@ var iValClasses = '.'+ options.iVal.errorClass +', .'+options.iVal.successClass;
 	};
 	var testValidityRules = webshims.refreshCustomValidityRules;
 
-	if(typeof document.activeElement != 'unknown'){
-		$('body').on('click', function(e){
-			if(e.target.type == 'submit'){
-				var activeElement = document.activeElement;
 
-				if(activeElement != e.target && $.data(activeElement, 'webshimsswitchvalidityclass')){
-					$(activeElement).trigger('updatevalidation.webshims');
+	$('body').on('click', function(e){
+		if(e.target.type == 'submit' && !e.isDefaultPrevented()){
+			var activeElement, i, len;
+			var elements = $(e.target).jProp('form').prop('elements') || [];
+			try {
+				activeElement = document.activeElement;
+			} catch(e){}
+
+			for(i = 0, len = elements.length; i < len; i++){
+				if($.data(elements[i], 'customMismatchedRule')){
+					if(activeElement == elements[i]){
+						$(elements[i]).trigger('updatevalidation.webshims');
+					} else {
+						testValidityRules(elements[i]);
+					}
 				}
 			}
-		});
-	}
+
+		}
+	});
+
 	
 	webshims.ready('forms form-validation', function(){