webshims-rails 1.11.3.1 → 1.11.6

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

@@ -1,15 +1,23 @@
 webshims.register('form-validation', function($, webshims, window, document, undefined, options){
+	"use strict";
+	
 	var isWebkit = 'webkitURL' in window;
 	var chromeBugs = isWebkit && Modernizr.formvalidation && !webshims.bugs.bustedValidity;
 	var webkitVersion = chromeBugs && parseFloat((navigator.userAgent.match(/Safari\/([\d\.]+)/) || ['', '999999'])[1], 10);
-	var invalidClass = options.iVal.errorClass || 'user-error';
-	var validClass = options.iVal.successClass || 'user-success';
 	
-	var invalidWrapperClass = options.iVal.errorWrapperClass || 'ws-invalid';
-	var successWrapperClass = options.iVal.successWrapperClass || 'ws-success';
-	var errorBoxClass = options.iVal.errorBoxClass || 'ws-errorbox';
+	var iVal = options.iVal;
+	var invalidClass = iVal.errorClass || 'user-error';
+	var validClass = iVal.successClass || 'user-success';
+	
+	var invalidWrapperClass = iVal.errorWrapperClass || 'ws-invalid';
+	var successWrapperClass = iVal.successWrapperClass || 'ws-success';
+	var errorBoxClass = iVal.errorBoxClass || 'ws-errorbox';
+	var errorMessageClass = iVal.errorMessageClass || 'ws-errormessage';
 	var checkTypes = {checkbox: 1, radio: 1};
 	
+	var loader = webshims.loader;
+	var addModule = loader.addModule;
+	
 	var emptyJ = $([]);
 	var isValid = function(elem){
 		return ($.prop(elem, 'validity') || {valid: 1}).valid;
@@ -80,7 +88,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 		'datetime-local': 1
 	};
 	var switchValidityClass = function(e){
-		if(!options.iVal.sel){return;}
+		if(!iVal.sel){return;}
 		var elem, timer, shadowElem, shadowType;
 		if(!e.target){return;}
 		elem = $(e.target).getNativeElement()[0];
@@ -154,14 +162,15 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			
 			$.removeData(elem, 'webshimsswitchvalidityclass');
 		};
-		
-		if(timer){
-			clearTimeout(timer);
-		}
-		if(e.type == 'refreshvalidityui'){
-			switchClass();
-		} else {
-			$.data(elem, 'webshimsswitchvalidityclass', setTimeout(switchClass, 9));
+		if(shadowElem.triggerHandler('wsallowinstantvalidation', [e]) !== false){
+			if(timer){
+				clearTimeout(timer);
+			}
+			if(e.type == 'refreshvalidityui'){
+				switchClass();
+			} else {
+				$.data(elem, 'webshimsswitchvalidityclass', setTimeout(switchClass, 9));
+			}
 		}
 	};
 	
@@ -241,8 +250,23 @@ webshims.register('form-validation', function($, webshims, window, document, und
 	$.extend(webshims.wsPopover, {
 		
 		
-		isInElement: function(container, contained){
-			return container == contained || $.contains(container, contained);
+		isInElement: function(containers, contained){
+			if(!$.isArray(containers)){
+				containers = [containers];
+			}
+			var i, len, container;
+			var ret = false;
+			for(i = 0, len = containers.length; i < len; i++){
+				container = containers[i];
+				if(container && container.jquery){
+					container = container[0];
+				}
+				if(container && (container == contained || $.contains(container, contained))){
+					ret = true;
+					break;
+				}
+			}
+			return ret;
 		},
 		show: function(element){
 			if(this.isVisible){return;}
@@ -274,8 +298,8 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				}, 9);
 			}, 9);
 			
-			$(document).on('focusin'+this.eventns+' mousedown'+this.eventns, function(e){
-				if(that.options.hideOnBlur && !that.stopBlur && !that.isInElement(that.lastElement[0] || document.body, e.target) && !that.isInElement(element[0] || document.body, e.target) && !that.isInElement(that.element[0], e.target)){
+			$(document.body || document).on('focusin'+this.eventns+' mousedown'+this.eventns, function(e){
+				if(that.options.hideOnBlur && !that.stopBlur && !that.isInElement([that.lastElement[0], element[0], that.element[0]], e.target)){
 					that.hide();
 				}
 			});
@@ -294,7 +318,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 					if(!appendElement && !invalidParent.test(parent.nodeName)){
 						appendElement = parent;
 					} 
-					if(appendElement && $.style(parent, 'overflow') == 'hidden' && $.style(parent, 'position') != 'static'){
+					if(appendElement && $.css(parent, 'overflow') == 'hidden' && $.css(parent, 'position') != 'static'){
 						appendElement = false;
 					}
 				}
@@ -352,6 +376,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 		clear: function(){
 			$(window).off(this.eventns);
 			$(document).off(this.eventns);
+			$(document.body).off(this.eventns);
 			this.element.off('transitionend'+this.eventns);
 			this.stopBlur = false;
 			this.lastOpts = false;
@@ -434,7 +459,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 					try {
 						focusElem[0].focus();
 					} catch(e){}
-					$(window).triggerHandler('pospopover'+this.eventns);
+					api.element.triggerHandler('pospopover');
 				};
 				
 				if(scrollTop > elemTop){
@@ -476,11 +501,20 @@ webshims.register('form-validation', function($, webshims, window, document, und
 		fade: {
 			show: 'fadeIn',
 			hide: 'fadeOut'
+		},
+		no: {
+			show: 'show',
+			hide: 'hide'
 		}
 	};
-	if(!fx[options.iVal.fx]){
-		options.iVal.fx = 'slide';
+	if(!iVal.fx || !fx[iVal.fx]){
+		iVal.fx = 'slide';
+	}
+	
+	if(!$.fn[fx[iVal.fx].show]){
+		iVal.fx = 'no';
 	}
+	
 	webshims.errorbox = {
 		create: function(elem, fieldWrapper){
 			if(!fieldWrapper){
@@ -489,7 +523,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			var errorBox = $('div.'+errorBoxClass, fieldWrapper);
 			
 			if(!errorBox.length){
-				errorBox = $('<div class="'+ errorBoxClass +'" hidden="hidden">');
+				errorBox = $('<div class="'+ errorBoxClass +'" hidden="hidden" style="display: none;">');
 				fieldWrapper.append(errorBox);
 			}
 			
@@ -498,20 +532,23 @@ webshims.register('form-validation', function($, webshims, window, document, und
 		},
 		getFieldWrapper: function(elem){
 			var fieldWrapper;
-			if(options.iVal.fieldWrapper){
-				fieldWrapper = (typeof options.iVal.fieldWrapper == "function") ? options.iVal.fieldWrapper.apply(this, arguments) : $(elem).parent().closest(options.iVal.fieldWrapper);
+			if(iVal.fieldWrapper){
+				fieldWrapper = (typeof iVal.fieldWrapper == "function") ? iVal.fieldWrapper.apply(this, arguments) : $(elem).parent().closest(iVal.fieldWrapper);
 				if(!fieldWrapper.length){
 					fieldWrapper = false;
-					webshims.error("could not find fieldwrapper: "+ options.iVal.fieldWrapper);
+					webshims.error("could not find fieldwrapper: "+ iVal.fieldWrapper);
 				}
 			}
 			if(!fieldWrapper){
-				fieldWrapper = $(elem).parent().closest(':not(span, label, em, strong, b, i, mark, p)');
+				fieldWrapper = $(elem).parent().closest(':not(span), :not(label), :not(em), :not(strong), :not(p)');
 			}
 			return fieldWrapper;
 		},
 		_createContentMessage: (function(){
 			var fields = {};
+			var deCamelCase = function(c){
+				return '-'+(c).toLowerCase();
+			};
 			var getErrorName = function(elem){
 				var ret = $(elem).data('errortype');
 				if(!ret){
@@ -524,15 +561,9 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				}
 				return ret || 'defaultMessage';
 			};
-			$(function(){
-				$.each($('<input />').prop('validity'), function(name){
-					if(name != 'valid'){
-						var cName = name.replace(/[A-Z]/, function(c){
-							return '-'+(c).toLowerCase();
-						});
-						fields[name] = '.'+cName+', .'+name+', .'+(name).toLowerCase()+', [data-errortype="'+ name +'"]';
-					}
-				});
+			$.each(["customError","badInput","typeMismatch","rangeUnderflow","rangeOverflow","stepMismatch","tooLong","tooShort","patternMismatch","valueMissing","tooShort"], function(i, name){
+				var cName = name.replace(/[A-Z]/, deCamelCase);
+				fields[name] = '.'+cName+', .'+name+', .'+(name).toLowerCase()+', [data-errortype="'+ name +'"]';
 			});
 			return function(elem, errorBox){
 				var extended = false;
@@ -540,18 +571,27 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				if(typeof errorMessages == 'string'){
 					errorMessages = {defaultMessage: errorMessages};
 				}
-				$('> *', errorBox).each(function(){
+				$(errorBox).children().each(function(){
 					var name = getErrorName(this);
 					if(!errorMessages[name]){
 						extended = true;
 						errorMessages[name] = $(this).html();
 					}
 				});
+				
 				if(extended){
 					$(elem).data('errormessage', errorMessages);
 				}
+				if(webshims.getOptions){
+					webshims.getOptions(elem, 'errormessage');
+				}
 			};
 		})(),
+		initIvalContentMessage: function(elem){
+			if($(elem).jProp('form').is(iVal.sel)){
+				this.get(elem);
+			}
+		},
 		get: function(elem, fieldWrapper){
 			if(!fieldWrapper){
 				fieldWrapper = this.getFieldWrapper(elem);
@@ -590,7 +630,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				} else {
 					fieldWrapper.removeClass(invalidWrapperClass);
 					errorBox.message = '';
-					errorBox[fx[options.iVal.fx].hide](function(){
+					errorBox[fx[iVal.fx].hide](function(){
 						$(this).attr({hidden: 'hidden'});
 					});
 				}
@@ -602,17 +642,17 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			return fieldWrapper;
 		},
 		recheckInvalidInput: function(input){
-			if(options.iVal.recheckDelay && options.iVal.recheckDelay > 90){
+			if(iVal.recheckDelay && iVal.recheckDelay > 90){
 				var timer;
 				var throttle = function(){
 					switchValidityClass({type: 'input', target: input});
 				};
 				$(input)
-					.filter('input:not([type="checkbox"], [type="radio"])')
+					.filter('input:not([type="checkbox"]):not([type="radio"])')
 					.off('.recheckinvalid')
 					.on('input.recheckinvalid', function(){
 						clearTimeout(timer);
-						timer = setTimeout(throttle, options.iVal.recheckDelay); 
+						timer = setTimeout(throttle, iVal.recheckDelay); 
 					})
 					.on('focusout.recheckinvalid', function(){
 						clearTimeout(timer);
@@ -626,7 +666,10 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			var message = $(elem).getErrorMessage();
 
 			if(box.message != message){
-				box.stop(true, true).html('<p>'+ message +'</p>');
+				if(box.stop){
+					box.stop(true, true);
+				}
+				box.html('<p class="'+ errorMessageClass +'"">'+ message +'</p>');
 				box.message = message;
 				fieldWrapper.addClass(invalidWrapperClass).removeClass(successWrapperClass);
 				this.recheckInvalidInput(elem);
@@ -634,7 +677,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 					box
 						.css({display: 'none'})
 						.removeAttr('hidden')
-						[fx[options.iVal.fx].show]()
+						[fx[iVal.fx].show]()
 					;
 				}
 			}
@@ -658,34 +701,34 @@ webshims.register('form-validation', function($, webshims, window, document, und
 	$(document.body)
 		.on({
 			'changedvaliditystate': function(e){
-				if(options.iVal.sel){
+				if(iVal.sel){
 					var form = $(e.target).jProp('form');
-					if(form.is(options.iVal.sel)){
+					if(form.is(iVal.sel)){
 						webshims.errorbox.toggle(e.target);
 					}
 				}
 			},
 			resetvalidityui: function(e){
-				if (options.iVal.sel) {
+				if (iVal.sel) {
 					var form = $(e.target).jProp('form');
-					if (form.is(options.iVal.sel)) {
+					if (form.is(iVal.sel)) {
 						webshims.errorbox.reset(e.target);
 					}
 				}
 			},
 			firstinvalid: function(e){
-				if(options.iVal.sel && options.iVal.handleBubble){
+				if(iVal.sel && iVal.handleBubble){
 				var form = $(e.target).jProp('form');
-					if(form.is(options.iVal.sel)){
+					if(form.is(iVal.sel)){
 						e.preventDefault();
-						if(options.iVal.handleBubble != 'none'){
-							webshims.validityAlert.showFor( e.target, false, false, options.iVal.handleBubble == 'hide' ); 
+						if(iVal.handleBubble != 'none'){
+							webshims.validityAlert.showFor( e.target, false, false, iVal.handleBubble == 'hide' ); 
 						}
 					}
 				}
 			},
 			submit: function(e){
-				if(options.iVal.sel && !options.iVal.noSubmitCheck &&$(e.target).is(options.iVal.sel) && $.prop(e.target, 'noValidate') && !$(e.target).checkValidity()){
+				if(iVal.sel && iVal.submitCheck &&$(e.target).is(iVal.sel) && $.prop(e.target, 'noValidate') && !$(e.target).checkValidity()){
 					e.stopImmediatePropagation();
 					return false;
 				}
@@ -695,15 +738,18 @@ 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');
+	}
 	
 	if(options.replaceValidationUI){
-		webshims.ready('DOM forms', function(){
-			$(document).on('firstinvalid', function(e){
-				if(!e.isInvalidUIPrevented()){
-					e.preventDefault();
+		$(document).on('firstinvalid', function(e){
+			if(!e.isInvalidUIPrevented()){
+				e.preventDefault();
+				setTimeout(function(){
 					webshims.validityAlert.showFor( e.target ); 
-				}
-			});
+				}, 4);
+			}
 		});
 	}
 	
@@ -747,29 +793,6 @@ webshims.register('form-validation', function($, webshims, window, document, und
 		});
 	})();
 	
-	//see: https://bugs.webkit.org/show_bug.cgi?id=113377
-	if (chromeBugs && webkitVersion < 540) {
-		(function(){
-			var elems = /^(?:textarea|input)$/i;
-			var form = false;
-			
-			document.addEventListener('contextmenu', function(e){
-				if (elems.test(e.target.nodeName || '') && (form = e.target.form)) {
-					setTimeout(function(){
-						form = false;
-					}, 1);
-				}
-			}, false);
-			
-			$(window).on('invalid', function(e){
-				if (e.originalEvent && form && form == e.target.form) {
-					e.wrongWebkitInvalid = true;
-					e.stopImmediatePropagation();
-				}
-			});
-			
-		})();
-	}
 	
 	if(!$.event.special.change && !$.event.special.input && Modernizr.inputtypes && options.fixRangeChange){
 		var rangeChange = {
@@ -907,4 +930,16 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			}
 		});
 	}
+	
+	addModule('form-combat', {
+		d: ['dom-support'],
+		test: ! (($.mobile && ($.mobile.selectmenu || $.mobile.checkboxradio)) || $.fn.select2 || $.fn.chosen || $.fn.selectpicker || $.fn.selectBoxIt)
+	});
+	
+	addModule('position', {
+		src: 'plugins/jquery.ui.position.js',
+		test:!! ($.position && $.position.getScrollInfo)
+	});
+	
+	loader.loadList(['form-combat', 'position']);
 });

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

@@ -49,15 +49,29 @@ webshims.register('form-validators', function($, webshims, window, document, und
 		var message = '';
 		var setMessage = function(message, errorType){
 			blockCustom = true;
-			data.customMismatchedRule = message ?  errorType : '';
 			
-			if(typeof message != 'string'){
-				message = $(elem).data('errormessage') || elem.getAttribute('x-moz-errormessage') || webshims.customErrorMessages[errorType][webshims.activeLang()] || webshims.customErrorMessages[errorType]['']; 
-			}
 			
-			if(typeof message == 'object'){
-				message = message[errorType] || message.customError || message.defaultMessage;
+			if(message){
+				data.customMismatchedRule = errorType;
+				
+				if(typeof message != 'string'){
+					message = webshims.getContentValidationMessage(elem, false, errorType); 
+					
+					if(message && typeof message == 'object'){
+						message = message[errorType];
+					}
+					
+					if(!message || typeof message != 'string'){
+						message = webshims.customErrorMessages[errorType][webshims.activeLang()] || webshims.customErrorMessages[errorType]['']  || message.customError || message.defaultMessage || '';
+					}
+				}
+			} else {
+				message = '';
+				data.customMismatchedRule = '';
 			}
+			
+			
+			
 			$(elem).setCustomValidity(message);
 			blockCustom = false;
 		};
@@ -70,7 +84,7 @@ webshims.register('form-validators', function($, webshims, window, document, und
 					return false;
 				}
 			});
-			if(message != 'async'){
+			if(message != 'async' && (message || !validity.valid)){
 				setMessage(message, customMismatchedRule);
 			}
 		}
@@ -148,8 +162,8 @@ webshims.register('form-validators', function($, webshims, window, document, und
 		groupTimer[name] = setTimeout(function(){
 			checkboxes
 				.addClass('group-required')
-				.unbind('click.groupRequired')
-				.bind('click.groupRequired', function(){
+				.off('click.groupRequired')
+				.on('click.groupRequired', function(){
 					checkboxes.filter('.group-required').each(function(){
 						webshims.refreshCustomValidityRules(this);
 					});
@@ -314,7 +328,6 @@ webshims.register('form-validators', function($, webshims, window, document, und
 						remoteValidate.restartAjax = false;
 					},
 					getResponse: function(data){
-						var old = webshims.refreshCustomValidityRules;
 						if(!data){
 							data = {message: '', valid: true};
 						} else if(typeof data == 'string'){