webshims-rails 1.10.6 → 1.10.9

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

@@ -1130,6 +1130,12 @@ webshims.register('track-ui', function($, webshims, window, document, undefined)
 				};
 				var baseData, trackList, updateTimer;
 				
+				elem.on('remove', function(e){
+					if(!e.originalEvent && baseData && baseData.trackDisplay){
+						baseData.trackDisplay.remove();
+					}
+				});
+				
 				if(!usesNativeTrack()){
 					addTrackView();
 				} else {

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

@@ -11,10 +11,15 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	if(!$.parseHTML){
 		webshims.error("Webshims needs jQuery 1.8+ to work properly. Please update your jQuery version or downgrade webshims.");
 	}
+	
+	if(webshims.cfg.extendNative == 1){
+		webshims.warn("extendNative configuration will be set to false by default with next 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) {
-				webshims.error("jQuery was included more than once. Make sure to include it only once! Webshims and other Plugins might not work properly.");
+				webshims.error("jQuery was included more than once. Make sure to include it only once or try the $.noConflict(extreme) feature! Webshims and other Plugins might not work properly..");
 				if (window.$) {
 					window.$ = webshims.$;
 				}
@@ -32,7 +37,10 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		};
 		switch$();
 		setTimeout(switch$, 90);
+		webshims.ready('DOM', switch$);
 		$(switch$);
+		webshims.ready('WINDOWLOAD', switch$);
+		
 	}
 //	(function(){
 //		var hostNames = {
@@ -140,6 +148,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				$(evtDel).off(evt, fn);
 			}
 		});
+		return this;
 	};
 	
 	var dataID = '_webshimsLib'+ (Math.round(Math.random() * 1000));
@@ -174,57 +183,6 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		};
 	});
 	
-	if($.Tween.propHooks._default && $.css){
-		(function(){
-			var isjQ8 = false;
-			try {
-				isjQ8 = $.css($('<b style="width: 10px" />')[0], 'width', '') == '10px';
-			} catch(er){
-				webshims.error(er);
-			}
-			var css = isjQ8 ? 
-				function(elem, prop){
-					return $.css( elem, prop, false, "" );
-				} :
-				function(elem, prop){
-					return $.css( elem, prop, "" );
-				}
-			;
-				
-			$.extend($.Tween.propHooks._default, {
-				get: function( tween ) {
-					var result;
-					
-					if ( (tween.elem[ tween.prop ] != null || havePolyfill[ tween.prop ]) &&
-						(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-						return havePolyfill[ tween.prop ] ? $.prop(tween.elem, tween.prop) : tween.elem[ tween.prop ];
-					}
-		
-					// passing an empty string as a 3rd parameter to .css will automatically
-					// attempt a parseFloat and fallback to a string if the parse fails
-					// so, simple values such as "10px" are parsed to Float.
-					// complex values such as "rotate(1rad)" are returned as is.
-					result = css( tween.elem, tween.prop );
-					// Empty strings, null, undefined and "auto" are converted to 0.
-					return !result || result === "auto" ? 0 : result;
-				},
-				set: function( tween ) {
-					// use step hook for back compat - use cssHook if its there - use .style if its
-					// available and use plain properties where available
-					if ( jQuery.fx.step[ tween.prop ] ) {
-						jQuery.fx.step[ tween.prop ]( tween );
-					} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-						jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-					} else if( !havePolyfill[ tween.prop ] ) {
-						tween.elem[ tween.prop ] = tween.now;
-					} else {
-						$.prop(tween.elem, tween.prop, tween.now);
-					}
-				}
-			});
-		})();
-	}
-	
 	
 	['removeAttr', 'prop', 'attr'].forEach(function(type){
 		olds[type] = $[type];
@@ -628,48 +586,50 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				});
 			};
 			return function(nativeElem, shadowElem, opts){
-				opts = opts || {};
-				if(nativeElem.jquery){
-					nativeElem = nativeElem[0];
-				}
-				if(shadowElem.jquery){
-					shadowElem = shadowElem[0];
-				}
-				var nativeData = $.data(nativeElem, dataID) || $.data(nativeElem, dataID, {});
-				var shadowData = $.data(shadowElem, dataID) || $.data(shadowElem, dataID, {});
-				var shadowFocusElementData = {};
-				if(!opts.shadowFocusElement){
-					opts.shadowFocusElement = shadowElem;
-				} else if(opts.shadowFocusElement){
-					if(opts.shadowFocusElement.jquery){
-						opts.shadowFocusElement = opts.shadowFocusElement[0];
+				if(nativeElem && shadowElem){
+					opts = opts || {};
+					if(nativeElem.jquery){
+						nativeElem = nativeElem[0];
 					}
-					shadowFocusElementData = $.data(opts.shadowFocusElement, dataID) || $.data(opts.shadowFocusElement, dataID, shadowFocusElementData);
-				}
-				
-				$(nativeElem).on('remove', function(e){
-					if (!e.originalEvent) {
-						$(shadowElem).remove();
+					if(shadowElem.jquery){
+						shadowElem = shadowElem[0];
 					}
-				});
-				
-				nativeData.hasShadow = shadowElem;
-				shadowFocusElementData.nativeElement = shadowData.nativeElement = nativeElem;
-				shadowFocusElementData.shadowData = shadowData.shadowData = nativeData.shadowData = {
-					nativeElement: nativeElem,
-					shadowElement: shadowElem,
-					shadowFocusElement: opts.shadowFocusElement
-				};
-				if(opts.shadowChilds){
-					opts.shadowChilds.each(function(){
-						elementData(this, 'shadowData', shadowData.shadowData);
+					var nativeData = $.data(nativeElem, dataID) || $.data(nativeElem, dataID, {});
+					var shadowData = $.data(shadowElem, dataID) || $.data(shadowElem, dataID, {});
+					var shadowFocusElementData = {};
+					if(!opts.shadowFocusElement){
+						opts.shadowFocusElement = shadowElem;
+					} else if(opts.shadowFocusElement){
+						if(opts.shadowFocusElement.jquery){
+							opts.shadowFocusElement = opts.shadowFocusElement[0];
+						}
+						shadowFocusElementData = $.data(opts.shadowFocusElement, dataID) || $.data(opts.shadowFocusElement, dataID, shadowFocusElementData);
+					}
+					
+					$(nativeElem).on('remove', function(e){
+						if (!e.originalEvent) {
+							$(shadowElem).remove();
+						}
 					});
+					
+					nativeData.hasShadow = shadowElem;
+					shadowFocusElementData.nativeElement = shadowData.nativeElement = nativeElem;
+					shadowFocusElementData.shadowData = shadowData.shadowData = nativeData.shadowData = {
+						nativeElement: nativeElem,
+						shadowElement: shadowElem,
+						shadowFocusElement: opts.shadowFocusElement
+					};
+					if(opts.shadowChilds){
+						opts.shadowChilds.each(function(){
+							elementData(this, 'shadowData', shadowData.shadowData);
+						});
+					}
+					
+					if(opts.data){
+						shadowFocusElementData.shadowData.data = shadowData.shadowData.data = nativeData.shadowData.data = opts.data;
+					}
+					opts = null;
 				}
-				
-				if(opts.data){
-					shadowFocusElementData.shadowData.data = shadowData.shadowData.data = nativeData.shadowData.data = opts.data;
-				}
-				opts = null;
 				webshims.docObserve();
 			};
 		})(),
@@ -953,7 +913,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 //				register: moduleName:string,
 //				callback: callback:function
 //			});
-//		get/set including removeLang
+//		get/set including remoteLang
 //			- webshims.activeLang({
 //				module: moduleName:string,
 //				callback: callback:function,
@@ -1205,12 +1165,13 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 		$.expr[":"][name] = $.expr.filters[name+"-element"];
 	});
 	
-	
-	$.expr[":"].focus = function( elem ) {
+	var pseudoFocus = $.expr[":"].focus;
+	$.expr[":"].focus = function(){
 		try {
-			var doc = elem.ownerDocument;
-			return elem === doc.activeElement && (!doc.hasFocus || doc.hasFocus());
-		} catch(e){}
+			return pseudoFocus.apply(this, arguments);
+		} catch(e){
+			webshims.error(e);
+		}
 		return false;
 	};
 	
@@ -1225,7 +1186,7 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 		});
 	};
 	
-	
+	var transClass = ('transitionDelay' in document.documentElement.style) ?  '' : ' no-transition';
 	webshims.wsPopover = {
 		id: 0,
 		_create: function(){
@@ -1233,7 +1194,7 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 			this.id = webshims.wsPopover.id++;
 			this.eventns = '.wsoverlay' + this.id;
 			this.timers = {};
-			this.element = $('<div class="ws-popover" tabindex="-1"><div class="ws-po-outerbox"><div class="ws-po-arrow"><div class="ws-po-arrowbox" /></div><div class="ws-po-box" /></div></div>');
+			this.element = $('<div class="ws-popover'+transClass+'" tabindex="-1"><div class="ws-po-outerbox"><div class="ws-po-arrow"><div class="ws-po-arrowbox" /></div><div class="ws-po-box" /></div></div>');
 			this.contentElement = $('.ws-po-box', this.element);
 			this.lastElement = $([]);
 			this.bindElement();
@@ -1272,47 +1233,6 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 	};
 	
 	
-	/* 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;
-		});
-	})();
-	
-	
 	webshims.getContentValidationMessage = function(elem, validity, key){
 		var message = $(elem).data('errormessage') || elem.getAttribute('x-moz-errormessage') || '';
 		if(key && message[key]){
@@ -1346,19 +1266,13 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 	};
 	
 	
-	webshims.ready('forms', function(){
-		$(document).on('focusin.lazyloadvalidation', function(e){
-			if('form' in e.target && $(e.target).is(':invalid')){
-				lazyLoad();
-			}
-		});
+	$(document).on('focusin.lazyloadvalidation', function(e){
+		if('form' in e.target && $(e.target).is(':invalid')){
+			lazyLoad();
+		}
 	});
 	webshims.ready('WINDOWLOAD', lazyLoad);
-	if(options.overrideMessages){
-		options.customMessages = true;
-		webshims.reTest('form-message');
-		webshims.error('overrideMessages is deprecated. use customMessages instead.');
-	}
+	
 	if(options.replaceValidationUI){
 		webshims.ready('DOM forms', function(){
 			$(document).on('firstinvalid', function(e){
@@ -1369,8 +1283,47 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 			});
 		});
 	}
-});
+	
+	/* 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;
+		});
+	})();
+});
 
 webshims.register('form-message', function($, webshims, window, document, undefined, options){
 	"use strict";
@@ -1424,8 +1377,15 @@ webshims.register('form-message', function($, webshims, window, document, undefi
 			validityMessages.en.rangeOverflow[type] = validityMessages.en.rangeOverflow[type] || 'Value must be at or before {%max}.';
 		});
 	}
-	
-	validityMessages['en-US'] = validityMessages['en-US'] || validityMessages.en;
+	if(!validityMessages['en-US']){
+		validityMessages['en-US'] = $.extend(true, {}, validityMessages.en);
+	}
+	if(!validityMessages['en-GB']){
+		validityMessages['en-GB'] = $.extend(true, {}, validityMessages.en);
+	}
+	if(!validityMessages['en-AU']){
+		validityMessages['en-AU'] = $.extend(true, {}, validityMessages.en);
+	}
 	validityMessages[''] = validityMessages[''] || validityMessages['en-US'];
 	
 	validityMessages.de = $.extend(true, {
@@ -1525,12 +1485,22 @@ webshims.register('form-message', function($, webshims, window, document, undefi
 	
 	webshims.activeLang({
 		langObj: validityMessages, 
-		module: 'form-core', 
+		module: 'form-core',
 		callback: function(langObj){
-			
 			currentValidationMessage = langObj;
 		}
 	});
+	webshims.activeLang({
+		register: 'form-core',
+		callback: function(val){
+			$.each(validityMessages, function(i, val){
+				if(validityMessages[val]){
+					currentValidationMessage = validityMessages[val];
+					return false;
+				}
+			});
+		}
+	});
 	
 	implementProperties.forEach(function(messageProp){
 		webshims.defineNodeNamesProperty(['fieldset', 'output', 'button'], messageProp, {
@@ -1576,4 +1546,4 @@ webshims.register('form-message', function($, webshims, window, document, undefi
 		});
 		
 	});
-});
+});

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

@@ -11,10 +11,15 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	if(!$.parseHTML){
 		webshims.error("Webshims needs jQuery 1.8+ to work properly. Please update your jQuery version or downgrade webshims.");
 	}
+	
+	if(webshims.cfg.extendNative == 1){
+		webshims.warn("extendNative configuration will be set to false by default with next 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) {
-				webshims.error("jQuery was included more than once. Make sure to include it only once! Webshims and other Plugins might not work properly.");
+				webshims.error("jQuery was included more than once. Make sure to include it only once or try the $.noConflict(extreme) feature! Webshims and other Plugins might not work properly..");
 				if (window.$) {
 					window.$ = webshims.$;
 				}
@@ -32,7 +37,10 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		};
 		switch$();
 		setTimeout(switch$, 90);
+		webshims.ready('DOM', switch$);
 		$(switch$);
+		webshims.ready('WINDOWLOAD', switch$);
+		
 	}
 //	(function(){
 //		var hostNames = {
@@ -140,6 +148,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				$(evtDel).off(evt, fn);
 			}
 		});
+		return this;
 	};
 	
 	var dataID = '_webshimsLib'+ (Math.round(Math.random() * 1000));
@@ -174,57 +183,6 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		};
 	});
 	
-	if($.Tween.propHooks._default && $.css){
-		(function(){
-			var isjQ8 = false;
-			try {
-				isjQ8 = $.css($('<b style="width: 10px" />')[0], 'width', '') == '10px';
-			} catch(er){
-				webshims.error(er);
-			}
-			var css = isjQ8 ? 
-				function(elem, prop){
-					return $.css( elem, prop, false, "" );
-				} :
-				function(elem, prop){
-					return $.css( elem, prop, "" );
-				}
-			;
-				
-			$.extend($.Tween.propHooks._default, {
-				get: function( tween ) {
-					var result;
-					
-					if ( (tween.elem[ tween.prop ] != null || havePolyfill[ tween.prop ]) &&
-						(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-						return havePolyfill[ tween.prop ] ? $.prop(tween.elem, tween.prop) : tween.elem[ tween.prop ];
-					}
-		
-					// passing an empty string as a 3rd parameter to .css will automatically
-					// attempt a parseFloat and fallback to a string if the parse fails
-					// so, simple values such as "10px" are parsed to Float.
-					// complex values such as "rotate(1rad)" are returned as is.
-					result = css( tween.elem, tween.prop );
-					// Empty strings, null, undefined and "auto" are converted to 0.
-					return !result || result === "auto" ? 0 : result;
-				},
-				set: function( tween ) {
-					// use step hook for back compat - use cssHook if its there - use .style if its
-					// available and use plain properties where available
-					if ( jQuery.fx.step[ tween.prop ] ) {
-						jQuery.fx.step[ tween.prop ]( tween );
-					} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-						jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-					} else if( !havePolyfill[ tween.prop ] ) {
-						tween.elem[ tween.prop ] = tween.now;
-					} else {
-						$.prop(tween.elem, tween.prop, tween.now);
-					}
-				}
-			});
-		})();
-	}
-	
 	
 	['removeAttr', 'prop', 'attr'].forEach(function(type){
 		olds[type] = $[type];
@@ -628,48 +586,50 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				});
 			};
 			return function(nativeElem, shadowElem, opts){
-				opts = opts || {};
-				if(nativeElem.jquery){
-					nativeElem = nativeElem[0];
-				}
-				if(shadowElem.jquery){
-					shadowElem = shadowElem[0];
-				}
-				var nativeData = $.data(nativeElem, dataID) || $.data(nativeElem, dataID, {});
-				var shadowData = $.data(shadowElem, dataID) || $.data(shadowElem, dataID, {});
-				var shadowFocusElementData = {};
-				if(!opts.shadowFocusElement){
-					opts.shadowFocusElement = shadowElem;
-				} else if(opts.shadowFocusElement){
-					if(opts.shadowFocusElement.jquery){
-						opts.shadowFocusElement = opts.shadowFocusElement[0];
+				if(nativeElem && shadowElem){
+					opts = opts || {};
+					if(nativeElem.jquery){
+						nativeElem = nativeElem[0];
 					}
-					shadowFocusElementData = $.data(opts.shadowFocusElement, dataID) || $.data(opts.shadowFocusElement, dataID, shadowFocusElementData);
-				}
-				
-				$(nativeElem).on('remove', function(e){
-					if (!e.originalEvent) {
-						$(shadowElem).remove();
+					if(shadowElem.jquery){
+						shadowElem = shadowElem[0];
 					}
-				});
-				
-				nativeData.hasShadow = shadowElem;
-				shadowFocusElementData.nativeElement = shadowData.nativeElement = nativeElem;
-				shadowFocusElementData.shadowData = shadowData.shadowData = nativeData.shadowData = {
-					nativeElement: nativeElem,
-					shadowElement: shadowElem,
-					shadowFocusElement: opts.shadowFocusElement
-				};
-				if(opts.shadowChilds){
-					opts.shadowChilds.each(function(){
-						elementData(this, 'shadowData', shadowData.shadowData);
+					var nativeData = $.data(nativeElem, dataID) || $.data(nativeElem, dataID, {});
+					var shadowData = $.data(shadowElem, dataID) || $.data(shadowElem, dataID, {});
+					var shadowFocusElementData = {};
+					if(!opts.shadowFocusElement){
+						opts.shadowFocusElement = shadowElem;
+					} else if(opts.shadowFocusElement){
+						if(opts.shadowFocusElement.jquery){
+							opts.shadowFocusElement = opts.shadowFocusElement[0];
+						}
+						shadowFocusElementData = $.data(opts.shadowFocusElement, dataID) || $.data(opts.shadowFocusElement, dataID, shadowFocusElementData);
+					}
+					
+					$(nativeElem).on('remove', function(e){
+						if (!e.originalEvent) {
+							$(shadowElem).remove();
+						}
 					});
+					
+					nativeData.hasShadow = shadowElem;
+					shadowFocusElementData.nativeElement = shadowData.nativeElement = nativeElem;
+					shadowFocusElementData.shadowData = shadowData.shadowData = nativeData.shadowData = {
+						nativeElement: nativeElem,
+						shadowElement: shadowElem,
+						shadowFocusElement: opts.shadowFocusElement
+					};
+					if(opts.shadowChilds){
+						opts.shadowChilds.each(function(){
+							elementData(this, 'shadowData', shadowData.shadowData);
+						});
+					}
+					
+					if(opts.data){
+						shadowFocusElementData.shadowData.data = shadowData.shadowData.data = nativeData.shadowData.data = opts.data;
+					}
+					opts = null;
 				}
-				
-				if(opts.data){
-					shadowFocusElementData.shadowData.data = shadowData.shadowData.data = nativeData.shadowData.data = opts.data;
-				}
-				opts = null;
 				webshims.docObserve();
 			};
 		})(),
@@ -953,7 +913,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 //				register: moduleName:string,
 //				callback: callback:function
 //			});
-//		get/set including removeLang
+//		get/set including remoteLang
 //			- webshims.activeLang({
 //				module: moduleName:string,
 //				callback: callback:function,
@@ -1205,12 +1165,13 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 		$.expr[":"][name] = $.expr.filters[name+"-element"];
 	});
 	
-	
-	$.expr[":"].focus = function( elem ) {
+	var pseudoFocus = $.expr[":"].focus;
+	$.expr[":"].focus = function(){
 		try {
-			var doc = elem.ownerDocument;
-			return elem === doc.activeElement && (!doc.hasFocus || doc.hasFocus());
-		} catch(e){}
+			return pseudoFocus.apply(this, arguments);
+		} catch(e){
+			webshims.error(e);
+		}
 		return false;
 	};
 	
@@ -1225,7 +1186,7 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 		});
 	};
 	
-	
+	var transClass = ('transitionDelay' in document.documentElement.style) ?  '' : ' no-transition';
 	webshims.wsPopover = {
 		id: 0,
 		_create: function(){
@@ -1233,7 +1194,7 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 			this.id = webshims.wsPopover.id++;
 			this.eventns = '.wsoverlay' + this.id;
 			this.timers = {};
-			this.element = $('<div class="ws-popover" tabindex="-1"><div class="ws-po-outerbox"><div class="ws-po-arrow"><div class="ws-po-arrowbox" /></div><div class="ws-po-box" /></div></div>');
+			this.element = $('<div class="ws-popover'+transClass+'" tabindex="-1"><div class="ws-po-outerbox"><div class="ws-po-arrow"><div class="ws-po-arrowbox" /></div><div class="ws-po-box" /></div></div>');
 			this.contentElement = $('.ws-po-box', this.element);
 			this.lastElement = $([]);
 			this.bindElement();
@@ -1272,47 +1233,6 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 	};
 	
 	
-	/* 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;
-		});
-	})();
-	
-	
 	webshims.getContentValidationMessage = function(elem, validity, key){
 		var message = $(elem).data('errormessage') || elem.getAttribute('x-moz-errormessage') || '';
 		if(key && message[key]){
@@ -1346,19 +1266,13 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 	};
 	
 	
-	webshims.ready('forms', function(){
-		$(document).on('focusin.lazyloadvalidation', function(e){
-			if('form' in e.target && $(e.target).is(':invalid')){
-				lazyLoad();
-			}
-		});
+	$(document).on('focusin.lazyloadvalidation', function(e){
+		if('form' in e.target && $(e.target).is(':invalid')){
+			lazyLoad();
+		}
 	});
 	webshims.ready('WINDOWLOAD', lazyLoad);
-	if(options.overrideMessages){
-		options.customMessages = true;
-		webshims.reTest('form-message');
-		webshims.error('overrideMessages is deprecated. use customMessages instead.');
-	}
+	
 	if(options.replaceValidationUI){
 		webshims.ready('DOM forms', function(){
 			$(document).on('firstinvalid', function(e){
@@ -1369,8 +1283,47 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 			});
 		});
 	}
-});
+	
+	/* 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;
+		});
+	})();
+});
 
 webshims.register('form-message', function($, webshims, window, document, undefined, options){
 	"use strict";
@@ -1424,8 +1377,15 @@ webshims.register('form-message', function($, webshims, window, document, undefi
 			validityMessages.en.rangeOverflow[type] = validityMessages.en.rangeOverflow[type] || 'Value must be at or before {%max}.';
 		});
 	}
-	
-	validityMessages['en-US'] = validityMessages['en-US'] || validityMessages.en;
+	if(!validityMessages['en-US']){
+		validityMessages['en-US'] = $.extend(true, {}, validityMessages.en);
+	}
+	if(!validityMessages['en-GB']){
+		validityMessages['en-GB'] = $.extend(true, {}, validityMessages.en);
+	}
+	if(!validityMessages['en-AU']){
+		validityMessages['en-AU'] = $.extend(true, {}, validityMessages.en);
+	}
 	validityMessages[''] = validityMessages[''] || validityMessages['en-US'];
 	
 	validityMessages.de = $.extend(true, {
@@ -1525,12 +1485,22 @@ webshims.register('form-message', function($, webshims, window, document, undefi
 	
 	webshims.activeLang({
 		langObj: validityMessages, 
-		module: 'form-core', 
+		module: 'form-core',
 		callback: function(langObj){
-			
 			currentValidationMessage = langObj;
 		}
 	});
+	webshims.activeLang({
+		register: 'form-core',
+		callback: function(val){
+			$.each(validityMessages, function(i, val){
+				if(validityMessages[val]){
+					currentValidationMessage = validityMessages[val];
+					return false;
+				}
+			});
+		}
+	});
 	
 	implementProperties.forEach(function(messageProp){
 		webshims.defineNodeNamesProperty(['fieldset', 'output', 'button'], messageProp, {
@@ -1577,6 +1547,7 @@ webshims.register('form-message', function($, webshims, window, document, undefi
 		
 	});
 });
+
 webshims.register('form-datalist', function($, webshims, window, document, undefined, options){
 	"use strict";
 	var doc = document;