webshims-rails 1.10.10 → 1.10.11

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

@@ -804,8 +804,9 @@ if((!advancedObjectProperties || !Object.create || !Object.defineProperties || !
 //DOM-Extension helper
 webshims.register('dom-extend', function($, webshims, window, document, undefined){
 	"use strict";
-	
-	webshims.assumeARIA = $.support.getSetAttribute || Modernizr.canvas || Modernizr.video || Modernizr.boxsizing;
+	var supportHrefNormalized = !('hrefNormalized' in $.support) || $.support.hrefNormalized;
+	var supportGetSetAttribute = !('getSetAttribute' in $.support) || $.support.getSetAttribute;
+	webshims.assumeARIA = supportGetSetAttribute || 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");
@@ -815,8 +816,8 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		webshims.error("Webshims needs jQuery 1.8+ to work properly. Please update your jQuery version or downgrade webshims.");
 	}
 	
-	if(webshims.cfg.extendNative === 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.extendNative === undefined){
+		webshims.warn("extendNative configuration was set to false by default with this release. In case you rely on it set it to 'true' otherwise to 'false'. See http://bit.ly/16OOTQO");
 	}
 	
 	if (!webshims.cfg.no$Switch) {
@@ -1488,7 +1489,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 							
 							anchor.setAttribute('href', href+'' );
 							
-							if(!$.support.hrefNormalized){
+							if(!supportHrefNormalized){
 								try {
 									$(anchor).insertAfter(this);
 									ret = anchor.getAttribute('href', 4);
@@ -1909,7 +1910,8 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			}
 		});
 	};
-	var options = webshims.cfg.mediaelement;
+	var wsCfg = webshims.cfg;
+	var options = wsCfg.mediaelement;
 	var hasFullTrackSupport;
 	var hasSwf;
 	if(!options){
@@ -1996,7 +1998,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	}
 	hasFullTrackSupport = Modernizr.track && !bugs.track;
 
-webshims.register('mediaelement-core', function($, webshims, window, document, undefined){
+webshims.register('mediaelement-core', function($, webshims, window, document, undefined, options){
 	hasSwf = swfmini.hasFlashPlayerVersion('9.0.115');
 	$('html').addClass(hasSwf ? 'swf' : 'no-swf');
 	var mediaelement = webshims.mediaelement;
@@ -2080,11 +2082,21 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 	var loadTrackUi = function(){
 		if(loadTrackUi.loaded){return;}
 		loadTrackUi.loaded = true;
-		webshims.ready('WINDOWLOAD', function(){
-			loadThird();
-			webshims.loader.loadList(['track-ui']);
-		});
+		if(!options.noAutoTrack){
+			webshims.ready('WINDOWLOAD', function(){
+				loadThird();
+				webshims.loader.loadList(['track-ui']);
+			});
+		}
 	};
+//	var loadMediaGroup = function(){
+//		if(!loadMediaGroup.loaded){
+//			loadMediaGroup.loaded = true;
+//			webshims.ready(window.MediaController ? 'WINDOWLOAD' : 'DOM', function(){
+//				webshims.loader.loadList(['mediagroup']);
+//			});
+//		}
+//	};
 	var loadYt = (function(){
 		var loaded;
 		return function(){
@@ -2109,6 +2121,11 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 		d: ['dom-support']
 	});
 	
+	
+//	webshims.addModule('mediagroup', {
+//		d: ['mediaelement', 'dom-support']
+//	});
+	
 	mediaelement.mimeTypes = {
 		audio: {
 				//ogm shouldn´t be used!
@@ -2407,8 +2424,6 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 			
 		};
 		
-		
-		
 		webshims.ready('dom-support', function(){
 			handleMedia = true;
 			
@@ -2417,7 +2432,8 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 			}
 			
 			['audio', 'video'].forEach(function(nodeName){
-				var supLoad = webshims.defineNodeNameProperty(nodeName, 'load',  {
+				var supLoad, supController;
+				supLoad = webshims.defineNodeNameProperty(nodeName, 'load',  {
 					prop: {
 						value: function(){
 							var data = webshims.data(this, 'mediaelement');
@@ -2448,7 +2464,59 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 						}
 					}
 				});
+				
+//				supController = webshims.defineNodeNameProperty(nodeName, 'controller',  {
+//					prop: {
+//						get: function(type){
+//							if(!loadMediaGroup.loaded){
+//								loadMediaGroup();
+//							}
+//							if(mediaelement.controller){
+//								return mediaelement.controller[nodeName].get.apply(this, arguments);
+//							}
+//							return supController.prop._supget && supController.prop._supget.apply(this, arguments);
+//						},
+//						set: function(){
+//							var that = this;
+//							var args = arguments;
+//							if(!loadMediaGroup.loaded){
+//								loadMediaGroup();
+//							}
+//							if(mediaelement.controller){
+//								return mediaelement.controller[nodeName].set.apply(that, args);
+//							} else {
+//								webshims.ready('mediagroup', function(){
+//									mediaelement.controller[nodeName].set.apply(that, args);
+//								});
+//							}
+//							return supController.prop._supset && supController.prop._supset.apply(this, arguments);
+//						}
+//					}
+//				});
+				
+//				webshims.ready('mediagroup', function(){
+//					mediaelement.controller[nodeName].sup = supController;
+//				});
 			});
+			
+//			webshims.onNodeNamesPropertyModify(['audio', 'video'], ['mediaGroup'], {
+//				set: function(){
+//					var that = this;
+//					var args = arguments;
+//					if(!loadMediaGroup.loaded){
+//						loadMediaGroup();
+//					}
+//					if(mediaelement.mediagroup){
+//						mediaelement.mediagroup.set.apply(that, args);
+//					} else {
+//						webshims.ready('mediagroup', function(){
+//							mediaelement.mediagroup.set.apply(that, args);
+//						});
+//					}
+//				},
+//				initAttr: true
+//			});
+			
 			webshims.onNodeNamesPropertyModify(['audio', 'video'], ['src', 'poster'], {
 				set: function(){
 					var elem = this;
@@ -2470,6 +2538,9 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 				if(!loadTrackUi.loaded && $('track', media).length){
 					loadTrackUi();
 				}
+//				if(!loadMediaGroup.loaded && this.getAttribute('mediagroup')){
+//					loadMediaGroup();
+//				}
 				media = null;
 			});
 		});
@@ -2485,9 +2556,6 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 								handleMedia = true;
 								return false;
 							}
-							if((!hasFullTrackSupport || webshims.modules.track.options.override) && !loadTrackUi.loaded && $('track', this).length){
-								loadTrackUi();
-							}
 						})
 					;
 				}

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

@@ -46,19 +46,19 @@
 					getGoogleCoords = function(){
 						if(pos || !window.google || !google.loader || !google.loader.ClientLocation){return false;}
 						var cl = google.loader.ClientLocation;
-			            pos = {
+						pos = {
 							coords: {
 								latitude: cl.latitude,
-				                longitude: cl.longitude,
-				                altitude: null,
-				                accuracy: 43000,
-				                altitudeAccuracy: null,
-				                heading: parseInt('NaN', 10),
-				                velocity: null
+							longitude: cl.longitude,
+								altitude: null,
+								accuracy: 43000,
+								altitudeAccuracy: null,
+								heading: parseInt('NaN', 10),
+								velocity: null
 							},
-			                //extension similiar to FF implementation
+							//extension similiar to FF implementation
 							address: $.extend({streetNumber: '', street: '', premises: '', county: '', postalCode: ''}, cl.address)
-			            };
+						};
 						return true;
 					},
 					getInitCoords = function(){
@@ -95,14 +95,14 @@
 							pos = pos || {
 								coords: {
 									latitude: data.latitude,
-					                longitude: data.longitude,
-					                altitude: null,
-					                accuracy: 43000,
-					                altitudeAccuracy: null,
-					                heading: parseInt('NaN', 10),
-					                velocity: null
+									longitude: data.longitude,
+									altitude: null,
+									accuracy: 43000,
+									altitudeAccuracy: null,
+									heading: parseInt('NaN', 10),
+									velocity: null
 								},
-				                //extension similiar to FF implementation
+								//extension similiar to FF implementation
 								address: {
 									city: data.city,
 									country: data.country_name,
@@ -114,7 +114,7 @@
 									street: "",
 									streetNumber: ""
 								}
-				            };
+							};
 							endCallback();
 						},
 						error: function(){

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

@@ -165,52 +165,6 @@ var swfmini = function() {
 	}
 	
 	
-	/* Functions to abstract and display alternative content
-	*/
-	function displayAltContent(obj) {
-		if (ua.ie && ua.win && obj.readyState != 4) {
-			// IE only: when a SWF is loading (AND: not available in cache) wait for the readyState of the object element to become 4 before removing it,
-			// because you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work
-			var el = createElement("div");
-			obj.parentNode.insertBefore(el, obj); // insert placeholder div that will be replaced by the alternative content
-			el.parentNode.replaceChild(abstractAltContent(obj), el);
-			obj.style.display = "none";
-			(function(){
-				if (obj.readyState == 4) {
-					obj.parentNode.removeChild(obj);
-				}
-				else {
-					setTimeout(arguments.callee, 10);
-				}
-			})();
-		}
-		else {
-			obj.parentNode.replaceChild(abstractAltContent(obj), obj);
-		}
-	} 
-
-	function abstractAltContent(obj) {
-		var ac = createElement("div");
-		if (ua.win && ua.ie) {
-			ac.innerHTML = obj.innerHTML;
-		}
-		else {
-			var nestedObj = obj.getElementsByTagName(OBJECT)[0];
-			if (nestedObj) {
-				var c = nestedObj.childNodes;
-				if (c) {
-					var cl = c.length;
-					for (var i = 0; i < cl; i++) {
-						if (!(c[i].nodeType == 1 && c[i].nodeName == "PARAM") && !(c[i].nodeType == 8)) {
-							ac.appendChild(c[i].cloneNode(true));
-						}
-					}
-				}
-			}
-		}
-		return ac;
-	}
-	
 	/* Cross-browser dynamic SWF creation
 	*/
 	function createSWF(attObj, parObj, id) {
@@ -511,7 +465,8 @@ var swfmini = function() {
 			}
 		});
 	};
-	var options = webshims.cfg.mediaelement;
+	var wsCfg = webshims.cfg;
+	var options = wsCfg.mediaelement;
 	var hasFullTrackSupport;
 	var hasSwf;
 	if(!options){
@@ -598,7 +553,7 @@ var swfmini = function() {
 	}
 	hasFullTrackSupport = Modernizr.track && !bugs.track;
 
-webshims.register('mediaelement-core', function($, webshims, window, document, undefined){
+webshims.register('mediaelement-core', function($, webshims, window, document, undefined, options){
 	hasSwf = swfmini.hasFlashPlayerVersion('9.0.115');
 	$('html').addClass(hasSwf ? 'swf' : 'no-swf');
 	var mediaelement = webshims.mediaelement;
@@ -682,11 +637,21 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 	var loadTrackUi = function(){
 		if(loadTrackUi.loaded){return;}
 		loadTrackUi.loaded = true;
-		webshims.ready('WINDOWLOAD', function(){
-			loadThird();
-			webshims.loader.loadList(['track-ui']);
-		});
+		if(!options.noAutoTrack){
+			webshims.ready('WINDOWLOAD', function(){
+				loadThird();
+				webshims.loader.loadList(['track-ui']);
+			});
+		}
 	};
+//	var loadMediaGroup = function(){
+//		if(!loadMediaGroup.loaded){
+//			loadMediaGroup.loaded = true;
+//			webshims.ready(window.MediaController ? 'WINDOWLOAD' : 'DOM', function(){
+//				webshims.loader.loadList(['mediagroup']);
+//			});
+//		}
+//	};
 	var loadYt = (function(){
 		var loaded;
 		return function(){
@@ -711,6 +676,11 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 		d: ['dom-support']
 	});
 	
+	
+//	webshims.addModule('mediagroup', {
+//		d: ['mediaelement', 'dom-support']
+//	});
+	
 	mediaelement.mimeTypes = {
 		audio: {
 				//ogm shouldn´t be used!
@@ -1009,8 +979,6 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 			
 		};
 		
-		
-		
 		webshims.ready('dom-support', function(){
 			handleMedia = true;
 			
@@ -1019,7 +987,8 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 			}
 			
 			['audio', 'video'].forEach(function(nodeName){
-				var supLoad = webshims.defineNodeNameProperty(nodeName, 'load',  {
+				var supLoad, supController;
+				supLoad = webshims.defineNodeNameProperty(nodeName, 'load',  {
 					prop: {
 						value: function(){
 							var data = webshims.data(this, 'mediaelement');
@@ -1050,7 +1019,59 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 						}
 					}
 				});
+				
+//				supController = webshims.defineNodeNameProperty(nodeName, 'controller',  {
+//					prop: {
+//						get: function(type){
+//							if(!loadMediaGroup.loaded){
+//								loadMediaGroup();
+//							}
+//							if(mediaelement.controller){
+//								return mediaelement.controller[nodeName].get.apply(this, arguments);
+//							}
+//							return supController.prop._supget && supController.prop._supget.apply(this, arguments);
+//						},
+//						set: function(){
+//							var that = this;
+//							var args = arguments;
+//							if(!loadMediaGroup.loaded){
+//								loadMediaGroup();
+//							}
+//							if(mediaelement.controller){
+//								return mediaelement.controller[nodeName].set.apply(that, args);
+//							} else {
+//								webshims.ready('mediagroup', function(){
+//									mediaelement.controller[nodeName].set.apply(that, args);
+//								});
+//							}
+//							return supController.prop._supset && supController.prop._supset.apply(this, arguments);
+//						}
+//					}
+//				});
+				
+//				webshims.ready('mediagroup', function(){
+//					mediaelement.controller[nodeName].sup = supController;
+//				});
 			});
+			
+//			webshims.onNodeNamesPropertyModify(['audio', 'video'], ['mediaGroup'], {
+//				set: function(){
+//					var that = this;
+//					var args = arguments;
+//					if(!loadMediaGroup.loaded){
+//						loadMediaGroup();
+//					}
+//					if(mediaelement.mediagroup){
+//						mediaelement.mediagroup.set.apply(that, args);
+//					} else {
+//						webshims.ready('mediagroup', function(){
+//							mediaelement.mediagroup.set.apply(that, args);
+//						});
+//					}
+//				},
+//				initAttr: true
+//			});
+			
 			webshims.onNodeNamesPropertyModify(['audio', 'video'], ['src', 'poster'], {
 				set: function(){
 					var elem = this;
@@ -1072,6 +1093,9 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 				if(!loadTrackUi.loaded && $('track', media).length){
 					loadTrackUi();
 				}
+//				if(!loadMediaGroup.loaded && this.getAttribute('mediagroup')){
+//					loadMediaGroup();
+//				}
 				media = null;
 			});
 		});
@@ -1087,9 +1111,6 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 								handleMedia = true;
 								return false;
 							}
-							if((!hasFullTrackSupport || webshims.modules.track.options.override) && !loadTrackUi.loaded && $('track', this).length){
-								loadTrackUi();
-							}
 						})
 					;
 				}

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

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