webshims-rails 1.12.7 → 1.13.0

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

@@ -1434,7 +1434,9 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		}
 		if(!message){
 			message = getMessageFromObj(validityMessages[''][name], elem) || $.prop(elem, 'validationMessage');
-			webshims.info('could not find errormessage for: '+ name +' / '+ $.prop(elem, 'type') +'. in language: '+webshims.activeLang());
+			if(name != 'customError'){
+				webshims.info('could not find errormessage for: '+ name +' / '+ $.prop(elem, 'type') +'. in language: '+webshims.activeLang());
+			}
 		}
 		message = webshims.replaceValidationplaceholder(elem, message, name);
 		

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

@@ -409,7 +409,7 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 		var stepDescriptor = webshims.defineNodeNameProperty('input', name, {
 			prop: {
 				value: function(factor){
-					var step, val, dateVal, valModStep, alignValue, cache, base, attrVal;
+					var step, val, valModStep, alignValue, cache, base, attrVal;
 					var type = getType(this);
 					if(typeModels[type] && typeModels[type].asNumber){
 						cache = {type: type};
@@ -419,12 +419,9 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 						}
 						factor *= stepFactor;
 						
-						val = $.prop(this, 'valueAsNumber');
+
 						
-						if(isNaN(val)){
-							webshims.info("valueAsNumber is NaN can't apply stepUp/stepDown ");
-							throw('invalid state error');
-						}
+
 						
 						step = webshims.getStep(this, type);
 						
@@ -435,7 +432,21 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 						
 						webshims.addMinMaxNumberToCache('min', $(this), cache);
 						webshims.addMinMaxNumberToCache('max', $(this), cache);
-						
+
+						val = $.prop(this, 'valueAsNumber');
+
+						if(factor > 0 && !isNaN(cache.minAsNumber) && (isNaN(val) || cache.minAsNumber > val)){
+							$.prop(this, 'valueAsNumber', cache.minAsNumber);
+							return;
+						} else if(factor < 0 && !isNaN(cache.maxAsNumber) && (isNaN(val) || cache.maxAsNumber < val)){
+							$.prop(this, 'valueAsNumber', cache.maxAsNumber);
+							return;
+						}
+
+						if(isNaN(val)){
+							val = 0;
+						}
+
 						base = cache.minAsNumber;
 						
 						if(isNaN(base) && (attrVal = $.prop(this, 'defaultValue'))){
@@ -460,7 +471,7 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 						
 						if( (!isNaN(cache.maxAsNumber) && val > cache.maxAsNumber) || (!isNaN(cache.minAsNumber) && val < cache.minAsNumber) ){
 							webshims.info("max/min overflow can't apply stepUp/stepDown");
-							throw('invalid state error');
+							return;
 						}
 						
 						$.prop(this, 'valueAsNumber', val);
@@ -814,7 +825,8 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 		});
 	}
 	
-});;(function($){
+});
+;(function($){
 	"use strict";
 
 	var isNumber = function(string){
@@ -2394,7 +2406,6 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 				}
 				this.elemHelper.prop('valueAsNumber', start);
 				this.options.defValue = this.elemHelper.prop('value');
-				
 			},
 			reorderInputs: function(){
 				if(splitInputs[this.type]){
@@ -2461,7 +2472,7 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 							selectionEnd = this._getSelectionEnd(val);
 						}
 						this.element.prop(name, val);
-						if(selectionEnd){
+						if(selectionEnd != null){
 							this.element.prop('selectionEnd', selectionEnd);
 						}
 					}
@@ -2476,6 +2487,7 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 			spinBtnProto[name] = function(val){
 				this.elemHelper.prop(name, val);
 				this[numName] = this.asNumber(val);
+
 				if(this.valueAsNumber != null && (isNaN(this.valueAsNumber) || (!isNaN(this[numName]) && (this.valueAsNumber * factor) < (this[numName] * factor)))){
 					this._setStartInRange();
 				}
@@ -3112,11 +3124,11 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 			
 			var type = $.prop(this, 'type');
 			
-			var i, opts, data, optsName, labels, cNames;
+			var i, opts, data, optsName, labels, cNames, hasInitialFocus;
 			if(inputTypes[type] && webshims.implement(this, 'inputwidgets')){
 				data = {};
 				optsName = type;
-				
+				hasInitialFocus = $(this).is(':focus');
 				labels = $(this).jProp('labels');
 				opts = $.extend(webshims.getOptions(this, type, [options.widgets, options[type], $($.prop(this, 'form')).data(type)]), {
 					orig: this,
@@ -3241,6 +3253,9 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 				} else {
 					$(this).css('display', 'none');
 				}
+				if(hasInitialFocus){
+					$(this).getShadowFocusElement().trigger('focus');
+				}
 			}
 			
 		};

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

@@ -409,7 +409,7 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 		var stepDescriptor = webshims.defineNodeNameProperty('input', name, {
 			prop: {
 				value: function(factor){
-					var step, val, dateVal, valModStep, alignValue, cache, base, attrVal;
+					var step, val, valModStep, alignValue, cache, base, attrVal;
 					var type = getType(this);
 					if(typeModels[type] && typeModels[type].asNumber){
 						cache = {type: type};
@@ -419,12 +419,9 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 						}
 						factor *= stepFactor;
 						
-						val = $.prop(this, 'valueAsNumber');
+
 						
-						if(isNaN(val)){
-							webshims.info("valueAsNumber is NaN can't apply stepUp/stepDown ");
-							throw('invalid state error');
-						}
+
 						
 						step = webshims.getStep(this, type);
 						
@@ -435,7 +432,21 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 						
 						webshims.addMinMaxNumberToCache('min', $(this), cache);
 						webshims.addMinMaxNumberToCache('max', $(this), cache);
-						
+
+						val = $.prop(this, 'valueAsNumber');
+
+						if(factor > 0 && !isNaN(cache.minAsNumber) && (isNaN(val) || cache.minAsNumber > val)){
+							$.prop(this, 'valueAsNumber', cache.minAsNumber);
+							return;
+						} else if(factor < 0 && !isNaN(cache.maxAsNumber) && (isNaN(val) || cache.maxAsNumber < val)){
+							$.prop(this, 'valueAsNumber', cache.maxAsNumber);
+							return;
+						}
+
+						if(isNaN(val)){
+							val = 0;
+						}
+
 						base = cache.minAsNumber;
 						
 						if(isNaN(base) && (attrVal = $.prop(this, 'defaultValue'))){
@@ -460,7 +471,7 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 						
 						if( (!isNaN(cache.maxAsNumber) && val > cache.maxAsNumber) || (!isNaN(cache.minAsNumber) && val < cache.minAsNumber) ){
 							webshims.info("max/min overflow can't apply stepUp/stepDown");
-							throw('invalid state error');
+							return;
 						}
 						
 						$.prop(this, 'valueAsNumber', val);
@@ -814,7 +825,8 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 		});
 	}
 	
-});;(function($){
+});
+;(function($){
 	"use strict";
 
 	var isNumber = function(string){
@@ -2394,7 +2406,6 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 				}
 				this.elemHelper.prop('valueAsNumber', start);
 				this.options.defValue = this.elemHelper.prop('value');
-				
 			},
 			reorderInputs: function(){
 				if(splitInputs[this.type]){
@@ -2461,7 +2472,7 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 							selectionEnd = this._getSelectionEnd(val);
 						}
 						this.element.prop(name, val);
-						if(selectionEnd){
+						if(selectionEnd != null){
 							this.element.prop('selectionEnd', selectionEnd);
 						}
 					}
@@ -2476,6 +2487,7 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 			spinBtnProto[name] = function(val){
 				this.elemHelper.prop(name, val);
 				this[numName] = this.asNumber(val);
+
 				if(this.valueAsNumber != null && (isNaN(this.valueAsNumber) || (!isNaN(this[numName]) && (this.valueAsNumber * factor) < (this[numName] * factor)))){
 					this._setStartInRange();
 				}
@@ -3112,11 +3124,11 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 			
 			var type = $.prop(this, 'type');
 			
-			var i, opts, data, optsName, labels, cNames;
+			var i, opts, data, optsName, labels, cNames, hasInitialFocus;
 			if(inputTypes[type] && webshims.implement(this, 'inputwidgets')){
 				data = {};
 				optsName = type;
-				
+				hasInitialFocus = $(this).is(':focus');
 				labels = $(this).jProp('labels');
 				opts = $.extend(webshims.getOptions(this, type, [options.widgets, options[type], $($.prop(this, 'form')).data(type)]), {
 					orig: this,
@@ -3241,6 +3253,9 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 				} else {
 					$(this).css('display', 'none');
 				}
+				if(hasInitialFocus){
+					$(this).getShadowFocusElement().trigger('focus');
+				}
 			}
 			
 		};

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

@@ -1622,6 +1622,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	
 	
 	webshims.getContentValidationMessage = function(elem, validity, key){
+		var customRule;
 		if(webshims.errorbox && webshims.errorbox.initIvalContentMessage){
 			webshims.errorbox.initIvalContentMessage(elem);
 		}
@@ -1636,7 +1637,9 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		}
 		if(typeof message == 'object'){
 			validity = validity || $.prop(elem, 'validity') || {valid: 1};
-			if(!validity.valid){
+			if(validity.customError && (customRule = $.data(elem, 'customMismatchedRule')) && message[customRule] && typeof message[customRule] == 'string'){
+				message = message[customRule];
+			} else if(!validity.valid){
 				$.each(validity, function(name, prop){
 					if(prop && name != 'valid' && message[name]){
 						message = message[name];
@@ -1938,7 +1941,9 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		}
 		if(!message){
 			message = getMessageFromObj(validityMessages[''][name], elem) || $.prop(elem, 'validationMessage');
-			webshims.info('could not find errormessage for: '+ name +' / '+ $.prop(elem, 'type') +'. in language: '+webshims.activeLang());
+			if(name != 'customError'){
+				webshims.info('could not find errormessage for: '+ name +' / '+ $.prop(elem, 'type') +'. in language: '+webshims.activeLang());
+			}
 		}
 		message = webshims.replaceValidationplaceholder(elem, message, name);
 		

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

@@ -1622,6 +1622,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	
 	
 	webshims.getContentValidationMessage = function(elem, validity, key){
+		var customRule;
 		if(webshims.errorbox && webshims.errorbox.initIvalContentMessage){
 			webshims.errorbox.initIvalContentMessage(elem);
 		}
@@ -1636,7 +1637,9 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		}
 		if(typeof message == 'object'){
 			validity = validity || $.prop(elem, 'validity') || {valid: 1};
-			if(!validity.valid){
+			if(validity.customError && (customRule = $.data(elem, 'customMismatchedRule')) && message[customRule] && typeof message[customRule] == 'string'){
+				message = message[customRule];
+			} else if(!validity.valid){
 				$.each(validity, function(name, prop){
 					if(prop && name != 'valid' && message[name]){
 						message = message[name];
@@ -1938,7 +1941,9 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		}
 		if(!message){
 			message = getMessageFromObj(validityMessages[''][name], elem) || $.prop(elem, 'validationMessage');
-			webshims.info('could not find errormessage for: '+ name +' / '+ $.prop(elem, 'type') +'. in language: '+webshims.activeLang());
+			if(name != 'customError'){
+				webshims.info('could not find errormessage for: '+ name +' / '+ $.prop(elem, 'type') +'. in language: '+webshims.activeLang());
+			}
 		}
 		message = webshims.replaceValidationplaceholder(elem, message, name);
 		

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

@@ -2769,7 +2769,6 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				}
 				this.elemHelper.prop('valueAsNumber', start);
 				this.options.defValue = this.elemHelper.prop('value');
-				
 			},
 			reorderInputs: function(){
 				if(splitInputs[this.type]){
@@ -2836,7 +2835,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 							selectionEnd = this._getSelectionEnd(val);
 						}
 						this.element.prop(name, val);
-						if(selectionEnd){
+						if(selectionEnd != null){
 							this.element.prop('selectionEnd', selectionEnd);
 						}
 					}
@@ -2851,6 +2850,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			spinBtnProto[name] = function(val){
 				this.elemHelper.prop(name, val);
 				this[numName] = this.asNumber(val);
+
 				if(this.valueAsNumber != null && (isNaN(this.valueAsNumber) || (!isNaN(this[numName]) && (this.valueAsNumber * factor) < (this[numName] * factor)))){
 					this._setStartInRange();
 				}
@@ -3487,11 +3487,11 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			
 			var type = $.prop(this, 'type');
 			
-			var i, opts, data, optsName, labels, cNames;
+			var i, opts, data, optsName, labels, cNames, hasInitialFocus;
 			if(inputTypes[type] && webshims.implement(this, 'inputwidgets')){
 				data = {};
 				optsName = type;
-				
+				hasInitialFocus = $(this).is(':focus');
 				labels = $(this).jProp('labels');
 				opts = $.extend(webshims.getOptions(this, type, [options.widgets, options[type], $($.prop(this, 'form')).data(type)]), {
 					orig: this,
@@ -3616,6 +3616,9 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				} else {
 					$(this).css('display', 'none');
 				}
+				if(hasInitialFocus){
+					$(this).getShadowFocusElement().trigger('focus');
+				}
 			}
 			
 		};

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

@@ -208,6 +208,7 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 	
 	
 	webshims.getContentValidationMessage = function(elem, validity, key){
+		var customRule;
 		if(webshims.errorbox && webshims.errorbox.initIvalContentMessage){
 			webshims.errorbox.initIvalContentMessage(elem);
 		}
@@ -222,7 +223,9 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 		}
 		if(typeof message == 'object'){
 			validity = validity || $.prop(elem, 'validity') || {valid: 1};
-			if(!validity.valid){
+			if(validity.customError && (customRule = $.data(elem, 'customMismatchedRule')) && message[customRule] && typeof message[customRule] == 'string'){
+				message = message[customRule];
+			} else if(!validity.valid){
 				$.each(validity, function(name, prop){
 					if(prop && name != 'valid' && message[name]){
 						message = message[name];

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

@@ -243,7 +243,9 @@ webshims.register('form-message', function($, webshims, window, document, undefi
 		}
 		if(!message){
 			message = getMessageFromObj(validityMessages[''][name], elem) || $.prop(elem, 'validationMessage');
-			webshims.info('could not find errormessage for: '+ name +' / '+ $.prop(elem, 'type') +'. in language: '+webshims.activeLang());
+			if(name != 'customError'){
+				webshims.info('could not find errormessage for: '+ name +' / '+ $.prop(elem, 'type') +'. in language: '+webshims.activeLang());
+			}
 		}
 		message = webshims.replaceValidationplaceholder(elem, message, name);
 		

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

@@ -198,7 +198,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 		var stepDescriptor = webshims.defineNodeNameProperty('input', name, {
 			prop: {
 				value: function(factor){
-					var step, val, dateVal, valModStep, alignValue, cache, base, attrVal;
+					var step, val, valModStep, alignValue, cache, base, attrVal;
 					var type = getType(this);
 					if(typeModels[type] && typeModels[type].asNumber){
 						cache = {type: type};
@@ -208,12 +208,9 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 						}
 						factor *= stepFactor;
 						
-						val = $.prop(this, 'valueAsNumber');
+
 						
-						if(isNaN(val)){
-							webshims.info("valueAsNumber is NaN can't apply stepUp/stepDown ");
-							throw('invalid state error');
-						}
+
 						
 						step = webshims.getStep(this, type);
 						
@@ -224,7 +221,21 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 						
 						webshims.addMinMaxNumberToCache('min', $(this), cache);
 						webshims.addMinMaxNumberToCache('max', $(this), cache);
-						
+
+						val = $.prop(this, 'valueAsNumber');
+
+						if(factor > 0 && !isNaN(cache.minAsNumber) && (isNaN(val) || cache.minAsNumber > val)){
+							$.prop(this, 'valueAsNumber', cache.minAsNumber);
+							return;
+						} else if(factor < 0 && !isNaN(cache.maxAsNumber) && (isNaN(val) || cache.maxAsNumber < val)){
+							$.prop(this, 'valueAsNumber', cache.maxAsNumber);
+							return;
+						}
+
+						if(isNaN(val)){
+							val = 0;
+						}
+
 						base = cache.minAsNumber;
 						
 						if(isNaN(base) && (attrVal = $.prop(this, 'defaultValue'))){
@@ -249,7 +260,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 						
 						if( (!isNaN(cache.maxAsNumber) && val > cache.maxAsNumber) || (!isNaN(cache.minAsNumber) && val < cache.minAsNumber) ){
 							webshims.info("max/min overflow can't apply stepUp/stepDown");
-							throw('invalid state error');
+							return;
 						}
 						
 						$.prop(this, 'valueAsNumber', val);
@@ -603,4 +614,4 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 		});
 	}
 	
-});
+});

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

@@ -964,7 +964,6 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				}
 				this.elemHelper.prop('valueAsNumber', start);
 				this.options.defValue = this.elemHelper.prop('value');
-				
 			},
 			reorderInputs: function(){
 				if(splitInputs[this.type]){
@@ -1031,7 +1030,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 							selectionEnd = this._getSelectionEnd(val);
 						}
 						this.element.prop(name, val);
-						if(selectionEnd){
+						if(selectionEnd != null){
 							this.element.prop('selectionEnd', selectionEnd);
 						}
 					}
@@ -1046,6 +1045,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			spinBtnProto[name] = function(val){
 				this.elemHelper.prop(name, val);
 				this[numName] = this.asNumber(val);
+
 				if(this.valueAsNumber != null && (isNaN(this.valueAsNumber) || (!isNaN(this[numName]) && (this.valueAsNumber * factor) < (this[numName] * factor)))){
 					this._setStartInRange();
 				}
@@ -1682,11 +1682,11 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			
 			var type = $.prop(this, 'type');
 			
-			var i, opts, data, optsName, labels, cNames;
+			var i, opts, data, optsName, labels, cNames, hasInitialFocus;
 			if(inputTypes[type] && webshims.implement(this, 'inputwidgets')){
 				data = {};
 				optsName = type;
-				
+				hasInitialFocus = $(this).is(':focus');
 				labels = $(this).jProp('labels');
 				opts = $.extend(webshims.getOptions(this, type, [options.widgets, options[type], $($.prop(this, 'form')).data(type)]), {
 					orig: this,
@@ -1811,6 +1811,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				} else {
 					$(this).css('display', 'none');
 				}
+				if(hasInitialFocus){
+					$(this).getShadowFocusElement().trigger('focus');
+				}
 			}
 			
 		};