webshims-rails 1.10.10 → 1.10.11

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

@@ -75,6 +75,7 @@ var validityPrototype = {
 	customError: false,
 
 	typeMismatch: false,
+	badInput: false,
 	rangeUnderflow: false,
 	rangeOverflow: false,
 	stepMismatch: false,
@@ -134,20 +135,6 @@ var validityRules = {
 		tooLong: function(){
 			return false;
 		},
-		typeMismatch: function (input, val, cache){
-			if(val === '' || cache.nodeName == 'select'){return false;}
-			var ret = false;
-			if(!('type' in cache)){
-				cache.type = getType(input[0]);
-			}
-			
-			if(typeModels[cache.type] && typeModels[cache.type].mismatch){
-				ret = typeModels[cache.type].mismatch(val, input);
-			} else if('validity' in input[0]){
-				ret = input[0].validity.typeMismatch;
-			}
-			return ret;
-		},
 		patternMismatch: function(input, val, cache) {
 			if(val === '' || cache.nodeName == 'select'){return false;}
 			var pattern = input.attr('pattern');
@@ -164,6 +151,23 @@ var validityRules = {
 	}
 ;
 
+$.each({typeMismatch: 'mismatch', badInput: 'bad'}, function(name, fn){
+	validityRules[name] = function (input, val, cache){
+		if(val === '' || cache.nodeName == 'select'){return false;}
+		var ret = false;
+		if(!('type' in cache)){
+			cache.type = getType(input[0]);
+		}
+		
+		if(typeModels[cache.type] && typeModels[cache.type][fn]){
+			ret = typeModels[cache.type][fn](val, input);
+		} else if('validity' in input[0] && ('name' in input[0].validity)){
+			ret = input[0].validity[name] || false;
+		}
+		return ret;
+	};
+});
+
 webshims.addValidityRule = function(type, fn){
 	validityRules[type] = fn;
 };
@@ -209,8 +213,9 @@ $.event.special.invalid = {
 	}
 };
 
+var supportSubmitBubbles = !('submitBubbles' in $.support) || $.support.submitBubbles;
 var addSubmitBubbles = function(form){
-	if (!$.support.submitBubbles && form && typeof form == 'object' && !form._submit_attached ) {
+	if (!supportSubmitBubbles && form && typeof form == 'object' && !form._submit_attached ) {
 				
 		$.event.add( form, 'submit._submit', function( event ) {
 			event._submit_bubble = true;
@@ -219,7 +224,7 @@ var addSubmitBubbles = function(form){
 		form._submit_attached = true;
 	}
 };
-if(!$.support.submitBubbles && $.event.special.submit){
+if(!supportSubmitBubbles && $.event.special.submit){
 	$.event.special.submit.setup = function() {
 		// Only need this for delegated form submit events
 		if ( $.nodeName( this, "form" ) ) {

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

@@ -2,8 +2,8 @@ webshims.register('form-validation', function($, webshims, window, document, und
 	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 = 'user-error';
-	var validClass = 'user-success';
+	var invalidClass = options.iVal.errorClass || 'user-error';
+	var validClass = options.iVal.successClass || 'user-success';
 	var checkTypes = {checkbox: 1, radio: 1};
 	
 	var emptyJ = $([]);
@@ -76,6 +76,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 		'datetime-local': 1
 	};
 	var switchValidityClass = function(e){
+		if(!options.iVal.sel){return;}
 		var elem, timer, shadowElem, shadowType;
 		if(!e.target){return;}
 		elem = $(e.target).getNativeElement()[0];
@@ -182,7 +183,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			$(document.documentElement)
 		;
 	};
-	var minWidth = (Modernizr.boxSizing || Modernizr['display-table'] || $.support.getSetAttribute) ?
+	var minWidth = (Modernizr.boxSizing || Modernizr['display-table'] || $.support.getSetAttribute || $.support.boxSizing) ?
 		'minWidth' :
 		'width'
 	;
@@ -235,14 +236,21 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			return container == contained || $.contains(container, contained);
 		},
 		show: function(element){
+			if(this.isVisible){return;}
 			var e = $.Event('wspopoverbeforeshow');
 			this.element.trigger(e);
-			if(e.isDefaultPrevented() || this.isVisible){return;}
+			if(e.isDefaultPrevented()){return;}
 			this.isVisible = true;
 			element = $(element || this.options.prepareFor).getNativeElement() ;
 			
 			var that = this;
 			var visual = $(element).getShadowElement();
+			var delayedRepos = function(e){
+				clearTimeout(that.timers.repos);
+				that.timers.repos = setTimeout(function(){
+					that.position(visual);
+				}, e && e.type == 'pospopover' ? 4 : 200);
+			};
 
 			this.clear();
 			this.element.removeClass('ws-po-visible').css('display', 'none');
@@ -256,22 +264,15 @@ webshims.register('form-validation', function($, webshims, window, document, und
 					that.element.addClass('ws-po-visible').trigger('wspopovershow');
 				}, 9);
 			}, 9);
-			this.element.on('remove', function(e){
-				if(!e.originalEvent){
-					that.destroy();
-				}
-			});
+			
 			$(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)){
 					that.hide();
 				}
 			});
-			$(window).on('resize'+this.eventns + ' pospopover'+this.eventns, function(){
-				clearTimeout(that.timers.repos);
-				that.timers.repos = setTimeout(function(){
-					that.position(visual);
-				}, 400);
-			});
+			
+			this.element.off('pospopover').on('pospopover', delayedRepos);
+			$(window).on('resize'+this.eventns + ' pospopover'+this.eventns, delayedRepos);
 		},
 		prepareFor: function(element, visual){
 			var onBlur;
@@ -476,7 +477,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				}
 			}
 			if(!fieldWrapper){
-				fieldWrapper = $(elem).parent().closest(':not(span, label, em, strong, b, mark, p)');
+				fieldWrapper = $(elem).parent().closest(':not(span, label, em, strong, b, i, mark, p)');
 			}
 			return fieldWrapper;
 		},

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

@@ -8,9 +8,12 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 		var ret = [date.getFullYear(), moduleOpts.addZero(date.getMonth() + 1), moduleOpts.addZero(date.getDate())];
 		ret.month = ret[0]+'-'+ret[1];
 		ret.date = ret[0]+'-'+ret[1]+'-'+ret[2];
+		ret.time = date.getHours() +':'+ date.getMinutes();
+		
+		ret['datetime-local'] = ret.date +'T'+ ret.time;
 		return ret;
 	};
-	var today = getDateArray(new Date(new Date().getTime() - (new Date().getTimezoneOffset() * 60 * 1000 )));
+	var today = getDateArray(new Date());
 	
 	
 	var _setFocus = function(element, _noFocus){
@@ -296,11 +299,12 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 	picker.getYearList = function(value, data){
 		var j, i, val, disabled, lis, prevDisabled, nextDisabled, classStr, classArray, start;
 		
-		
-		var size = data.options.size;
-		var max = data.options.max.split('-');
-		var min = data.options.min.split('-');
-		var currentValue = data.options.value.split('-');
+		var o = data.options;
+		var size = o.size;
+		var max = o.max.split('-');
+		var min = o.min.split('-');
+		var cols = o.cols || 4;
+		var currentValue = o.value.split('-');
 		var xthCorrect = 0;
 		var enabled = 0;
 		var str = '';
@@ -346,7 +350,7 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 				
 				classStr = classArray.length ? ' class="'+ (classArray.join(' ')) +'"' : '';
 				
-				if(i && !(i % 3)){
+				if(i && !(i % cols)){
 					rowNum++;
 					lis.push('</tr><tr class="ws-row-'+ rowNum +'">');
 				}
@@ -375,6 +379,7 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 		var size = o.size;
 		var max = o.max.split('-');
 		var min = o.min.split('-');
+		var cols = o.cols || 4;
 		var currentValue = o.value.split('-');
 		var enabled = 0;
 		var rowNum = 0;
@@ -387,6 +392,7 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 			} else {
 				prevDisabled = picker.isInRange([value-1], max, min) ? {'data-action': 'setMonthList','value': value-1} : false;
 			}
+			
 			if(j == size - 1){
 				nextDisabled = picker.isInRange([value+1], max, min) ? {'data-action': 'setMonthList','value': value+1} : false;
 			}
@@ -431,7 +437,7 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 				}
 				
 				classStr = (classArray.length) ? ' class="'+ (classArray.join(' ')) +'"' : '';
-				if(i && !(i % 3)){
+				if(i && !(i % cols)){
 					rowNum++;
 					lis.push('</tr><tr class="ws-row-'+ rowNum +'">');
 				}
@@ -455,7 +461,7 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 	
 	picker.getDayList = function(value, data){
 		
-		var j, i, k, day, nDay, name, val, disabled, lis,  prevDisabled, nextDisabled, addTr, week, rowNum;
+		var j, i, k, day, nDay, name, val, disabled, lis,  prevDisabled, nextDisabled, yearNext, yearPrev, addTr, week, rowNum;
 		
 		var lastMotnh, curMonth, otherMonth, dateArray, monthName, fullMonthName, buttonStr, date2, classArray;
 		var o = data.options;
@@ -467,9 +473,19 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 		var enabled = 0;
 		var str = [];
 		var date = new Date(value[0], value[1] - 1, 1);
+		var action = (data.type == 'datetime-local') ? 'setTimeList' : 'changeInput';
 		
 		date.setMonth(date.getMonth()  - Math.floor((size - 1) / 2));
 		
+		if(o.yearButtons){
+			yearNext = [ (value[0] * 1) + 1, value[1] ];
+			yearNext = picker.isInRange(yearNext, max, min) ? {'data-action': 'setDayList','value': yearNext.join('-')} : false;
+			
+			yearPrev = [ (value[0] * 1) - 1, value[1] ];
+			yearPrev = picker.isInRange(yearPrev, max, min) ? {'data-action': 'setDayList','value': yearPrev.join('-')} : false;
+		}
+		
+		
 		for(j = 0;  j < size; j++){
 			date.setDate(1);
 			lastMotnh = date.getMonth();
@@ -483,6 +499,8 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 			
 			dateArray = getDateArray(date);
 			
+			
+			
 			str.push('<div class="day-list picker-list ws-index-'+ j +'"><div class="ws-picker-header">');
 			if( o.selectNav ){
 				monthName = ['<select data-action="setDayList" class="month-select" tabindex="0">'+ picker.createMonthSelect(dateArray, max, min, monthNames).join('') +'</select>', '<select data-action="setDayList" class="year-select" tabindex="0">'+ picker.createYearSelect(dateArray[0], max, min, '-'+dateArray[1]).join('') +'</select>'];
@@ -563,7 +581,7 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 				}
 				
 				dateArray = getDateArray(date);
-				buttonStr = '<td role="presentation" class="day-'+ day +'"><button data-id="day-'+ date.getDate() +'" role="gridcell" data-action="changeInput" value="'+ (dateArray.join('-')) +'"';
+				buttonStr = '<td role="presentation" class="day-'+ day +'"><button data-id="day-'+ date.getDate() +'" role="gridcell" data-action="'+action+'" value="'+ (dateArray.join('-')) +'" type="button"';
 				
 				if(otherMonth){
 					classArray.push('othermonth');
@@ -605,6 +623,77 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 			main: str.join(''),
 			prev: prevDisabled,
 			next: nextDisabled,
+			yearPrev: yearPrev,
+			yearNext: yearNext,
+			type: 'Grid'
+		};
+	};
+	
+//	var createDatimeValue = 
+	
+	
+	picker.getTimeList = function(value, data){
+		var label, tmpValue, iVal, hVal, valPrefix;
+		var str = '<div class="time-list picker-list ws-index-0">';
+		var i = 0;
+		var rowNum = 0;
+		var len = 23;
+		var attrs = {
+			min: $.prop(data.orig, 'min'),
+			max: $.prop(data.orig, 'max'),
+			step: $.prop(data.orig, 'step')
+		};
+		var o = data.options;
+		var monthNames = curCfg.date[o.monthNamesHead] || curCfg.date[o.monthNames] || curCfg.date.monthNames; 
+		var gridLabel = '';
+		
+		if(data.type == 'time'){
+			label = '<button type="button" disabled="">'+ $.trim($(data.orig).jProp('labels').text() || '').replace(/[\:\*]/g, '')+'</button>';
+		} else {
+			tmpValue = value[2].split('T');
+			value[2] = tmpValue[0];
+			if(tmpValue[1]){
+				value[3] = tmpValue[1];
+			}
+			label = value[2] +'. '+ (monthNames[(value[1] * 1) - 1]) +' '+ value[0];
+			gridLabel = ' aria-label="'+ label +'"';
+			label = '<button tabindex="-1" data-action="setDayList" value="'+value[0]+'-'+value[1]+'-'+value[2]+'" type="button">'+label+'</button>';
+			valPrefix = value[0] +'-'+value[1]+'-'+value[2]+'T';
+		}
+		
+		str += '<div class="ws-picker-header">'+label+'</div>';
+		
+		str += '<div class="picker-grid"><table role="grid"'+ gridLabel +'><tbody><tr>';
+		for(; i <= len; i++){
+			iVal = moduleOpts.addZero(''+i) +':00';
+			hVal = valPrefix ? 
+				valPrefix+iVal :
+				iVal
+			;
+				
+			if(i && !(i % 4)){
+				rowNum++;
+				str += '</tr><tr class="ws-row-'+ rowNum +'">';
+			}
+			str += '<td role="presentation"><button role="gridcell" data-action="changeInput" value="'+ hVal +'" type="button" tabindex="-1"';
+			
+			if(!data.isValid(hVal, attrs)){
+				str += ' disabled=""';
+			}
+			if(value == iVal){
+				str += ' class="checked-value"';
+			}
+			str += '>'+ data.formatValue(iVal) +'</button></td>';
+		}
+		
+		
+		str += '</tr></tbody></table></div></div>';
+		
+		return {
+			enabled: 9,
+			main: str,
+			prev: false,
+			next: false,
 			type: 'Grid'
 		};
 	};
@@ -691,10 +780,25 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 		var stops = {
 			date: 'Day',
 			week: 'Day',
-			month: 'Month'
+			month: 'Month',
+			'datetime-local': 'Time',
+			time: 'Time'
+		};
+		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})
+					;
+				}
 		};
 		
-		$.each({'setYearList' : ['Year', 'Month', 'Day'], 'setMonthList': ['Month', 'Day'], 'setDayList': ['Day']}, function(setName, names){
+		$.each({'setYearList' : ['Year', 'Month', 'Day', 'Time'], 'setMonthList': ['Month', 'Day', 'Time'], 'setDayList': ['Day', 'Time'], 'setTimeList': ['Time']}, function(setName, names){
 			var getNames = names.map(retNames);
 			var setNames = names.map(retSetNames);
 			actions[setName] = function(val, popover, data, startAt){
@@ -719,32 +823,22 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 								})
 							;
 							popover.bodyElement.html(content.main);
-							if(content.prev){
-								popover.prevElement
-									.attr(content.prev)
-									.prop({disabled: false})
-								;
-							} else {
-								popover.prevElement
-									.removeAttr('data-action')
-									.prop({disabled: true})
-								;
-							}
-							if(content.next){
-								popover.nextElement
-									.attr(content.next)
-									.prop({disabled: false})
-								;
-							} else {
-								popover.nextElement
-									.removeAttr('data-action')
-									.prop({disabled: true})
-								;
+							
+							setDirButtons(content, popover, 'prev');
+							setDirButtons(content, popover, 'next');
+							
+							if(o.yearButtons){
+								setDirButtons(content, popover, 'yearPrev');
+								setDirButtons(content, popover, 'yearNext');
 							}
+							
 							if(webshims[content.type]){
 								new webshims[content.type](popover.bodyElement.children(), popover, content);
 							}
-							popover.element.trigger('pickerchange');
+							popover.element.trigger('pickerchange')
+								.filter('[data-vertical="bottom"]')
+								.triggerHandler('pospopover')
+							;
 							return false;
 						}
 					}
@@ -780,6 +874,7 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 			return false;
 		};
 		var id = new Date().getTime();
+		
 		var generateList = function(o, max, min){
 			var options = [];
 			var label = '';
@@ -820,10 +915,12 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 					} else if($(this).is('.ws-current')){
 						text = (curCfg[data.type] || {}).currentText;
 						if(!text){
-							text = (formcfg[''][[data.type]] || {}).currentText || 'current';
-							webshims.warn("could not get currentText from form cfg");
+							text = (formcfg[''][[data.type]] || {}).currentText || (curCfg.date || {}).currentText || 'current';
+							webshims.warn("could not get currentText from form cfg for "+data.type);
+						}
+						if(today[data.type] && data.type != 'time'){
+							$.prop(this, 'disabled', !picker.isInRange(today[data.type].split('-'), o.maxS, o.minS));
 						}
-						$.prop(this, 'disabled', !picker.isInRange(today[data.type].split('-'), o.maxS, o.minS));
 					}
 					if(text){
 						$(this).text(text).attr({'aria-label': text});
@@ -833,13 +930,36 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 					}
 					
 				});
-				popover.nextElement.attr({'aria-label': curCfg.date.nextText});
-				$('> span', popover.nextElement).html(curCfg.date.nextText);
-				popover.prevElement.attr({'aria-label': curCfg.date.prevText});
-				$('> span', popover.prevElement).html(curCfg.date.prevText);
+				popover.nextElement
+					.attr({'aria-label': curCfg.date.nextText})
+					.find('span')
+					.html(curCfg.date.nextText)
+				;
+				popover.prevElement
+					.attr({'aria-label': curCfg.date.prevText})
+					.find('span')
+					.html(curCfg.date.prevText)
+				;
+				
+				if(o.yearButtons){
+					popover.yearNextElement
+						.attr({'aria-label': curCfg.date.nextText})
+						.find('span')
+						.html(curCfg.date.nextText)
+					;
+					popover.yearPrevElement
+						.attr({'aria-label': curCfg.date.prevText})
+						.find('span')
+						.html(curCfg.date.prevText)
+					;
+				}
 				
 				generateList(o, o.maxS, o.minS);
 				
+				if(popover.isVisible){
+					picker.showPickerContent(data, popover);
+				}
+				
 			}
 			$('button.ws-empty', popover.buttonRow).prop('disabled', $.prop(data.orig, 'required'));
 			popover.isDirty = false;
@@ -853,6 +973,8 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 			}
 		};
 		
+		
+		
 		popover.contentElement.html('<button class="ws-prev" tabindex="0"><span></span></button> <button class="ws-next" tabindex="0"><span></span></button><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);
@@ -860,11 +982,21 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 		popover.buttonRow = $('div.ws-button-row', popover.contentElement);
 		popover.element.on('updatepickercontent', updateContent);
 		
+		if(data.options.yearButtons){
+			popover.element.addClass('ws-year-buttons');
+			popover.yearNextElement = $('<button class="ws-super-next" tabindex="0"><span></span></button>').insertAfter(popover.nextElement);
+			popover.yearPrevElement = $('<button class="ws-super-prev" tabindex="0"><span></span></button>').insertBefore(popover.prevElement);
+		}
+		
 		popover.contentElement
 			.on('click', 'button[data-action]', actionfn)
 			.on('change', 'select[data-action]', actionfn)
 		;
 		
+		if(data.options.inlinePicker){
+			data.options.updateOnInput = true;
+		}
+		
 		$(data.options.orig).on('input', function(){
 			var currentView;
 			if(data.options.updateOnInput && popover.isVisible && data.options.value && (currentView = popover.element.attr('data-currentview'))){