webshims-rails 1.10.3 → 1.10.6

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

@@ -8,7 +8,7 @@ var swfmini = function() {
 	
 	var UNDEF = "undefined",
 		OBJECT = "object",
-		webshims = jQuery.webshims,
+		webshims = jQuery.webshims || window.webshims,
 		SHOCKWAVE_FLASH = "Shockwave Flash",
 		SHOCKWAVE_FLASH_AX = "ShockwaveFlash.ShockwaveFlash",
 		FLASH_MIME_TYPE = "application/x-shockwave-flash",
@@ -497,10 +497,10 @@ var swfmini = function() {
 }();
 
 //DOM-Extension helper
-jQuery.webshims.register('dom-extend', function($, webshims, window, document, undefined){
+webshims.register('dom-extend', function($, webshims, window, document, undefined){
 	"use strict";
 	
-	webshims.assumeARIA = Modernizr.localstorage || Modernizr.video || Modernizr.boxsizing;
+	webshims.assumeARIA = $.support.getSetAttribute || Modernizr.canvas || Modernizr.video || Modernizr.boxsizing;
 	
 	if($('<input type="email" />').attr('type') == 'text' || $('<form />').attr('novalidate') === "" || ('required' in $('<input />')[0].attributes)){
 		webshims.error("IE browser modes are busted in IE10. Please test your HTML/CSS/JS with a real IE version or at least IETester or similiar tools");
@@ -509,6 +509,57 @@ jQuery.webshims.register('dom-extend', function($, webshims, window, document, u
 	if(!$.parseHTML){
 		webshims.error("Webshims needs jQuery 1.8+ to work properly. Please update your jQuery version or downgrade webshims.");
 	}
+	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.");
+				if (window.$) {
+					window.$ = webshims.$;
+				}
+				window.jQuery = webshims.$;
+			}
+			if(webshims.M != Modernizr){
+				webshims.error("Modernizr was included more than once. Make sure to include it only once! Webshims and other scripts might not work properly.");
+				for(var i in Modernizr){
+					if(!(i in webshims.M)){
+						webshims.M[i] = Modernizr[i];
+					}
+				}
+				Modernizr = webshims.M;
+			}
+		};
+		switch$();
+		setTimeout(switch$, 90);
+		$(switch$);
+	}
+//	(function(){
+//		var hostNames = {
+//			'afarkas.github.io': 1,
+//			localhost: 1,
+//			'127.0.0.1': 1
+//		};
+//		
+//		if( webshims.debug && (hostNames[location.hostname] || location.protocol == 'file:') ){
+//			var list = $('<ul class="webshims-debug-list" />');
+//			webshims.errorLog.push = function(message){
+//				list.appendTo('body');
+//				$('<li style="display: none;">'+ message +'</li>')
+//					.appendTo(list)
+//					.slideDown()
+//					.delay(3000)
+//					.slideUp(function(){
+//						$(this).remove();
+//						if(!$('li', list).length){
+//							list.detach();
+//						}
+//					})
+//				;
+//			};
+//			$.each(webshims.errorLog, function(i, message){
+//				webshims.errorLog.push(message);
+//			});
+//		}
+//	})();
 
 	//shortcus
 	var modules = webshims.modules;
@@ -526,6 +577,24 @@ jQuery.webshims.register('dom-extend', function($, webshims, window, document, u
 		return (_argless) ? oldVal.call($(elem)) : oldVal.call($(elem), val);
 	};
 	
+	//jquery mobile and jquery ui
+	if(!$.widget){
+		(function(){
+			var _cleanData = $.cleanData;
+			$.cleanData = function( elems ) {
+				if(!$.widget){
+					for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+						try {
+							$( elem ).triggerHandler( "remove" );
+						// http://bugs.jquery.com/ticket/8235
+						} catch( e ) {}
+					}
+				}
+				_cleanData( elems );
+			};
+		})();
+	}
+	
 
 	$.fn.val = function(val){
 		var elem = this[0];
@@ -559,6 +628,18 @@ jQuery.webshims.register('dom-extend', function($, webshims, window, document, u
 		return this.on(evt, fn).each(fn);
 	};
 	
+	$.fn.onWSOff = function(evt, fn, trigger, evtDel){
+		if(!evtDel){
+			evtDel = document;
+		}
+		$(evtDel)[trigger ? 'onTrigger' : 'on'](evt, fn);
+		this.on('remove', function(e){
+			if(!e.originalEvent){
+				$(evtDel).off(evt, fn);
+			}
+		});
+	};
+	
 	var dataID = '_webshimsLib'+ (Math.round(Math.random() * 1000));
 	var elementData = function(elem, key, val){
 		elem = elem.jquery ? elem[0] : elem;
@@ -920,7 +1001,7 @@ jQuery.webshims.register('dom-extend', function($, webshims, window, document, u
 		implement: function(elem, type){
 			var data = elementData(elem, 'implemented') || elementData(elem, 'implemented', {});
 			if(data[type]){
-				webshims.info(type +' already implemented for element #'+elem.id);
+				webshims.warn(type +' already implemented for element #'+elem.id);
 				return false;
 			}
 			data[type] = true;
@@ -1064,6 +1145,12 @@ jQuery.webshims.register('dom-extend', function($, webshims, window, document, u
 					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 = {
@@ -1539,32 +1626,9 @@ jQuery.webshims.register('dom-extend', function($, webshims, window, document, u
 	
 })(jQuery, document);
 
-//additional tests for partial implementation of forms features
-(function($){
+webshims.register('form-core', function($, webshims, window, document, undefined, options){
 	"use strict";
-	var isWebkit = 'webkitURL' in window;
-	var Modernizr = window.Modernizr;
-	var webshims = $.webshims;
-	var bugs = webshims.bugs;
-	var form = $('<form action="#" style="width: 1px; height: 1px; overflow: hidden;"><select name="b" required="" /><input required="" name="a" /></form>');
-	var testRequiredFind = function(){
-		if(form[0].querySelector){
-			try {
-				bugs.findRequired = !(form[0].querySelector('select:required'));
-			} catch(er){
-				bugs.findRequired = false;
-			}
-		}
-	};
-	var inputElem = $('input', form).eq(0);
-	var onDomextend = function(fn){
-		webshims.loader.loadList(['dom-extend']);
-		webshims.ready('dom-extend', fn);
-	};
-	
-	bugs.findRequired = false;
-	bugs.validationMessage = false;
-	
+
 	webshims.capturingEventPrevented = function(e){
 		if(!e._isPolyfilled){
 			var isDefaultPrevented = e.isDefaultPrevented;
@@ -1583,689 +1647,238 @@ jQuery.webshims.register('dom-extend', function($, webshims, window, document, u
 		}
 	};
 	
-	if(!Modernizr.formvalidation || bugs.bustedValidity){
-		testRequiredFind();
-	} else {
+	if(Modernizr.formvalidation && !webshims.bugs.bustedValidity){
 		//create delegatable events
 		webshims.capturingEvents(['invalid'], true);
-		
-		if(window.opera || window.testGoodWithFix){
-			
-			form.appendTo('head');
-			
-			testRequiredFind();
-			bugs.validationMessage = !(inputElem.prop('validationMessage'));
-			
-			webshims.reTest(['form-native-extend', 'form-message']);
-			
-			form.remove();
-				
-			$(function(){
-				onDomextend(function(){
-					
-					//Opera shows native validation bubbles in case of input.checkValidity()
-					// Opera 11.6/12 hasn't fixed this issue right, it's buggy
-					var preventDefault = function(e){
-						e.preventDefault();
-					};
-					
-					['form', 'input', 'textarea', 'select'].forEach(function(name){
-						var desc = webshims.defineNodeNameProperty(name, 'checkValidity', {
-							prop: {
-								value: function(){
-									if (!webshims.fromSubmit) {
-										$(this).on('invalid.checkvalidity', preventDefault);
-									}
-									
-									webshims.fromCheckValidity = true;
-									var ret = desc.prop._supvalue.apply(this, arguments);
-									if (!webshims.fromSubmit) {
-										$(this).unbind('invalid.checkvalidity', preventDefault);
-									}
-									webshims.fromCheckValidity = false;
-									return ret;
-								}
-							}
-						});
-					});
-					
-				});
-			});
-		}
-		
-		if(isWebkit && !webshims.bugs.bustedValidity){
-			(function(){
-				var elems = /^(?:textarea|input)$/i;
-				var form = false;
-				
-				document.addEventListener('contextmenu', function(e){
-					if(elems.test( e.target.nodeName || '') && (form = e.target.form)){
-						setTimeout(function(){
-							form = false;
-						}, 1);
-					}
-				}, false);
-				
-				$(window).on('invalid', function(e){
-					if(e.originalEvent && form && form == e.target.form){
-						e.wrongWebkitInvalid = true;
-						e.stopImmediatePropagation();
-					}
-				});
-				
-			})();
-		}
 	}
 
-	$.webshims.register('form-core', function($, webshims, window, document, undefined, options){
-	
-		var checkTypes = {checkbox: 1, radio: 1};
-		var emptyJ = $([]);
-		var bugs = webshims.bugs;
-		var getGroupElements = function(elem){
-			elem = $(elem);
-			var name;
-			var form;
-			var ret = emptyJ;
-			if(elem[0].type == 'radio'){
-				form = elem.prop('form');
-				name = elem[0].name;
-				if(!name){
-					ret = elem;
-				} else if(form){
-					ret = $(form[name]);
-				} else {
-					ret = $(document.getElementsByName(name)).filter(function(){
-						return !$.prop(this, 'form');
-					});
-				}
-				ret = ret.filter('[type="radio"]');
-			}
-			return ret;
-		};
-		
-		var getContentValidationMessage = webshims.getContentValidationMessage = function(elem, validity, key){
-			var message = $(elem).data('errormessage') || elem.getAttribute('x-moz-errormessage') || '';
-			if(key && message[key]){
-				message = message[key];
-			}
-			if(typeof message == 'object'){
-				validity = validity || $.prop(elem, 'validity') || {valid: 1};
-				if(!validity.valid){
-					$.each(validity, function(name, prop){
-						if(prop && name != 'valid' && message[name]){
-							message = message[name];
-							return false;
-						}
-					});
-				}
-			}
-			
-			if(typeof message == 'object'){
-				message = message.defaultMessage;
-			}
-			return message || '';
-		};
-		
-		/*
-		 * Selectors for all browsers
-		 */
-		var rangeTypes = {number: 1, range: 1, date: 1/*, time: 1, 'datetime-local': 1, datetime: 1, month: 1, week: 1*/};
-		var hasInvalid = function(elem){
-			var ret = false;
-			$($.prop(elem, 'elements')).each(function(){
-				ret = $(this).is(':invalid');
-				if(ret){
-					return false;
-				}
-			});
-			return ret;
-		};
-		$.extend($.expr[":"], {
-			"valid-element": function(elem){
-				return $.nodeName(elem, 'form') ? !hasInvalid(elem) :!!($.prop(elem, 'willValidate') && isValid(elem));
-			},
-			"invalid-element": function(elem){
-				return $.nodeName(elem, 'form') ? hasInvalid(elem) : !!($.prop(elem, 'willValidate') && !isValid(elem));
-			},
-			"required-element": function(elem){
-				return !!($.prop(elem, 'willValidate') && $.prop(elem, 'required'));
-			},
-			"user-error": function(elem){
-				return ($.prop(elem, 'willValidate') && $(elem).hasClass('user-error'));
-			},
-			"optional-element": function(elem){
-				return !!($.prop(elem, 'willValidate') && $.prop(elem, 'required') === false);
-			},
-			"in-range": function(elem){
-				if(!rangeTypes[$.prop(elem, 'type')] || !$.prop(elem, 'willValidate')){
-					return false;
-				}
-				var val = $.prop(elem, 'validity');
-				return !!(val && !val.rangeOverflow && !val.rangeUnderflow);
-			},
-			"out-of-range": function(elem){
-				if(!rangeTypes[$.prop(elem, 'type')] || !$.prop(elem, 'willValidate')){
-					return false;
-				}
-				var val = $.prop(elem, 'validity');
-				return !!(val && (val.rangeOverflow || val.rangeUnderflow));
+	var isValid = function(elem){
+		return ($.prop(elem, 'validity') || {valid: 1}).valid;
+	};
+	var lazyLoad = function(){
+		var toLoad = ['form-validation'];
+		if(options.lazyCustomMessages){
+			options.customMessages = true;
+			toLoad.push('form-message');
+		}
+		if(options.addValidators){
+			toLoad.push('form-validators');
+		}
+		webshims.reTest(toLoad);
+		$(document).off('.lazyloadvalidation');
+	};
+	/*
+	 * Selectors for all browsers
+	 */
+	var hasInvalid = function(elem){
+		var ret = false;
+		$(elem).jProp('elements').each(function(){
+			ret = $(this).is(':invalid');
+			if(ret){
+				return false;
 			}
-			
 		});
-		
-		['valid', 'invalid', 'required', 'optional'].forEach(function(name){
-			$.expr[":"][name] = $.expr.filters[name+"-element"];
-		});
-		
-		
-		$.expr[":"].focus = function( elem ) {
-			try {
-				var doc = elem.ownerDocument;
-				return elem === doc.activeElement && (!doc.hasFocus || doc.hasFocus());
-			} catch(e){}
-			return false;
-		};
-		
-		
-		var customEvents = $.event.customEvent || {};
-		var isValid = function(elem){
-			return ($.prop(elem, 'validity') || {valid: 1}).valid;
-		};
-		
-		if (bugs.bustedValidity || bugs.findRequired) {
-			(function(){
-				var find = $.find;
-				var matchesSelector = $.find.matchesSelector;
-				
-				var regExp = /(\:valid|\:invalid|\:optional|\:required|\:in-range|\:out-of-range)(?=[\s\[\~\.\+\>\:\#*]|$)/ig;
-				var regFn = function(sel){
-					return sel + '-element';
-				};
-				
-				$.find = (function(){
-					var slice = Array.prototype.slice;
-					var fn = function(sel){
-						var ar = arguments;
-						ar = slice.call(ar, 1, ar.length);
-						ar.unshift(sel.replace(regExp, regFn));
-						return find.apply(this, ar);
-					};
-					for (var i in find) {
-						if(find.hasOwnProperty(i)){
-							fn[i] = find[i];
-						}
-					}
-					return fn;
-				})();
-				if(!Modernizr.prefixed || Modernizr.prefixed("matchesSelector", document.documentElement)){
-					$.find.matchesSelector = function(node, expr){
-						expr = expr.replace(regExp, regFn);
-						return matchesSelector.call(this, node, expr);
-					};
-				}
-				
-			})();
+		return ret;
+	};
+	var rElementsGroup = /^(?:form)$/i;///^(?:form|fieldset)$/i
+	$.extend($.expr[":"], {
+		"valid-element": function(elem){
+			return rElementsGroup.test(elem.nodeName || '') ? !hasInvalid(elem) :!!($.prop(elem, 'willValidate') && isValid(elem));
+		},
+		"invalid-element": function(elem){
+			return rElementsGroup.test(elem.nodeName || '') ? hasInvalid(elem) : !!($.prop(elem, 'willValidate') && !isValid(elem));
+		},
+		"required-element": function(elem){
+			return !!($.prop(elem, 'willValidate') && $.prop(elem, 'required'));
+		},
+		"user-error": function(elem){
+			return ($.prop(elem, 'willValidate') && $(elem).hasClass('user-error'));
+		},
+		"optional-element": function(elem){
+			return !!($.prop(elem, 'willValidate') && $.prop(elem, 'required') === false);
 		}
-		
-		//ToDo needs testing
-		var oldAttr = $.prop;
-		var changeVals = {selectedIndex: 1, value: 1, checked: 1, disabled: 1, readonly: 1};
-		$.prop = function(elem, name, val){
-			var ret = oldAttr.apply(this, arguments);
-			if(elem && 'form' in elem && changeVals[name] && val !== undefined && $(elem).hasClass(invalidClass)){
-				if(isValid(elem)){
-					$(elem).getShadowElement().removeClass(invalidClass);
-					if(name == 'checked' && val) {
-						getGroupElements(elem).not(elem).removeClass(invalidClass).removeAttr('aria-invalid');
-					}
-				}
-			}
-			return ret;
-		};
-		
-		var returnValidityCause = function(validity, elem){
-			var ret;
-			$.each(validity, function(name, value){
-				if(value){
-					ret = (name == 'customError') ? $.prop(elem, 'validationMessage') : name;
-					return false;
-				}
-			});
-			return ret;
-		};
-		
-		var isInGroup = function(name){
-			var ret;
-			try {
-				ret = document.activeElement.name === name;
-			} catch(e){}
-			return ret;
-		};
-		/* form-ui-invalid/form-ui-valid are deprecated. use user-error/user-success instead */
-		var invalidClass = 'user-error';
-		var validClass = 'user-success';
-		var stopChangeTypes = {
-			time: 1,
-			date: 1,
-			month: 1,
-			datetime: 1,
-			week: 1,
-			'datetime-local': 1
-		};
-		var switchValidityClass = function(e){
-			var elem, timer;
-			if(!e.target){return;}
-			elem = $(e.target).getNativeElement()[0];
-			if(elem.type == 'submit' || !$.prop(elem, 'willValidate')){return;}
-			timer = $.data(elem, 'webshimsswitchvalidityclass');
-			var switchClass = function(){
-				if(e.type == 'focusout' && elem.type == 'radio' && isInGroup(elem.name)){return;}
-				var validity = $.prop(elem, 'validity');
-				var shadowElem = $(elem).getShadowElement();
-				var addClass, removeClass, trigger, generaltrigger, validityCause;
-				
-				if(isWebkit && e.type == 'change' && !bugs.bustedValidity && stopChangeTypes[shadowElem.prop('type')] && shadowElem.is(':focus')){return;}
-				
-				$(elem).trigger('refreshCustomValidityRules');
-				
-				if(validity.valid){
-					if(!shadowElem.hasClass(validClass)){
-						addClass = validClass;
-						removeClass = invalidClass;
-						generaltrigger = 'changedvaliditystate';
-						trigger = 'changedvalid';
-						if(checkTypes[elem.type] && elem.checked){
-							getGroupElements(elem).not(elem).removeClass(removeClass).addClass(addClass).removeAttr('aria-invalid');
-						}
-						$.removeData(elem, 'webshimsinvalidcause');
-					}
-				} else {
-					validityCause = returnValidityCause(validity, elem);
-					if($.data(elem, 'webshimsinvalidcause') != validityCause){
-						$.data(elem, 'webshimsinvalidcause', validityCause);
-						generaltrigger = 'changedvaliditystate';
-					}
-					if(!shadowElem.hasClass(invalidClass)){
-						addClass = invalidClass;
-						removeClass = validClass;
-						if (checkTypes[elem.type] && !elem.checked) {
-							getGroupElements(elem).not(elem).removeClass(removeClass).addClass(addClass);
-						}
-						trigger = 'changedinvalid';
-					}
-				}
-				
-				if(addClass){
-					shadowElem.addClass(addClass).removeClass(removeClass);
-					//jQuery 1.6.1 IE9 bug (doubble trigger bug)
-					setTimeout(function(){
-						$(elem).trigger(trigger);
-					}, 0);
-				}
-				if(generaltrigger){
-					setTimeout(function(){
-						$(elem).trigger(generaltrigger);
-					}, 0);
-				}
-				
-				$.removeData(elem, 'webshimsswitchvalidityclass');
-			};
+	});
+	
+	['valid', 'invalid', 'required', 'optional'].forEach(function(name){
+		$.expr[":"][name] = $.expr.filters[name+"-element"];
+	});
+	
+	
+	$.expr[":"].focus = function( elem ) {
+		try {
+			var doc = elem.ownerDocument;
+			return elem === doc.activeElement && (!doc.hasFocus || doc.hasFocus());
+		} catch(e){}
+		return false;
+	};
+	
+	webshims.triggerInlineForm = function(elem, event){
+		$(elem).trigger(event);
+	};
+	
+	var lazyLoadProxy = function(obj, fn, args){
+		lazyLoad();
+		webshims.ready('form-validation', function(){
+			obj[fn].apply(obj, args);
+		});
+	};
+	
+	
+	webshims.wsPopover = {
+		id: 0,
+		_create: function(){
+			this.options = $.extend({}, webshims.cfg.wspopover, this.options);
+			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.contentElement = $('.ws-po-box', this.element);
+			this.lastElement = $([]);
+			this.bindElement();
 			
-			if(timer){
-				clearTimeout(timer);
-			}
-			if(e.type == 'refreshvalidityui'){
-				switchClass();
-			} else {
-				$.data(elem, 'webshimsswitchvalidityclass', setTimeout(switchClass, 9));
-			}
-		};
-		
-		$(document).on(options.validityUIEvents || 'focusout change refreshvalidityui', switchValidityClass);
-		customEvents.changedvaliditystate = true;
-		customEvents.refreshCustomValidityRules = true;
-		customEvents.changedvalid = true;
-		customEvents.changedinvalid = true;
-		customEvents.refreshvalidityui = true;
-		
-		
-		webshims.triggerInlineForm = function(elem, event){
-			$(elem).trigger(event);
-		};
-		
-		webshims.modules["form-core"].getGroupElements = getGroupElements;
-		
-		
-		var setRoot = function(){
-			webshims.scrollRoot = (isWebkit || document.compatMode == 'BackCompat') ?
-				$(document.body) : 
-				$(document.documentElement)
-			;
-		};
-		var minWidth = (Modernizr.boxSizing || Modernizr['display-table'] || $.support.getSetAttribute) ?
-			'minWidth' :
-			'width'
-		;
-		setRoot();
-		webshims.ready('DOM', setRoot);
-		
-		webshims.getRelOffset = function(posElem, relElem){
-			posElem = $(posElem);
-			var offset = $(relElem).offset();
-			var bodyOffset;
-			$.swap($(posElem)[0], {visibility: 'hidden', display: 'inline-block', left: 0, top: 0}, function(){
-				bodyOffset = posElem.offset();
+			this.element.data('wspopover', this);
+			
+		},
+		options: {},
+		content: function(html){
+			this.contentElement.html(html);
+		},
+		bindElement: function(){
+			var that = this;
+			var stopBlur = function(){
+				that.stopBlur = false;
+			};
+			this.preventBlur = function(e){
+				that.stopBlur = true;
+				clearTimeout(that.timers.stopBlur);
+				that.timers.stopBlur = setTimeout(stopBlur, 9);
+			};
+			this.element.on({
+				'mousedown': this.preventBlur
 			});
-			offset.top -= bodyOffset.top;
-			offset.left -= bodyOffset.left;
-			return offset;
-		};
+		},
+		show: function(){
+			lazyLoadProxy(this, 'show', arguments);
+		}
+	};
+	
+	/* some extra validation UI */
+	webshims.validityAlert = {
+		showFor: function(){
+			lazyLoadProxy(this, 'showFor', arguments);
+		}
+	};
+	
+	
+	/* extension, but also used to fix native implementation workaround/bugfixes */
+	(function(){
+		var firstEvent,
+			invalids = [],
+			stopSubmitTimer,
+			form
+		;
 		
-		webshims.wsPopover = {
-			_create: function(){
-				this.options =  $.extend({}, webshims.cfg.wspopover, this.options);
-				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.contentElement = $('.ws-po-box', this.element);
-				this.lastElement = $([]);
-				this.bindElement();
-				
-				this.element.data('wspopover', this);
-				
-			},
-			options: {},
-			content: function(html){
-				this.contentElement.html(html);
-			},
-			bindElement: function(){
-				var that = this;
-				var stopBlur = function(){
-					that.stopBlur = false;
-				};
-				this.preventBlur = function(e){
-					that.stopBlur = true;
-					clearTimeout(that.timers.stopBlur);
-					that.timers.stopBlur = setTimeout(stopBlur, 9);
-				};
-				this.element.on({
-					'mousedown': this.preventBlur
-				});
-			},
+		$(document).on('invalid', function(e){
+			if(e.wrongWebkitInvalid){return;}
+			var jElm = $(e.target);
 			
-			isInElement: function(container, contained){
-				return container == contained || $.contains(container, contained);
-			},
-			show: function(element){
-				var e = $.Event('wspopoverbeforeshow');
-				this.element.trigger(e);
-				if(e.isDefaultPrevented() || this.isVisible){return;}
-				this.isVisible = true;
-				element = $(element || this.options.prepareFor).getNativeElement() ;
-				
-				var that = this;
-				var visual = $(element).getShadowElement();
+			
+			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;
+		});
+	})();
 	
-				this.clear();
-				this.element.removeClass('ws-po-visible').css('display', 'none');
-				
-				this.prepareFor(element, visual);
-				
-				this.position(visual);
-				that.timers.show = setTimeout(function(){
-					that.element.css('display', '');
-					that.timers.show = setTimeout(function(){
-						that.element.addClass('ws-po-visible').trigger('wspopovershow');
-					}, 9);
-				}, 9);
-				$(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);
-					}, 900);
-				});
-			},
-			prepareFor: function(element, visual){
-				var onBlur;
-				var opts = $.extend({}, this.options, $(element.prop('form') || []).data('wspopover') || {}, element.data('wspopover'));
-				var that = this;
-				var css = {};
-				this.lastElement = $(element).getShadowFocusElement();
-				if(opts.appendTo == 'element'){
-					this.element.insertAfter(element);
-				} else {
-					this.element.appendTo(opts.appendTo);
-				}
-				
-				this.element.attr({
-					'data-class': element.prop('className'),
-					'data-id': element.prop('id')
-				});
-				
-				css[minWidth] = opts.constrainWidth ? visual.outerWidth() : '';
-				
-				this.element.css(css);
-				
-				if(opts.hideOnBlur){
-					onBlur = function(e){
-						if(that.stopBlur){
-							e.stopImmediatePropagation();
-						} else {
-							that.hide();
-						}
-					};
-					
-					that.timers.bindBlur = setTimeout(function(){
-						that.lastElement.off(that.eventns).on('focusout'+that.eventns + ' blur'+that.eventns, onBlur);
-						that.lastElement.getNativeElement().off(that.eventns);
-					}, 10);
-					
-					
-				}
-				
-				if(!this.prepared){
-					
-					if($.fn.bgIframe){
-						this.element.bgIframe();
+	
+	webshims.getContentValidationMessage = function(elem, validity, key){
+		var message = $(elem).data('errormessage') || elem.getAttribute('x-moz-errormessage') || '';
+		if(key && message[key]){
+			message = message[key];
+		}
+		if(typeof message == 'object'){
+			validity = validity || $.prop(elem, 'validity') || {valid: 1};
+			if(!validity.valid){
+				$.each(validity, function(name, prop){
+					if(prop && name != 'valid' && message[name]){
+						message = message[name];
+						return false;
 					}
-				}
-				this.prepared = true;
-			},
-			clear: function(){
-				$(window).off(this.eventns);
-				$(document).off(this.eventns);
-				
-				this.stopBlur = false;
-				$.each(this.timers, function(timerName, val){
-					clearTimeout(val);
 				});
-			},
-			hide: function(){
-				var e = $.Event('wspopoverbeforehide');
-				this.element.trigger(e);
-				if(e.isDefaultPrevented() || !this.isVisible){return;}
-				this.isVisible = false;
-				var that = this;
-				var forceHide = function(){
-					that.element.css('display', 'none').attr({'data-id': '', 'data-class': '', 'hidden': 'hidden'});
-					clearTimeout(that.timers.forcehide);
-				};
-				this.clear();
-				this.element.removeClass('ws-po-visible').trigger('wspopoverhide');
-				$(window).on('resize'+this.eventns, forceHide);
-				that.timers.forcehide = setTimeout(forceHide, 999);
-			},
-			position: function(element){
-				var offset = webshims.getRelOffset(this.element.css({marginTop: 0, marginLeft: 0, marginRight: 0, marginBottom: 0}).removeAttr('hidden'), element);
-				offset.top += element.outerHeight();
-				this.element.css({marginTop: '', marginLeft: '', marginRight: '', marginBottom: ''}).css(offset);
 			}
-		};
-		
-		webshims.wsPopover.id = 0;
-		
-		/* some extra validation UI */
-		webshims.validityAlert = (function(){
-			
-			
-			var focusTimer = false;
-			
-			var api = webshims.objectCreate(webshims.wsPopover, {}, options.messagePopover);
-			var boundHide = api.hide.bind(api);
-			
-			api.element.addClass('validity-alert').attr({role: 'alert'});
-			$.extend(api, {
-				hideDelay: 5000,
-				showFor: function(elem, message, noFocusElem, noBubble){
-					
-					elem = $(elem).getNativeElement();
-					this.clear();
-					this.hide();
-					if(!noBubble){
-						this.getMessage(elem, message);
-						
-						this.show(elem);
-						if(this.hideDelay){
-							this.timers.delayedHide = setTimeout(boundHide, this.hideDelay);
-						}
-						
-					}
-					
-					if(!noFocusElem){
-						this.setFocus(elem);
-					}
-				},
-				setFocus: function(element){
-					var focusElem = $(element).getShadowFocusElement();
-					var scrollTop = webshims.scrollRoot.scrollTop();
-					var elemTop = focusElem.offset().top - 30;
-					var smooth;
-					
-					if(scrollTop > elemTop){
-						webshims.scrollRoot.animate(
-							{scrollTop: elemTop - 5}, 
-							{
-								queue: false, 
-								duration: Math.max( Math.min( 600, (scrollTop - elemTop) * 1.5 ), 80 )
-							}
-						);
-						smooth = true;
-					}
-					try {
-						focusElem[0].focus();
-					} catch(e){}
-					if(smooth){
-						webshims.scrollRoot.scrollTop(scrollTop);
-						setTimeout(function(){
-							webshims.scrollRoot.scrollTop(scrollTop);
-						}, 0);
-					}
-					
-					$(window).triggerHandler('pospopover'+this.eventns);
-				},
-				getMessage: function(elem, message){
-					if (!message) {
-						message = getContentValidationMessage(elem[0]) || elem.prop('customValidationMessage') || elem.prop('validationMessage');
-					}
-					if (message) {
-						api.contentElement.text(message);
-					} else {
-						this.hide();
-					}
-				}
-			});
-			
-			
-			return api;
-		})();
-		
+		}
 		
-		/* 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);
-				var shadowElem = jElm.getShadowElement();
-				if(!shadowElem.hasClass(invalidClass)){
-					shadowElem.addClass(invalidClass).removeClass(validClass);
-					setTimeout(function(){
-						$(e.target).trigger('changedinvalid').trigger('changedvaliditystate');
-					}, 0);
-				}
-				
-				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(typeof message == 'object'){
+			message = message.defaultMessage;
+		}
+		return message || '';
+	};
 	
-				//if firstinvalid was prevented all invalids will be also prevented
-				if( firstEvent && firstEvent.isDefaultPrevented() ){
+	$.fn.getErrorMessage = function(key){
+		var message = '';
+		var elem = this[0];
+		if(elem){
+			message = webshims.getContentValidationMessage(elem, false, key) || $.prop(elem, 'customValidationMessage') || $.prop(elem, 'validationMessage');
+		}
+		return message;
+	};
+	
+	
+	webshims.ready('forms', function(){
+		$(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){
+				if(!e.isInvalidUIPrevented()){
 					e.preventDefault();
+					webshims.validityAlert.showFor( e.target ); 
 				}
-				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;
-				shadowElem = null;
-			});
-		})();
-		
-		$.fn.getErrorMessage = function(){
-			var message = '';
-			var elem = this[0];
-			if(elem){
-				message = getContentValidationMessage(elem) || $.prop(elem, 'customValidationMessage') || $.prop(elem, 'validationMessage');
-			}
-			return message;
-		};
-		
-		if(options.replaceValidationUI){
-			if(options.overrideMessages && (options.customMessages || options.customMessages == null)){
-				options.customMessages = true;
-				options.overrideMessages = false;
-				webshims.info("set overrideMessages to false. Use customMessages instead");
-			}
-			webshims.ready('DOM forms', function(){
-				$(document).on('firstinvalid', function(e){
-					if(!e.isInvalidUIPrevented()){
-						e.preventDefault();
-						$.webshims.validityAlert.showFor( e.target ); 
-					}
-				});
 			});
-		}
-	});
+		});
+	}
+});
+
 
-})(jQuery);
-jQuery.webshims.register('form-message', function($, webshims, window, document, undefined, options){
+webshims.register('form-message', function($, webshims, window, document, undefined, options){
 	"use strict";
+	if(options.overrideMessages){
+		options.customMessages = true;
+		webshims.error('overrideMessages is deprecated. use customMessages instead.');
+	}
 	var validityMessages = webshims.validityMessages;
 	
-	var implementProperties = (options.overrideMessages || options.customMessages) ? ['customValidationMessage'] : [];
+	var implementProperties = options.customMessages ? ['customValidationMessage'] : [];
 	
 	validityMessages.en = $.extend(true, {
 		typeMismatch: {
@@ -2296,17 +1909,17 @@ jQuery.webshims.register('form-message', function($, webshims, window, document,
 	
 	if(typeof validityMessages['en'].valueMissing == 'object'){
 		['select', 'radio'].forEach(function(type){
-			validityMessages.en.valueMissing[type] = 'Please select an option.';
+			validityMessages.en.valueMissing[type] = validityMessages.en.valueMissing[type] || 'Please select an option.';
 		});
 	}
 	if(typeof validityMessages.en.rangeUnderflow == 'object'){
 		['date', 'time', 'datetime-local', 'month'].forEach(function(type){
-			validityMessages.en.rangeUnderflow[type] = 'Value must be at or after {%min}.';
+			validityMessages.en.rangeUnderflow[type] = validityMessages.en.rangeUnderflow[type] || 'Value must be at or after {%min}.';
 		});
 	}
 	if(typeof validityMessages.en.rangeOverflow == 'object'){
 		['date', 'time', 'datetime-local', 'month'].forEach(function(type){
-			validityMessages.en.rangeOverflow[type] = 'Value must be at or before {%max}.';
+			validityMessages.en.rangeOverflow[type] = validityMessages.en.rangeOverflow[type] || 'Value must be at or before {%max}.';
 		});
 	}
 	
@@ -2342,17 +1955,17 @@ jQuery.webshims.register('form-message', function($, webshims, window, document,
 	
 	if(typeof validityMessages.de.valueMissing == 'object'){
 		['select', 'radio'].forEach(function(type){
-			validityMessages.de.valueMissing[type] = 'Bitte wählen Sie eine Option aus.';
+			validityMessages.de.valueMissing[type] = validityMessages.de.valueMissing[type] || 'Bitte wählen Sie eine Option aus.';
 		});
 	}
 	if(typeof validityMessages.de.rangeUnderflow == 'object'){
 		['date', 'time', 'datetime-local', 'month'].forEach(function(type){
-			validityMessages.de.rangeUnderflow[type] = '{%value} ist zu früh. {%min} ist die früheste Zeit, die Sie benutzen können.';
+			validityMessages.de.rangeUnderflow[type] = validityMessages.de.rangeUnderflow[type] || '{%value} ist zu früh. {%min} ist die früheste Zeit, die Sie benutzen können.';
 		});
 	}
 	if(typeof validityMessages.de.rangeOverflow == 'object'){
 		['date', 'time', 'datetime-local', 'month'].forEach(function(type){
-			validityMessages.de.rangeOverflow[type] = '{%value} ist zu spät. {%max} ist die späteste Zeit, die Sie benutzen können.';
+			validityMessages.de.rangeOverflow[type] = validityMessages.de.rangeOverflow[type] || '{%value} ist zu spät. {%max} ist die späteste Zeit, die Sie benutzen können.';
 		});
 	}
 	
@@ -2370,12 +1983,12 @@ jQuery.webshims.register('form-message', function($, webshims, window, document,
 	};
 	
 	webshims.createValidationMessage = function(elem, name){
-		var spinner;
+		var widget;
 		var message = getMessageFromObj(currentValidationMessage[name], elem);
-		
+		var type = $.prop(elem, 'type');
 		if(!message){
-			message = getMessageFromObj(validityMessages[''][name], elem) || 'invalid value';
-			webshims.info('could not find errormessage for: '+ name +' / '+ $.prop(elem, 'type') +'. in language: '+$.webshims.activeLang());
+			message = getMessageFromObj(validityMessages[''][name], elem) || $.prop(elem, 'validationMessage');
+			webshims.info('could not find errormessage for: '+ name +' / '+ type +'. in language: '+$.webshims.activeLang());
 		}
 		if(message){
 			['value', 'min', 'max', 'title', 'maxlength', 'label'].forEach(function(attr){
@@ -2385,11 +1998,11 @@ jQuery.webshims.register('form-message', function($, webshims, window, document,
 					webshims.error('no title for patternMismatch provided. Always add a title attribute.');
 				}
 				if(valueVals[attr]){
-					if(!spinner){
-						spinner = $(elem).getShadowElement().data('wsspinner');
+					if(!widget){
+						widget = $(elem).getShadowElement().data('wsWidget'+type);
 					}
-					if(spinner && spinner.formatValue){
-						val = spinner.formatValue(val, false);
+					if(widget && widget.formatValue){
+						val = widget.formatValue(val, false);
 					}
 				}
 				message = message.replace('{%'+ attr +'}', val);
@@ -2404,7 +2017,7 @@ jQuery.webshims.register('form-message', function($, webshims, window, document,
 	};
 	
 	
-	if(webshims.bugs.validationMessage || !Modernizr.formvalidation || webshims.bugs.bustedValidity){
+	if(!Modernizr.formvalidation || webshims.bugs.bustedValidity){
 		implementProperties.push('validationMessage');
 	}
 	
@@ -2467,7 +2080,7 @@ jQuery.webshims.register('form-message', function($, webshims, window, document,
 	var hasNative = Modernizr.audio && Modernizr.video;
 	var supportsLoop = false;
 	var bugs = webshims.bugs;
-	
+	var swfType = 'mediaelement-jaris';
 	var loadSwf = function(){
 		webshims.ready(swfType, function(){
 			if(!webshims.mediaelement.createSWF){
@@ -2477,7 +2090,7 @@ jQuery.webshims.register('form-message', function($, webshims, window, document,
 		});
 	};
 	var options = webshims.cfg.mediaelement;
-	var swfType = 'mediaelement-jaris';
+	var hasFullTrackSupport;
 	var hasSwf;
 	if(!options){
 		webshims.error("mediaelement wasn't implemented but loaded");
@@ -2490,14 +2103,11 @@ jQuery.webshims.register('form-message', function($, webshims, window, document,
 		
 		webshims.capturingEvents(['play', 'playing', 'waiting', 'paused', 'ended', 'durationchange', 'loadedmetadata', 'canplay', 'volumechange']);
 		
-		if(!Modernizr.videoBuffered){
+		if(!Modernizr.videoBuffered ){
 			webshims.addPolyfill('mediaelement-native-fix', {
-				f: 'mediaelement',
-				test: Modernizr.videoBuffered,
 				d: ['dom-support']
 			});
-			
-			webshims.reTest('mediaelement-native-fix');
+			webshims.loader.loadList(['mediaelement-native-fix']);
 		}
 	}
 	
@@ -2508,9 +2118,9 @@ jQuery.webshims.register('form-message', function($, webshims, window, document,
 		};
 		var switchOptions = function(e){
 			var media;
-			var parent = e.target.parentNode;
+			var parent;
 			if(!options.preferFlash && 
-				($(e.target).is('audio, video') || (parent && $('source:last', parent)[0] == e.target)) && 
+				($(e.target).is('audio, video') || ((parent = e.target.parentNode) && $('source:last', parent)[0] == e.target)) && 
 				(media = $(e.target).closest('audio, video')) && !noSwitch[media.prop('error')]
 				){
 				$(function(){
@@ -2524,7 +2134,7 @@ jQuery.webshims.register('form-message', function($, webshims, window, document,
 									$('audio, video').each(function(){
 										webshims.mediaelement.selectSource(this);
 									});
-									webshims.info("switching mediaelements option to 'preferFlash', due to an error with native player: "+e.target.src+" Mediaerror: "+ media.prop('error'));
+									webshims.error("switching mediaelements option to 'preferFlash', due to an error with native player: "+e.target.src+" Mediaerror: "+ media.prop('error'));
 								}
 							}, 9);
 						});
@@ -2559,43 +2169,9 @@ jQuery.webshims.register('form-message', function($, webshims, window, document,
 					bugs.track = true;
 				}
 			}
-			
-			var trackOptions = webshims.cfg.track;
-			var trackListener = function(e){
-				$(e.target).filter('track').each(changeApi);
-			};
-			var changeApi = function(){
-				if(bugs.track || (!trackOptions.override && $.prop(this, 'readyState') == 3)){
-					trackOptions.override = true;
-					webshims.reTest('track');
-					document.removeEventListener('error', trackListener, true);
-					if(this && $.nodeName(this, 'track')){
-						webshims.error("track support was overwritten. Please check your vtt including your vtt mime-type");
-					} else {
-						webshims.info("track support was overwritten. due to bad browser support");
-					}
-					return false;
-				}
-			};
-			var detectTrackError = function(){
-				document.addEventListener('error', trackListener, true);
-				
-				if(bugs.track){
-					changeApi();
-				} else {
-					$('track').each(changeApi);
-				}
-			};
-			if(!trackOptions.override){
-				if(webshims.isReady('track')){
-					detectTrackError();
-				} else {
-					$(detectTrackError);
-				}
-			}
 		})();
-		
 	}
+	hasFullTrackSupport = Modernizr.track && !bugs.track;
 
 webshims.register('mediaelement-core', function($, webshims, window, document, undefined){
 	hasSwf = swfmini.hasFlashPlayerVersion('9.0.115');
@@ -2680,7 +2256,8 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 	var loadTrackUi = function(){
 		if(loadTrackUi.loaded){return;}
 		loadTrackUi.loaded = true;
-		$(function(){
+		webshims.ready('WINDOWLOAD', function(){
+			loadThird();
 			webshims.loader.loadList(['track-ui']);
 		});
 	};
@@ -2853,27 +2430,40 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 		}
 		return ret;
 	};
-	
+	var emptyType = (/^\s*application\/octet\-stream\s*$/i);
+	var getRemoveEmptyType = function(){
+		var ret = emptyType.test($.attr(this, 'type') || '');
+		if(ret){
+			$(this).removeAttr('type');
+		}
+		return ret;
+	};
 	mediaelement.setError = function(elem, message){
-		if(!message){
-			message = "can't play sources";
+		if($('source', elem).filter(getRemoveEmptyType).length){
+			webshims.error('"application/octet-stream" is a useless mimetype for audio/video. Please change this attribute.');
+			try {
+				$(elem).mediaLoad();
+			} catch(er){}
+		} else {
+			if(!message){
+				message = "can't play sources";
+			}
+			$(elem).pause().data('mediaerror', message);
+			webshims.error('mediaelementError: '+ message);
+			setTimeout(function(){
+				if($(elem).data('mediaerror')){
+					$(elem).trigger('mediaerror');
+				}
+			}, 1);
 		}
 		
-		$(elem).pause().data('mediaerror', message);
-		webshims.error('mediaelementError: '+ message);
-		setTimeout(function(){
-			if($(elem).data('mediaerror')){
-				$(elem).trigger('mediaerror');
-			}
-		}, 1);
+		
 	};
 	
 	var handleThird = (function(){
 		var requested;
 		return function( mediaElem, ret, data ){
-			if(!requested){
-				loadTrackUi();
-			}
+			
 			webshims.ready(hasSwf ? swfType : 'mediaelement-yt', function(){
 				if(mediaelement.createSWF){
 					mediaelement.createSWF( mediaElem, ret, data );
@@ -3018,6 +2608,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 						var buffered = getBufferedString();
 						if(buffered != lastBuffered){
 							lastBuffered = buffered;
+							webshims.info('needed to trigger progress manually');
 							$(elem).triggerHandler('progress');
 						}
 					};
@@ -3069,11 +2660,14 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 					$('video, audio', context)
 						.add(insertedElement.filter('video, audio'))
 						.each(function(){
-							if(!mediaelement.canNativePlaySrces(this) || (!loadTrackUi.loaded && $('track', this).length)){
+							if(!mediaelement.canNativePlaySrces(this)){
 								loadThird();
 								handleMedia = true;
 								return false;
 							}
+							if((!hasFullTrackSupport || webshims.modules.track.options.override) && !loadTrackUi.loaded && $('track', this).length){
+								loadTrackUi();
+							}
 						})
 					;
 				}
@@ -3081,7 +2675,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 		}
 	};
 	
-	if(Modernizr.track && !bugs.track){
+	if(hasFullTrackSupport){
 		webshims.defineProperty(TextTrack.prototype, 'shimActiveCues', {
 			get: function(){
 				return this._shimActiveCues || this.activeCues;
@@ -3096,6 +2690,6 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 	} else {
 		webshims.ready(swfType, initMediaElements);
 	}
-	webshims.ready('WINDOWLOAD mediaelement', loadTrackUi);
+	webshims.ready('track', loadTrackUi);
 });
-})(jQuery, Modernizr, jQuery.webshims);
+})(jQuery, Modernizr, webshims);