webshims-rails 1.10.11 → 1.11.1

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

@@ -13,10 +13,6 @@ 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 === undefined){
-		webshims.warn("extendNative configuration was set to false by default with this 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) {
@@ -1271,7 +1267,17 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			this.value(this.options.value, true);
 		},
 		step: function(val){
-			this.options.step = val == 'any' ? 'any' : retDefault(val, 1);
+			var o = this.options;
+			var step = val == 'any' ? 'any' : retDefault(val, 1);
+			
+			if(o.stepping){
+				if(step != 'any' && o.stepping % step){
+					webshims.error('wrong stepping value for type range:'+ (o.stepping % step));
+				} else {
+					step = o.stepping;
+				}
+			}
+			o.step = step;
 			this.value(this.options.value);
 		},
 		
@@ -1992,6 +1998,8 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 						fVal[0] = tmp;
 					}
 					val = this.date(fVal[0], o) +'T'+ this.time(fVal[1], o);
+				} else if (fVal.length == 3) {
+					val = this.date(fVal[0], o) +'T'+ this.time(fVal[1]+fVal[2], o);
 				}
 				return val;
 			},
@@ -2848,7 +2856,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		
 		picker._actions = {
 			changeInput: function(val, popover, data){
-				picker._actions.cancel(val, popover, data);
+				if(!data.options.noChangeDismiss){
+					picker._actions.cancel(val, popover, data);
+				}
 				data.setChange(val);
 			},
 			cancel: function(val, popover, data){
@@ -3395,7 +3405,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			});
 		}
 		
-		var isStupid = modernizrInputTypes.number && navigator.userAgent.indexOf('Touch') == -1 && (/MSIE 1[0|1]\.\d/.test(navigator.userAgent) || /Trident\/7\.0/.test(navigator.userAgent));
+		var isStupid = modernizrInputTypes.number && navigator.userAgent.indexOf('Touch') == -1 && ((/MSIE 1[0|1]\.\d/.test(navigator.userAgent)) || (/Trident\/7\.0/.test(navigator.userAgent)));
 		['number', 'time', 'month', 'date', 'color', 'datetime-local'].forEach(function(name){
 			if(!modernizrInputTypes[name] || options.replaceUI || (name == 'number' && isStupid)){
 				extendType(name, {

data/vendor/assets/javascripts/webshims/shims/dom-extend.js

@@ -13,10 +13,6 @@ 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 === undefined){
-		webshims.warn("extendNative configuration was set to false by default with this 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) {

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

@@ -1,8 +1,11 @@
 webshims.register('filereader', function( $, webshims ){
 	"use strict";
-	
+	/**
+	 * Code is based on https://github.com/Jahdrien/FileReader
+	 * 
+	 */
 	(function(){
-		var swfobject = swfmini;
+		var swfobject = window.swfmini || window.swfobject;
 	
 		var readyCallbacks = $.Callbacks('once unique memory'),
 		inputsCount = 0,

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

@@ -203,60 +203,10 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 	
 	
 	$(document).on('focusin.lazyloadvalidation', function(e){
-		if('form' in e.target && $(e.target).is(':invalid')){
+		if('form' in e.target && (e.target.list || $(e.target).is(':invalid'))){
 			lazyLoad();
 		}
 	});
 	webshims.ready('WINDOWLOAD', lazyLoad);
 	
-	if(options.replaceValidationUI){
-		webshims.ready('DOM forms', function(){
-			$(document).on('firstinvalid', function(e){
-				if(!e.isInvalidUIPrevented()){
-					e.preventDefault();
-					webshims.validityAlert.showFor( e.target ); 
-				}
-			});
-		});
-	}
-	
-	/* extension, but also used to fix native implementation workaround/bugfixes */
-	(function(){
-		var firstEvent,
-			invalids = [],
-			stopSubmitTimer,
-			form
-		;
-		
-		$(document).on('invalid', function(e){
-			if(e.wrongWebkitInvalid){return;}
-			var jElm = $(e.target);
-			
-			
-			if(!firstEvent){
-				//trigger firstinvalid
-				firstEvent = $.Event('firstinvalid');
-				firstEvent.isInvalidUIPrevented = e.isDefaultPrevented;
-				var firstSystemInvalid = $.Event('firstinvalidsystem');
-				$(document).triggerHandler(firstSystemInvalid, {element: e.target, form: e.target.form, isInvalidUIPrevented: e.isDefaultPrevented});
-				jElm.trigger(firstEvent);
-			}
-
-			//if firstinvalid was prevented all invalids will be also prevented
-			if( firstEvent && firstEvent.isDefaultPrevented() ){
-				e.preventDefault();
-			}
-			invalids.push(e.target);
-			e.extraData = 'fix'; 
-			clearTimeout(stopSubmitTimer);
-			stopSubmitTimer = setTimeout(function(){
-				var lastEvent = {type: 'lastinvalid', cancelable: false, invalidlist: $(invalids)};
-				//reset firstinvalid
-				firstEvent = false;
-				invalids = [];
-				$(e.target).trigger(lastEvent, lastEvent);
-			}, 9);
-			jElm = null;
-		});
-	})();
 });

data/vendor/assets/javascripts/webshims/shims/form-datalist-lazy.js

@@ -166,13 +166,11 @@ webshims.register('form-datalist-lazy', function($, webshims, window, document,
 				if(window.QUnit || (forceShow = ($(that.input).is(':focus') && ($(that.input).hasClass('list-focus') || $.prop(that.input, 'value'))) )){
 					that.updateListOptions(forceShow);
 				} else {
-					webshims.ready('WINDOWLOAD', function(){
-						that.updateTimer = setTimeout(function(){
-							that.updateListOptions();
-							that = null;
-							listidIndex = 1;
-						}, 200 + (100 * listidIndex));
-					});
+					that.updateTimer = setTimeout(function(){
+						that.updateListOptions();
+						that = null;
+						listidIndex = 1;
+					}, 200 + (100 * listidIndex));
 				}
 			}
 		},
@@ -181,8 +179,11 @@ webshims.register('form-datalist-lazy', function($, webshims, window, document,
 			clearTimeout(this.updateTimer);
 			this.updateTimer = false;
 			
-			this.searchStart = formsCFG.customDatalist && $(this.input).hasClass('search-start');
+			if($(this.input).hasClass('ws-nosearch') || $(this.input).hasClass('search-start')){
+				webshims.error('please use listFilter/data-list-filer configuration with values: "*", "^" or "!"');
+			}
 			this.addMarkElement = options.addMark || $(this.input).hasClass('mark-option-text');
+			this.listFilter = $(this.input).data('listFilter') || options.listFilter || '*';
 			
 			var list = [];
 			
@@ -195,7 +196,8 @@ webshims.register('form-datalist-lazy', function($, webshims, window, document,
 					rItem = {
 						value: value.replace(lReg, '<').replace(gReg, '>'),
 						label: $.trim($.attr(rElem, 'label')) || '',
-						className: rElem.className || ''
+						className: rElem.className || '',
+						elem: options.getOptionContent ? rElem : null
 					};
 					
 					if(rItem.label){
@@ -224,22 +226,29 @@ webshims.register('form-datalist-lazy', function($, webshims, window, document,
 			this.arrayOptions = allOptions;
 			this.popover.contentElement.html('<div class="datalist-box"><ul role="list">'+ list.join("\n") +'</ul></div>');
 			
+			if(options.datalistCreated){
+				options.datalistCreated.apply(this);
+			}
 			
 			if(_forceShow || this.popover.isVisible){
 				this.showHideOptions();
 			}
 		},
 		getOptionContent: function(item){
-			var content = '';
+			var content;
 			if(options.getOptionContent){
-				content = options.apply(this, arguments) || '';
-			} else {
+				content = options.getOptionContent.apply(this, arguments);
+				if(content != null){
+					content += '<span class="option-value" style="display: none;">'+ item.value +'</span>'
+				}
+			} 
+			if(content == null){
 				content = '<span class="option-value">'+ item.value +'</span>';
 				if(item.label){
 					content += ' <span class="option-label">'+ item.label +'</span>';
 				}
 			}
-			return content;
+			return content || '';
 		},
 		showHideOptions: function(_fromShowList){
 			var value = $.prop(this.input, 'value').toLowerCase();
@@ -256,10 +265,10 @@ webshims.register('form-datalist-lazy', function($, webshims, window, document,
 			
 			this.lastUpdatedValue = value;
 			var found = false;
-			var startSearch = this.searchStart;
+			var startSearch = this.listFilter == '^';
 			var lis = $('li', this.shadowList);
 			var that = this;
-			if(value){
+			if(value && this.listFilter != '!'){
 				
 				this.arrayOptions.forEach(function(item, i){
 					var search, searchIndex, foundName;

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

@@ -402,6 +402,8 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 						fVal[0] = tmp;
 					}
 					val = this.date(fVal[0], o) +'T'+ this.time(fVal[1], o);
+				} else if (fVal.length == 3) {
+					val = this.date(fVal[0], o) +'T'+ this.time(fVal[1]+fVal[2], o);
 				}
 				return val;
 			},
@@ -1258,7 +1260,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		
 		picker._actions = {
 			changeInput: function(val, popover, data){
-				picker._actions.cancel(val, popover, data);
+				if(!data.options.noChangeDismiss){
+					picker._actions.cancel(val, popover, data);
+				}
 				data.setChange(val);
 			},
 			cancel: function(val, popover, data){
@@ -1805,7 +1809,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			});
 		}
 		
-		var isStupid = modernizrInputTypes.number && navigator.userAgent.indexOf('Touch') == -1 && (/MSIE 1[0|1]\.\d/.test(navigator.userAgent) || /Trident\/7\.0/.test(navigator.userAgent));
+		var isStupid = modernizrInputTypes.number && navigator.userAgent.indexOf('Touch') == -1 && ((/MSIE 1[0|1]\.\d/.test(navigator.userAgent)) || (/Trident\/7\.0/.test(navigator.userAgent)));
 		['number', 'time', 'month', 'date', 'color', 'datetime-local'].forEach(function(name){
 			if(!modernizrInputTypes[name] || options.replaceUI || (name == 'number' && isStupid)){
 				extendType(name, {

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

@@ -1331,6 +1331,7 @@ try {
 	var isOver = (webshims.cfg.forms.placeholderType == 'over');
 	var isResponsive = (webshims.cfg.forms.responsivePlaceholder);
 	var polyfillElements = ['textarea'];
+	var debug = webshims.debug !== false;
 	if(!Modernizr.input.placeholder || bustedPlaceholder){
 		polyfillElements.push('input');
 	}
@@ -1421,6 +1422,11 @@ try {
 				data = $.data(elem, 'placeHolder');
 				if(!data){return;}
 			}
+			var isVisible = $(elem).hasClass('placeholder-visible');
+			if(placeholderTxt === false){
+				placeholderTxt = $.attr(elem, 'placeholder') || '';
+			}
+			
 			$(elem).unbind('.placeholderremove');
 			
 			if(value === false){
@@ -1428,7 +1434,7 @@ try {
 			}
 			
 			if(!value && (type == 'focus' || (!type && $(elem).is(':focus')))){
-				if(elem.type == 'password' || isOver || $(elem).hasClass('placeholder-visible')){
+				if(elem.type == 'password' || isOver || isVisible){
 					hidePlaceholder(elem, data, '', true);
 				}
 				return;
@@ -1438,9 +1444,7 @@ try {
 				hidePlaceholder(elem, data, value);
 				return;
 			}
-			if(placeholderTxt === false){
-				placeholderTxt = $.attr(elem, 'placeholder') || '';
-			}
+			
 			if(placeholderTxt && !value){
 				showPlaceholder(elem, data, placeholderTxt);
 			} else {
@@ -1548,6 +1552,7 @@ try {
 						var reset = function(e){
 							if($(elem).hasClass('placeholder-visible')){
 								hidePlaceholder(elem, data, '');
+								
 								setTimeout(function(){
 									if(!e || e.type != 'submit' || e.isDefaultPrevented()){
 										changePlaceholderVisibility(elem, false, false, data );

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

@@ -4,6 +4,10 @@ webshims.register('form-validation', function($, webshims, window, document, und
 	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 checkTypes = {checkbox: 1, radio: 1};
 	
 	var emptyJ = $([]);
@@ -93,13 +97,18 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				){
 					return;
 			}
+			if(webshims.refreshCustomValidityRules){
+				if(webshims.refreshCustomValidityRules(elem) == 'async'){
+					$(elem).one('refreshvalidityui', switchValidityClass);
+					return;
+				}
+			}
+			
 			var validity = $.prop(elem, 'validity');
 			
 			var addClass, removeClass, trigger, generaltrigger, validityCause;
 			
-			if(webshims.refreshCustomValidityRules){
-				webshims.refreshCustomValidityRules(elem);
-			}
+			
 			
 			if(validity.valid){
 				if(!shadowElem.hasClass(validClass)){
@@ -457,10 +466,10 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			if(!fieldWrapper){
 				fieldWrapper = this.getFieldWrapper(elem);
 			}
-			var errorBox = $('div.ws-errorbox', fieldWrapper);
+			var errorBox = $('div.'+errorBoxClass, fieldWrapper);
 			
 			if(!errorBox.length){
-				errorBox = $('<div class="ws-errorbox" hidden="hidden">');
+				errorBox = $('<div class="'+ errorBoxClass +'" hidden="hidden">');
 				fieldWrapper.append(errorBox);
 			}
 			
@@ -481,6 +490,48 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			}
 			return fieldWrapper;
 		},
+		_createContentMessage: (function(){
+			var fields = {};
+			var getErrorName = function(elem){
+				var ret = $(elem).data('errortype');
+				if(!ret){
+					$.each(fields, function(errorName, cNames){
+						if($(elem).is(cNames)){
+							ret = errorName;
+							return false;
+						}
+					});
+				}
+				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 +'"]';
+					}
+				});
+			});
+			return function(elem, errorBox){
+				var extended = false;
+				var errorMessages = $(elem).data('errormessage') || {};
+				if(typeof errorMessages == 'string'){
+					errorMessages = {defaultMessage: errorMessages};
+				}
+				$('> *', errorBox).each(function(){
+					var name = getErrorName(this);
+					if(!errorMessages[name]){
+						extended = true;
+						errorMessages[name] = $(this).html();
+					}
+				});
+				if(extended){
+					$(elem).data('errormessage', errorMessages);
+				}
+			};
+		})(),
 		get: function(elem, fieldWrapper){
 			if(!fieldWrapper){
 				fieldWrapper = this.getFieldWrapper(elem);
@@ -488,9 +539,11 @@ 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);
 			} else if(typeof errorBox == 'string'){
 				errorBox = $('#'+errorBox);
 				fieldWrapper.data('errorbox', errorBox);
+				this._createContentMessage(elem, errorBox);
 			}
 			return errorBox;
 		},
@@ -498,7 +551,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			var type = $.prop(elem, 'type');
 			var check = function(){
 				var hasVal = checkTypes[type] ? $.prop(elem, 'checked') : $(elem).val();
-				fieldWrapper[hasVal ? 'addClass' : 'removeClass']('ws-success');
+				fieldWrapper[hasVal ? 'addClass' : 'removeClass'](successWrapperClass);
 			};
 			var evt = changeTypes[type] ? 'change' : 'blur';
 			
@@ -507,13 +560,13 @@ webshims.register('form-validation', function($, webshims, window, document, und
 		},
 		hideError: function(elem, reset){
 			var fieldWrapper = this.getFieldWrapper(elem);
-			var errorBox = fieldWrapper.data('errorbox');
+			var errorBox = fieldWrapper.hasClass(invalidWrapperClass) ? this.get(elem, fieldWrapper) : fieldWrapper.data('errorbox');
 			
 			if(errorBox && errorBox.jquery){
-				fieldWrapper.removeClass('ws-invalid');
+				fieldWrapper.removeClass(invalidWrapperClass);
 				errorBox.message = '';
 				$(elem).filter('input').off('.recheckinvalid');
-				errorBox.slideUp(function(){
+				errorBox[fx[options.iVal.fx].hide](function(){
 					$(this).attr({hidden: 'hidden'});
 				});
 			}
@@ -528,21 +581,28 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				var throttle = function(){
 					switchValidityClass({type: 'input', target: input});
 				};
-				$(input).filter('input:not([type="checkbox"], [type="radio"])').off('.recheckinvalid').on('input.recheckinvalid', function(){
-					clearTimeout(timer);
-					timer = setTimeout(throttle, options.iVal.recheckDelay); 
-				});
+				$(input)
+					.filter('input:not([type="checkbox"], [type="radio"])')
+					.off('.recheckinvalid')
+					.on('input.recheckinvalid', function(){
+						clearTimeout(timer);
+						timer = setTimeout(throttle, options.iVal.recheckDelay); 
+					})
+					.on('focusout.recheckinvalid', function(){
+						clearTimeout(timer);
+					})
+				;
 			}
 		},
-		showError: function(elem, message){
+		showError: function(elem){
 			var fieldWrapper = this.getFieldWrapper(elem);
 			var box = this.get(elem, fieldWrapper);
-			
+			var message = $(elem).getErrorMessage();
 			if(box.message != message){
 				box.stop(true, true).html('<p>'+ message +'</p>');
 				box.message = message;
-				fieldWrapper.addClass('ws-invalid').removeClass('ws-success');
-				if(box.is('[hidden]')){
+				fieldWrapper.addClass(invalidWrapperClass).removeClass(successWrapperClass);
+				if(box.is('[hidden]') || box.css('display') == 'none'){
 					this.recheckInvalidInput(elem);
 					box
 						.css({display: 'none'})
@@ -551,20 +611,19 @@ webshims.register('form-validation', function($, webshims, window, document, und
 					;
 				}
 			}
-			fieldWrapper.removeClass('ws-success');
+			fieldWrapper.removeClass(successWrapperClass);
 			$(elem).off('.recheckvalid');
 			
 			return fieldWrapper;
 		},
 		reset: function(elem){
-			this.hideError(elem, true).removeClass('ws-success');
+			this.hideError(elem, true).removeClass(successWrapperClass);
 		},
 		toggle: function(elem){
-			var message = $(elem).getErrorMessage();
-			if(message){
-				this.showError(elem, message);
+			if($(elem).is(':invalid')){
+				this.showError(elem);
 			} else {
-				this.hideError(elem, message);
+				this.hideError(elem);
 			}
 		}
 	};
@@ -599,7 +658,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				}
 			},
 			submit: function(e){
-				if(options.iVal.sel && $(e.target).is(options.iVal.sel) && $.prop(e.target, 'noValidate') && !$(e.target).checkValidity()){
+				if(options.iVal.sel && !options.iVal.noSubmitCheck &&$(e.target).is(options.iVal.sel) && $.prop(e.target, 'noValidate') && !$(e.target).checkValidity()){
 					e.stopImmediatePropagation();
 					return false;
 				}
@@ -609,6 +668,58 @@ webshims.register('form-validation', function($, webshims, window, document, und
 	
 	webshims.modules["form-core"].getGroupElements = getGroupElements;
 	
+	
+	if(options.replaceValidationUI){
+		webshims.ready('DOM forms', function(){
+			$(document).on('firstinvalid', function(e){
+				if(!e.isInvalidUIPrevented()){
+					e.preventDefault();
+					webshims.validityAlert.showFor( e.target ); 
+				}
+			});
+		});
+	}
+	
+	/* extension, but also used to fix native implementation workaround/bugfixes */
+	(function(){
+		var firstEvent,
+			invalids = [],
+			stopSubmitTimer,
+			form
+		;
+		
+		$(document).on('invalid', function(e){
+			if(e.wrongWebkitInvalid){return;}
+			var jElm = $(e.target);
+			
+			
+			if(!firstEvent){
+				//trigger firstinvalid
+				firstEvent = $.Event('firstinvalid');
+				firstEvent.isInvalidUIPrevented = e.isDefaultPrevented;
+				var firstSystemInvalid = $.Event('firstinvalidsystem');
+				$(document).triggerHandler(firstSystemInvalid, {element: e.target, form: e.target.form, isInvalidUIPrevented: e.isDefaultPrevented});
+				jElm.trigger(firstEvent);
+			}
+
+			//if firstinvalid was prevented all invalids will be also prevented
+			if( firstEvent && firstEvent.isDefaultPrevented() ){
+				e.preventDefault();
+			}
+			invalids.push(e.target);
+			e.extraData = 'fix'; 
+			clearTimeout(stopSubmitTimer);
+			stopSubmitTimer = setTimeout(function(){
+				var lastEvent = {type: 'lastinvalid', cancelable: false, invalidlist: $(invalids)};
+				//reset firstinvalid
+				firstEvent = false;
+				invalids = [];
+				$(e.target).trigger(lastEvent, [lastEvent]);
+			}, 9);
+			jElm = null;
+		});
+	})();
+	
 	//see: https://bugs.webkit.org/show_bug.cgi?id=113377
 	if (chromeBugs && webkitVersion < 540) {
 		(function(){