webshims-rails 1.12.0 → 1.12.2

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

@@ -222,6 +222,9 @@ $.event.special.invalid = {
 		var notValid = !($(e.target).callProp('reportValidity'));
 		if(notValid){
 			e.stopImmediatePropagation();
+			if(!options.noFormInvalid){
+				$(e.target).trigger('invalid');
+			}
 			return false;
 		}
 	}

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

@@ -481,10 +481,7 @@ if(!Modernizr.formattribute || !Modernizr.fieldsetdisabled || !Modernizr.fieldse
 			var nan = parseInt('NaN', 10);
 			
 			var updateProgress = function(progress){
-				var position;
-				
-				
-				position = $.prop(progress, 'position');
+				var position = $.prop(progress, 'position');
 				
 				$.attr(progress, 'data-position', position);
 				$('> span', progress).css({width: (position < 0 ?  100 : position * 100) +'%'});
@@ -508,8 +505,9 @@ if(!Modernizr.formattribute || !Modernizr.fieldsetdisabled || !Modernizr.fieldse
 										$.attr(this, 'aria-valuemax', max);
 									}
 								}
+								$(this).removeClass('ws-indeterminate');
 							} else if(updateProgress.isInChange) {
-								$(this).removeAttr('aria-valuenow');
+								$(this).removeAttr('aria-valuenow').addClass('ws-indeterminate');
 							}
 							return ret;
 						},
@@ -584,7 +582,9 @@ if(!Modernizr.formattribute || !Modernizr.fieldsetdisabled || !Modernizr.fieldse
 					} else {
 						webshims.info("you should use label elements for your prgogress elements");
 					}
-					
+					if($(this).css('direction') == 'rtl'){
+						$(this).addClass('ws-is-rtl');
+					}
 					updateProgress.isInChange = 'max';
 					updateProgress(this);
 					updateProgress.isInChange = false;

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

@@ -2,7 +2,8 @@ webshims.register('form-validation', function($, webshims, window, document, und
 	"use strict";
 	
 	var isWebkit = 'webkitURL' in window;
-	var chromeBugs = isWebkit && Modernizr.formvalidation && !webshims.bugs.bustedValidity;
+	var hasNative = Modernizr.formvalidation && !webshims.bugs.bustedValidity;
+	var chromeBugs = isWebkit && hasNative;
 	var webkitVersion = chromeBugs && parseFloat((navigator.userAgent.match(/Safari\/([\d\.]+)/) || ['', '999999'])[1], 10);
 	
 	var iVal = options.iVal;
@@ -215,25 +216,42 @@ webshims.register('form-validation', function($, webshims, window, document, und
 	setRoot();
 	webshims.ready('DOM', setRoot);
 	
-	
+	var rtlReg = /right|left/g;
+	var rtlReplace = function(ret){
+		return ret == 'left' ? 'right' : 'left';
+	};
 	webshims.getRelOffset = function(posElem, relElem, opts){
 		var offset, bodyOffset, dirs;
 		posElem = $(posElem);
-		$.swap($(posElem)[0], resetPos, function(){
+		$.swap(posElem[0], resetPos, function(){
+			var isRtl;
 			if($.position && opts && $.position.getScrollInfo){
 				if(!opts.of){
 					opts.of = relElem;
 				}
 				
+				isRtl = $(opts.of).css('direction') == 'rtl';
+				if(!opts.isRtl){
+					opts.isRtl = false;
+				}
+				if(opts.isRtl != isRtl){
+					opts.my = (opts.my || 'center').replace(rtlReg, rtlReplace);
+					opts.at = (opts.at || 'center').replace(rtlReg, rtlReplace);
+					opts.isRtl = isRtl;
+				}
+				
+				posElem[opts.isRtl ? 'addClass' : 'removeClass']('ws-is-rtl');
+				
 				opts.using = function(calced, data){
 					posElem.attr({'data-horizontal': data.horizontal, 'data-vertical': data.vertical});
 					offset = calced;
 				};
+				
 				posElem.attr({
 					'data-horizontal': '', 
 					'data-vertical': '',
-					'data-my': opts.my || 'center',
-					'data-at': opts.at || 'center'
+					'data-my': opts.my,
+					'data-at': opts.at
 				});
 				posElem.position(opts);
 				
@@ -463,6 +481,9 @@ webshims.register('form-validation', function($, webshims, window, document, und
 					try {
 						focusElem[0].focus();
 					} catch(e){}
+					if(!focusElem[0].offsetWidth && !focusElem[0].offsetHeight){
+						webshims.warn('invalid element seems to be hidden. Make element either visible or use disabled/readonly to bar elements from validation. With fieldset[disabled] a group of elements can be ignored.');
+					}
 					api.element.triggerHandler('pospopover');
 				};
 				
@@ -546,6 +567,16 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			return fieldWrapper;
 		},
 		_createContentMessage: (function(){
+			var noValidate = function(){
+				return !noValidate.types[this.type];
+			};
+			noValidate.types = {
+				hidden: 1,
+				image: 1,
+				button: 1,
+				reset: 1,
+				submit: 1
+			};
 			var fields = {};
 			var deCamelCase = function(c){
 				return '-'+(c).toLowerCase();
@@ -566,26 +597,36 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				var cName = name.replace(/[A-Z]/, deCamelCase);
 				fields[name] = '.'+cName+', .'+name+', .'+(name).toLowerCase()+', [data-errortype="'+ name +'"]';
 			});
-			return function(elem, errorBox){
+			return function(elem, errorBox, fieldWrapper){
 				var extended = false;
-				var errorMessages = $(elem).data('errormessage') || {};
-				if(typeof errorMessages == 'string'){
-					errorMessages = {defaultMessage: errorMessages};
-				}
+				var descriptiveMessages = {};
+
 				$(errorBox).children().each(function(){
 					var name = getErrorName(this);
-					if(!errorMessages[name]){
-						extended = true;
-						errorMessages[name] = $(this).html();
+					descriptiveMessages[name] = $(this).html();
+				});
+
+				$('input, select, textarea', fieldWrapper).filter(noValidate).each(function(i, elem){
+					var errorMessages = $(elem).data('errormessage') || {};
+					if(typeof errorMessages == 'string'){
+						errorMessages = {defaultMessage: errorMessages};
+					}
+
+					$.each(descriptiveMessages, function(name, val){
+						if(!errorMessages[name]){
+							extended = true;
+							errorMessages[name] = val;
+						}
+					});
+
+					if(extended){
+						$(elem).data('errormessage', errorMessages);
+					}
+					if(webshims.getOptions){
+						webshims.getOptions(elem, 'errormessage');
 					}
 				});
-				
-				if(extended){
-					$(elem).data('errormessage', errorMessages);
-				}
-				if(webshims.getOptions){
-					webshims.getOptions(elem, 'errormessage');
-				}
+
 			};
 		})(),
 		initIvalContentMessage: function(elem){
@@ -600,10 +641,10 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			var errorBox = fieldWrapper.data('errorbox');
 			if(!errorBox){
 				errorBox = this.create(elem, fieldWrapper);
-				this._createContentMessage(elem, errorBox);
+				this._createContentMessage(elem, errorBox, fieldWrapper);
 			} else if(typeof errorBox == 'string'){
 				errorBox = $('#'+errorBox);
-				fieldWrapper.data('errorbox', errorBox);
+				fieldWrapper.data('errorbox', errorBox, fieldWrapper);
 				this._createContentMessage(elem, errorBox);
 			}
 			return errorBox;
@@ -622,8 +663,9 @@ webshims.register('form-validation', function($, webshims, window, document, und
 		hideError: function(elem, reset){
 			var invalid;
 			var fieldWrapper = this.getFieldWrapper(elem);
-			var errorBox = this.get(elem, fieldWrapper);
-			
+			//only if an errorbox was already created! don't use this.get here!
+			var errorBox = fieldWrapper.data('errorbox');
+
 			if(errorBox && errorBox.jquery){
 				$(elem).filter('input').off('.recheckinvalid');
 				if(!reset && (invalid = $('input:invalid, select:invalid, textarea:invalid', fieldWrapper)[0])){
@@ -726,7 +768,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			},
 			firstinvalid: function(e){
 				if(iVal.sel && iVal.handleBubble){
-				var form = $(e.target).jProp('form');
+					var form = $(e.target).jProp('form');
 					if(form.is(iVal.sel)){
 						e.preventDefault();
 						if(iVal.handleBubble != 'none'){
@@ -767,11 +809,11 @@ webshims.register('form-validation', function($, webshims, window, document, und
 		var firstEvent,
 			invalids = [],
 			stopSubmitTimer,
-			form
+			stop
 		;
 		
 		$(document).on('invalid', function(e){
-			if(e.wrongWebkitInvalid){return;}
+			if(e.wrongWebkitInvalid || stop){return;}
 			var jElm = $(e.target);
 			
 			
@@ -793,7 +835,14 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				//reset firstinvalid
 				firstEvent = false;
 				invalids = [];
+				stop = true;
 				$(e.target).trigger(lastEvent, [lastEvent]);
+				/*
+				if(hasNative && !$.nodeName(e.target, 'form')){
+					$(e.target).jProp('form').triggerHandler('invalid');
+				}
+				*/
+				stop = false;
 			}, 9);
 			jElm = null;
 		});
@@ -936,7 +985,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			}
 		});
 	}
-	if(webshims.cfg.debug !== false){
+	if(webshims.cfg.debug !== false && iVal.sel != '.ws-instantvalidation'){
 		$(function(){
 			if($('form.ws-instantvalidation').length){
 				webshims.error('.ws-instantvalidation was renamed to .ws-validate');

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

@@ -32,7 +32,7 @@ webshims.register('form-validators', function($, webshims, window, document, und
 			webshims.customErrorMessages[name][''] = defaultMessage || name;
 		}
 		if(formReady){
-			$('input, select, textarea')
+			$('input, select, textarea, fieldset[data-dependent-validation]')
 				.filter(noValidate)
 				.each(function(){
 					testValidityRules(this);
@@ -42,7 +42,7 @@ webshims.register('form-validators', function($, webshims, window, document, und
 	};
 	webshims.refreshCustomValidityRules = function(elem){
 		if(!initTest){return;}
-		
+		var val;
 		var data = $(elem).data() || $.data(elem, {});
 		var customMismatchedRule = data.customMismatchedRule;
 		var validity = $.prop(elem, 'validity') || {};
@@ -75,8 +75,8 @@ webshims.register('form-validators', function($, webshims, window, document, und
 			$(elem).setCustomValidity(message);
 			blockCustom = false;
 		};
-		if(customMismatchedRule || validity.valid || (data.dependentValidation && !data.dependentValidation._init)){
-			var val = $(elem).val();
+		if(customMismatchedRule || validity.valid){
+			val = $(elem).val();
 			$.each(customValidityRules, function(name, test){
 				message = test(elem, val, data, setMessage) || '';
 				customMismatchedRule = name;
@@ -84,6 +84,10 @@ webshims.register('form-validators', function($, webshims, window, document, und
 					return false;
 				}
 			});
+			
+			if(data.dependentValidation && !data.dependentValidation._init && !data.dependentValidation.masterElement){
+				customValidityRules.dependent(elem, val, data, $.noop);
+			}
 			if(message != 'async' && (message || !validity.valid)){
 				setMessage(message, customMismatchedRule);
 			}
@@ -107,7 +111,7 @@ webshims.register('form-validators', function($, webshims, window, document, und
 		setTimeout(function(){
 			webshims.addReady(function(context, selfElement){
 				initTest = true;
-				$('input, select, textarea', context).add(selfElement.filter('input, select, textarea'))
+				$('input, select, textarea, fieldset[data-dependent-validation]', context).add(selfElement.filter('input, select, textarea, fieldset[data-dependent-validation]'))
 					.filter(noValidate)
 					.each(function(){
 						testValidityRules(this);
@@ -147,6 +151,10 @@ webshims.register('form-validators', function($, webshims, window, document, und
 	
 	addCustomValidityRule('tooShort', function(elem, val, data){
 		if(!val || !data.minlength){return;}
+
+		if($.nodeName(elem, 'input')){
+			webshims.warn('depreacated data-minlength usage: Use pattern=".{'+ data.minlength +'3,}" instead.');
+		}
 		return data.minlength > val.length;
 	}, 'Entered value is too short.');
 	
@@ -236,7 +244,7 @@ webshims.register('form-validators', function($, webshims, window, document, und
 			
 			
 			data.masterElement = document.getElementById(data["from"]) || (document.getElementsByName(data["from"] || [])[0]);
-			
+			data._init = true;
 			if (!data.masterElement || !data.masterElement.form) {return;}
 			
 			if(/radio|checkbox/i.test(data.masterElement.type)){
@@ -307,16 +315,16 @@ webshims.register('form-validators', function($, webshims, window, document, und
 							this.restartAjax = false;
 							this.ajaxLoading = true;
 							$.ajax(
-									$.extend({}, opts, {
-										url: opts.url,
-										dataType: 'json',
-										depData: remoteData,
-										data: formCFG.fullRemoteForm || opts.fullForm ? 
-											$(elem).jProp('form').serializeArray() : 
-											remoteData,
-										success: this.getResponse,
-										complete: this._complete
-									})
+								$.extend({}, opts, {
+									url: opts.url,
+									dataType: 'json',
+									depData: remoteData,
+									data: formCFG.fullRemoteForm || opts.fullForm ?
+										$(elem).jProp('form').serializeArray() :
+										remoteData,
+									success: this.getResponse,
+									complete: this._complete
+								})
 							);
 						}
 					},

data/vendor/assets/javascripts/webshims/shims/forms-picker.js

@@ -513,7 +513,9 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 						var elem = this;
 						setTimeout(function(){
 							elem.focus();
-							elem.select();
+							if(elem.select){
+								elem.select();
+							}
 						}, 4);
 						
 						stopTab();
@@ -526,8 +528,7 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 									try {
 										$(this).next().next('input, select').each(select);
 									} 
-									catch (er) {
-									}
+									catch (er) {}
 								}
 							}
 							else 
@@ -586,9 +587,13 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 								mouseDownInit();
 							}
 							var ret = false;
+
 							if (!factor) {
 								factor = 1;
 							}
+							if(o.stepfactor){
+								factor *= o.stepfactor;
+							}
 							try {
 								that.elemHelper[name](factor);
 								
@@ -602,6 +607,9 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 							}
 							if (ret !== false && o.value != ret) {
 								that.value(ret);
+								if(o.toFixed && o.type == 'number'){
+									that.element[0].value = that.toFixed(that.element[0].value, true);
+								}
 								eventTimer.call('input', ret);
 							}
 							return ret;
@@ -928,7 +936,7 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 		if(data.options.useDecadeBase == 'max' && max[0]){
 			xthCorrect = 11 - (max[0] % 12);
 		} else if(data.options.useDecadeBase == 'min' && min[0]){
-			xthCorrect = 11 - (min[0] % 12);
+			xthCorrect = 0 - (min[0] % 12);
 		}
 		
 		value = value[0] * 1;
@@ -989,11 +997,11 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 	
 	picker.getMonthList = function(value, data){
 		
-		var j, i, name, val, disabled, lis, fullyDisabled, prevDisabled, nextDisabled, classStr, classArray;
+		var j, i, name, val, disabled, lis, prevDisabled, nextDisabled, classStr, classArray;
 		var o = data.options;
 		var size = o.size;
-		var max = o.max.split('-');
-		var min = o.min.split('-');
+		var max = o.maxS;
+		var min = o.minS;
 		var cols = o.cols || 4;
 		var currentValue = o.value.split('-');
 		var enabled = 0;
@@ -1015,9 +1023,7 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 			
 			if( !picker.isInRange([value, '01'], max, min) && !picker.isInRange([value, '12'], max, min)){
 				disabled = ' disabled=""';
-				fullyDisabled = true;
 			} else {
-				fullyDisabled = false;
 				disabled = '';
 			}
 			
@@ -1034,7 +1040,7 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 				val = curCfg.date.monthkeys[i+1];
 				name = getMonthNameHTML(i);
 				classArray = [];
-				if(fullyDisabled || !picker.isInRange([value, val], max, min) ){
+				if(!picker.isInRange([value, val], max, min) ){
 					disabled = ' disabled=""';
 				} else {
 					disabled = '';
@@ -1343,47 +1349,6 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 		}
 		return options;
 	};
-	
-	picker.createYearSelect = function(value, max, min, valueAdd, stepper){
-		if(!stepper){
-			stepper = {start: value, step: 1, label: value};
-		}
-		var temp;
-		var goUp = true;
-		var goDown = true;
-		var options = ['<option selected="">'+ stepper.label + '</option>'];
-		var i = 0;
-		var createOption = function(value, add){
-			var value2, label;
-			if(stepper.step > 1){
-				value2 = value + stepper.step - 1;
-				label = value+' – '+value2;
-			} else {
-				label = value;
-			}
-			
-			if(picker.isInRange([value], max, min) || (value2 && picker.isInRange([value2], max, min))){
-				options[add]('<option value="'+ (value+valueAdd) +'">'+ label +'</option>');
-				return true;
-			}
-		};
-		if(!valueAdd){
-			valueAdd = '';
-		}
-		while(i < 18 && (goUp || goDown)){
-			i++;
-			if(goUp){
-				temp = stepper.start - (i * stepper.step);
-				goUp = createOption(temp, 'unshift');
-			}
-			if(goDown){
-				temp = stepper.start + (i * stepper.step);
-				goDown = createOption(temp, 'push');
-			}
-			
-		}
-		return options;
-	};
 		
 	(function(){
 		var retNames = function(name){
@@ -1401,16 +1366,18 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 		};
 		var setDirButtons = function(content, popover, dir){
 			if(content[dir]){
-					popover[dir+'Element']
-						.attr(content[dir])
-						.prop({disabled: false})
-					;
-				} else {
-					popover[dir+'Element']
-						.removeAttr('data-action')
-						.prop({disabled: true})
-					;
-				}
+				//set content and idl attribute (content for css + idl for IE8-) 
+				popover[dir+'Element']
+					.attr(content[dir])
+					.prop({disabled: false})
+					.prop(content[dir])
+				;
+			} else {
+				popover[dir+'Element']
+					.removeAttr('data-action')
+					.prop({disabled: true})
+				;
+			}
 		};
 		
 		$.each({'setYearList' : ['Year', 'Month', 'Day', 'Time'], 'setMonthList': ['Month', 'Day', 'Time'], 'setDayList': ['Day', 'Time'], 'setTimeList': ['Time']}, function(setName, names){
@@ -1427,7 +1394,7 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 					if(i >= startAt){
 						var content = picker[item](values, data);
 						
-						if( values.length < 2 || content.enabled > 1 || stops[data.type] === names[i]){
+						if( values.length < 2 || content.enabled > 1 || content.prev || content.next || stops[data.type] === names[i]){
 							popover.element
 								.attr({'data-currentview': setNames[i]})
 								.addClass('ws-size-'+o.size)
@@ -1580,8 +1547,11 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 				popover.yearPrevElement
 					.attr({'aria-label': curCfg.date.prevText})
 				;
-				
-				
+				popover.contentElement.attr({
+					dir: curCfg.date.isRTL ? 'rtl' : 'ltr',
+					lang: webshims.formcfg.__activeName
+				});
+
 				generateList(o, o.maxS, o.minS);
 				
 				if(popover.isVisible){
@@ -1593,7 +1563,6 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 			popover.isDirty = false;
 		};
 		
-		
 		if(data.type == 'time'){
 			o.minView = 3;
 			o.startView = 3;
@@ -1620,7 +1589,7 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 		
 		
 		
-		popover.contentElement.html('<div class="prev-controls ws-picker-controls"><button class="ws-super-prev ws-year-btn" tabindex="0"></button><button class="ws-prev" tabindex="0"></button></div> <div class="next-controls ws-picker-controls"><button class="ws-next" tabindex="0"></button><button class="ws-super-next ws-year-btn" tabindex="0"></button></div><div class="ws-picker-body"></div><div class="ws-button-row"><button type="button" class="ws-current" data-action="changeInput" value="'+today[data.type]+'" tabindex="0"></button> <button type="button" data-action="changeInput" value="" class="ws-empty" tabindex="0"></button></div>');
+		popover.contentElement.html('<div class="prev-controls ws-picker-controls"><button class="ws-super-prev ws-year-btn" tabindex="0" type="button"></button><button class="ws-prev" tabindex="0" type="button"></button></div> <div class="next-controls ws-picker-controls"><button class="ws-next" tabindex="0" type="button"></button><button class="ws-super-next ws-year-btn" tabindex="0" type="button"></button></div><div class="ws-picker-body"></div><div class="ws-button-row"><button type="button" class="ws-current" data-action="changeInput" value="'+today[data.type]+'" tabindex="0"></button> <button type="button" data-action="changeInput" value="" class="ws-empty" tabindex="0"></button></div>');
 		popover.nextElement = $('button.ws-next', popover.contentElement);
 		popover.prevElement = $('button.ws-prev', popover.contentElement);
 		popover.yearNextElement = $('button.ws-super-next', popover.contentElement);
@@ -1642,10 +1611,13 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 			}
 		});
 		$(document).onTrigger('wslocalechange', data._propertyChange);
-		
-		if(o.inlinePicker){
+		if(o.updateOnInput == null && (o.inlinePicker || o.noChangeDismiss)){
 			o.updateOnInput = true;
 		}
+		if(o.inlinePicker){
+			popover.element.attr('data-class', $.prop(data.orig, 'className'));
+			popover.element.attr('data-id', $.prop(data.orig, 'id'));
+		}
 		
 		$(o.orig).trigger('pickercreated');
 	};