webshims-rails 1.10.11 → 1.11.1

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

@@ -13,7 +13,16 @@ webshims.register('form-validators', function($, webshims, window, document, und
 	var onEventTest = function(e){
 		webshims.refreshCustomValidityRules(e.target);
 	};
-	
+	var noValidate = function(){
+		return !noValidate.types[this.type];
+	};
+	noValidate.types = {
+		hidden: 1,
+		image: 1,
+		button: 1,
+		reset: 1,
+		submit: 1
+	};
 	
 	webshims.customErrorMessages = {};
 	webshims.addCustomValidityRule = function(name, test, defaultMessage){
@@ -22,68 +31,78 @@ webshims.register('form-validators', function($, webshims, window, document, und
 			webshims.customErrorMessages[name] = [];
 			webshims.customErrorMessages[name][''] = defaultMessage || name;
 		}
-		if($.isReady && formReady){
-			$('input, select, textarea').each(function(){
-				testValidityRules(this);
-			});
+		if(formReady){
+			$('input, select, textarea')
+				.filter(noValidate)
+				.each(function(){
+					testValidityRules(this);
+				})
+			;
 		}
 	};
 	webshims.refreshCustomValidityRules = function(elem){
-		if(!elem.form || (!initTest && !$.prop(elem, 'willValidate')) ){return;}
-		blockCustom = true;
-		var customMismatchedRule = $.data(elem, 'customMismatchedRule');
+		if(!initTest){return;}
+		
+		var data = $(elem).data() || $.data(elem, {});
+		var customMismatchedRule = data.customMismatchedRule;
 		var validity = $.prop(elem, 'validity') || {};
 		var message = '';
-		if(customMismatchedRule || !validity.customError){
+		var setMessage = function(message, errorType){
+			blockCustom = true;
+			data.customMismatchedRule = message ?  errorType : '';
+			
+			if(typeof message != 'string'){
+				message = $(elem).data('errormessage') || elem.getAttribute('x-moz-errormessage') || webshims.customErrorMessages[errorType][webshims.activeLang()] || webshims.customErrorMessages[errorType]['']; 
+			}
+			
+			if(typeof message == 'object'){
+				message = message[errorType] || message.customError || message.defaultMessage;
+			}
+			$(elem).setCustomValidity(message);
+			blockCustom = false;
+		};
+		if(customMismatchedRule || validity.valid || (data.dependentValidation && !data.dependentValidation._init)){
 			var val = $(elem).val();
 			$.each(customValidityRules, function(name, test){
-				message = test(elem, val) || '';
+				message = test(elem, val, data, setMessage) || '';
 				customMismatchedRule = name;
 				if(message){
-					
-					if(typeof message != 'string'){
-						message = $(elem).data('errormessage') || elem.getAttribute('x-moz-errormessage') || webshims.customErrorMessages[name][webshims.activeLang()] || webshims.customErrorMessages[name]['']; 
-					}
-					
-					if(typeof message == 'object'){
-						message = message[name] || message.customError || message.defaultMessage;
-					}
 					return false;
 				}
 			});
-			
-			if(message){
-				$.data(elem, 'customMismatchedRule', customMismatchedRule);
+			if(message != 'async'){
+				setMessage(message, customMismatchedRule);
 			}
-			$(elem).setCustomValidity(message);
 		}
-		blockCustom = false;
+		return message;
 	};
 	var testValidityRules = webshims.refreshCustomValidityRules;
 	
 	webshims.ready('forms form-validation', function(){
 		
-				
-		var oldCustomValidity = $.fn.setCustomValidity;
-		
-		
-		$.fn.setCustomValidity = function(message){
-			if(!blockCustom){
-				this.data('customMismatchedRule', '');
+		$.propHooks.setCustomValidity = {
+			get: function(elem){
+				if(!blockCustom){
+					$.data(elem, 'customMismatchedRule', '');
+				}
+				return null;
 			}
-			return oldCustomValidity.apply(this, arguments);
 		};
 		
+		
 		setTimeout(function(){
 			webshims.addReady(function(context, selfElement){
 				initTest = true;
-				$('input, select, textarea', context).add(selfElement.filter('input, select, textarea')).each(function(){
-					testValidityRules(this);
-				});
-				initTest = false;
+				$('input, select, textarea', context).add(selfElement.filter('input, select, textarea'))
+					.filter(noValidate)
+					.each(function(){
+						testValidityRules(this);
+					})
+				;
+				
 				formReady = true;
 			});
-			$(document).on('refreshCustomValidityRules change', onEventTest);
+			$(document).on('refreshCustomValidityRules', onEventTest);
 		}, 9);
 		
 	});
@@ -101,17 +120,20 @@ webshims.register('form-validators', function($, webshims, window, document, und
  */
 (function(){
 	
-	var addCustomValidityRule = $.webshims.addCustomValidityRule;
-	addCustomValidityRule('partialPattern', function(elem, val){
-		if(!val || !elem.getAttribute('data-partial-pattern')){return;}
-		var pattern = $(elem).data('partial-pattern');
-		if(!pattern){return;}
+	var addCustomValidityRule = webshims.addCustomValidityRule;
+	var getId = function(name){
+		return document.getElementById(name);
+	};
+	addCustomValidityRule('partialPattern', function(elem, val, pattern){
+		pattern = pattern.partialPattern;
+		if(!val || !pattern){return;}
 		return !(new RegExp('(' + pattern + ')', 'i').test(val));
 	}, 'This format is not allowed here.');
 	
-	addCustomValidityRule('tooShort', function(elem, val){
-		if(!val || !elem.getAttribute('data-minlength')){return;}
-		return $(elem).data('minlength') > val.length;
+	
+	addCustomValidityRule('tooShort', function(elem, val, data){
+		if(!val || !data.minlength){return;}
+		return data.minlength > val.length;
 	}, 'Entered value is too short.');
 	
 	var groupTimer = {};
@@ -129,7 +151,7 @@ webshims.register('form-validators', function($, webshims, window, document, und
 				.unbind('click.groupRequired')
 				.bind('click.groupRequired', function(){
 					checkboxes.filter('.group-required').each(function(){
-						$.webshims.refreshCustomValidityRules(this);
+						webshims.refreshCustomValidityRules(this);
 					});
 				})
 			;
@@ -168,19 +190,16 @@ webshims.register('form-validators', function($, webshims, window, document, und
 	var getGroupElements = function(elem) {
 		return $(elem.form[elem.name]).filter('[type="radio"]');
 	};
-	$.webshims.ready('form-validation', function(){
-		if($.webshims.modules){
-			getGroupElements = $.webshims.modules["form-core"].getGroupElements || getGroupElements;
+	webshims.ready('form-validation', function(){
+		if(webshims.modules){
+			getGroupElements = webshims.modules["form-core"].getGroupElements || getGroupElements;
 		}
 	});
 	
-	addCustomValidityRule('dependent', function(elem, val){
-		
-		if( !elem.getAttribute('data-dependent-validation') ){return;}
-		
-		var data = $(elem).data('dependentValidation');
+	addCustomValidityRule('dependent', function(elem, val, data){
+		data = data.dependentValidation;
+		if( !data ){return;}
 		var specialVal;
-		if(!data){return;}
 		var depFn = function(e){
 			var val = $.prop(data.masterElement, data["from-prop"]);
 			if(specialVal){
@@ -229,7 +248,7 @@ webshims.register('form-validators', function($, webshims, window, document, und
 				$(data.masterElement.type === 'radio' && getGroupElements(data.masterElement) || data.masterElement).bind('change', depFn);
 			} else {
 				$(data.masterElement).bind('change', function(){
-					$.webshims.refreshCustomValidityRules(elem);
+					webshims.refreshCustomValidityRules(elem);
 					$(elem).getShadowElement().filter('.user-error, .user-success').trigger('refreshvalidityui');
 				});
 			}
@@ -243,6 +262,121 @@ webshims.register('form-validators', function($, webshims, window, document, und
 		}
 		
 	}, 'The value of this field does not repeat the value of the other field');
+	
+	
+	if(window.JSON){
+		addCustomValidityRule('ajaxvalidate', function(elem, val, data){
+			if(!val || !data.ajaxvalidate){return;}
+			var opts;
+			if(!data.remoteValidate){
+				if(typeof data.ajaxvalidate == 'string'){
+					data.ajaxvalidate = {url: data.ajaxvalidate, depends: $([])};
+				} else {
+					data.ajaxvalidate.depends = data.ajaxvalidate.depends ? $(data.ajaxvalidate.depends).map(getId) : $([]);
+				}
+				
+				data.ajaxvalidate.depends.on('refreshCustomValidityRules', function(){
+					webshims.refreshCustomValidityRules(elem);
+				});
+				
+				opts = data.ajaxvalidate;
+				
+				var remoteValidate = {
+					ajaxLoading: false,
+					restartAjax: false,
+					message: 'async',
+					cache: {},
+					update: function(remoteData){
+						if(this.ajaxLoading){
+							this.restartAjax = remoteData;
+						} else {
+							this.restartAjax = false;
+							this.ajaxLoading = true;
+							$.ajax(
+									$.extend({}, opts, {
+										url: opts.url,
+										dataType: 'json',
+										depData: remoteData,
+										data: opts.fullForm ? 
+											$(elem).jProp('form').serializeArray() : 
+											remoteData,
+										success: this.getResponse,
+										complete: this._complete
+									})
+							);
+						}
+					},
+					_complete: function(){
+						remoteValidate.ajaxLoading = false;
+						if(remoteValidate.restartAjax){
+							this.update(remoteValidate.restartAjax);
+						}
+						remoteValidate.restartAjax = false;
+					},
+					getResponse: function(data){
+						var old = webshims.refreshCustomValidityRules;
+						if(!data){
+							data = {message: '', valid: true};
+						} else if(typeof data == 'string'){
+							data = JSON.parse(data);
+						}
+						
+						remoteValidate.message = ('message' in data) ? data.message : !data.valid;
+						remoteValidate.lastMessage = remoteValidate.message;
+						remoteValidate.blockUpdate = true;
+						$(elem).triggerHandler('refreshvalidityui');
+						remoteValidate.message = 'async';
+						remoteValidate.blockUpdate = false;
+					},
+					getData: function(){
+						var data;
+						data = {};
+						data[$.prop(elem, 'name') || $.prop(elem, 'id')] = $(elem).val();
+						opts.depends.each(function(){
+							if($(this).is(':invalid')){
+								data = false;
+								return false;
+							}
+							data[$.prop(this, 'name') || $.prop(this, 'id')] = $(this).val();
+						});
+						return data;
+					},
+					getTempMessage: function(){
+						var message = 'async';
+						var remoteData, dataStr;
+						if(!data.remoteValidate.blockUpdate){
+							remoteData = this.getData();
+							if(!remoteData){
+								message = '';
+							} else {
+								try {
+									dataStr = JSON.stringify(remoteData);
+								} catch(er){}
+								
+								if(dataStr === this.lastString){
+									message = this.ajaxLoading ? 'async' : this.lastMessage;
+								} else {
+									this.lastString = dataStr;
+									this.lastMessage = 'async';
+									clearTimeout(data.remoteValidate.timer);
+									data.remoteValidate.timer = setTimeout(function(){
+										data.remoteValidate.update(remoteData);
+									}, 9);
+								}
+								
+							}
+						} else {
+							message = remoteValidate.message;
+						}
+						return message;
+					}
+				};
+				data.remoteValidate = remoteValidate;
+			}
+			
+			return data.remoteValidate.getTempMessage();
+		}, 'remote error');
+	}
 })();
 
 });

data/vendor/assets/javascripts/webshims/shims/forms-picker.js

@@ -886,7 +886,10 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 					'' :
 					' disabled="" '
 				;
-				options.push('<li role="presentation"><button value="'+ val +'" '+disabled+' data-action="changeInput" tabindex="-1"  role="option">'+ (label || data.formatValue(val, false)) +'</button></li>');
+				if(label){
+					label = ' <span class="ws-label">'+ label +'</span>';
+				}
+				options.push('<li role="presentation"><button value="'+ val +'" '+disabled+' data-action="changeInput" tabindex="-1"  role="option"><span class="ws-value">'+ data.formatValue(val, false) +'</span>'+ label +'</button></li>');
 			});
 			if(options.length){
 				id++;

data/vendor/assets/javascripts/webshims/shims/jpicker/jpicker.css

@@ -175,11 +175,12 @@ table.jPicker {
 .jPicker td.Radio {
   margin: 0px;
   padding: 0px;
-  width: 31px;
+  width: 32px;
 }
 .jPicker td.Radio input {
   margin: 0px 5px 0px 0px;
   padding: 0px;
+  display: inline-block;
 }
 .jPicker td.Text {
   font-size: 12px !important;
@@ -205,6 +206,7 @@ table.jPicker {
 }
 .jPicker tr.Hex td.Text input.Hex {
   width: 45px;
+  display: inline-block;
   margin-left: 2px;
   text-align: center;
 }

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

@@ -24,6 +24,7 @@
 	if(hasNative){
 		var videoElem = document.createElement('video');
 		Modernizr.videoBuffered = ('buffered' in videoElem);
+		Modernizr.mediaDefaultMuted = ('defaultMuted' in videoElem);
 		supportsLoop = ('loop' in videoElem);
 		
 		webshims.capturingEvents(['play', 'playing', 'waiting', 'paused', 'ended', 'durationchange', 'loadedmetadata', 'canplay', 'volumechange']);
@@ -37,20 +38,15 @@
 		
 		if(!options.preferFlash){
 			var noSwitch = {
-				1: 1,
-				2: 1
+				1: 1
 			};
 			var switchOptions = function(e){
 				var media, error, parent;
 				if(!options.preferFlash && 
 				($(e.target).is('audio, video') || ((parent = e.target.parentNode) && $('source:last', parent)[0] == e.target)) && 
-				(media = $(e.target).closest('audio, video')) && !noSwitch[(error = media.prop('error'))]
+				(media = $(e.target).closest('audio, video')) && (error = media.prop('error')) && !noSwitch[error.code]
 				){
-					if(error == null){
-						webshims.warn("There was an unspecified error on a mediaelement");
-						return;
-						
-					}
+					
 					$(function(){
 						if(hasSwf && !options.preferFlash){
 							loadSwf();
@@ -62,7 +58,7 @@
 										$('audio, video').each(function(){
 											webshims.mediaelement.selectSource(this);
 										});
-										webshims.error("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')+ 'first error: '+ error);
 									}
 								}, 9);
 							});
@@ -268,7 +264,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 		if(src.indexOf('rtmp') === 0){
 			return nodeName+'/rtmp';
 		}
-		src = src.split('?')[0].split('.');
+		src = src.split('?')[0].split('#')[0].split('.');
 		src = src[src.length - 1];
 		var mt;
 		
@@ -387,7 +383,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 			webshims.error('mediaelementError: '+ message);
 			setTimeout(function(){
 				if($(elem).data('mediaerror')){
-					$(elem).trigger('mediaerror');
+					$(elem).addClass('media-error').trigger('mediaerror');
 				}
 			}, 1);
 		}
@@ -451,6 +447,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 		var parent = elem.parentNode;
 		
 		clearTimeout(baseData.loadTimer);
+		$(elem).removeClass('media-error');
 		$.data(elem, 'mediaerror', false);
 		
 		if(!_srces.length || !parent || parent.nodeType != 1 || stopParent.test(parent.nodeName || '')){return;}
@@ -478,7 +475,9 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 		var testFixMedia = function(){
 			if(webshims.implement(this, 'mediaelement')){
 				selectSource(this);
-				
+				if(!Modernizr.mediaDefaultMuted && $.attr(this, 'muted') != null){
+					$.prop(this, 'muted', true);
+				}
 				//fixes for FF 12 and IE9/10 || does not hurt, if run in other browsers
 				if(hasNative && (!supportsLoop || ('ActiveXObject' in window))){
 					var bufferTimer;

data/vendor/assets/javascripts/webshims/shims/mediaelement-jaris.js

@@ -16,6 +16,7 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 		networkState: 0,
 		videoHeight: 0,
 		videoWidth: 0,
+		seeking: false,
 		error: null,
 		buffered: {
 			start: function(index){
@@ -119,7 +120,12 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 		}
 		data.readyState = readyState;
 	};
-	
+	var callSeeked = function(data){
+		if(data.seeking && Math.abs(data.currentTime - data._lastSeektime) < 2){
+			data.seeking = false;
+			$(data._elem).triggerHandler('seeked');
+		}
+	};
 	
 	
 	mediaelement.jarisEvent = {};
@@ -148,6 +154,20 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 				}
 			}
 		},
+		onSeek: function(jaris, data){
+			data._lastSeektime = jaris.seekTime;
+			
+			data.seeking = true;
+			$(data._elem).triggerHandler('seeking');
+			clearTimeout(data._seekedTimer);
+			data._seekedTimer = setTimeout(function(){
+				callSeeked(data);
+				data.seeking = false;
+			}, 300);
+		},
+		onConnectionFailed: function(){
+			webshims.error('media error');
+		},
 		onNotBuffering: function(jaris, data){
 			setReadyState(3, data);
 		},
@@ -203,7 +223,9 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 				setReadyState(3, data);
 				trigger(data._elem, 'playing');
 			}
-			
+			if(data.seeking){
+				callSeeked(data);
+			}
 			trigger(data._elem, 'timeupdate');
 		},
 		onProgress: function(jaris, data){
@@ -259,6 +281,7 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 			
 			return function(jaris, data){
 				var i = 0;
+				
 				var doneFn = function(){
 					if(i > 9){
 						data.tryedReframeing = 0;
@@ -418,11 +441,12 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 	
 	
 	var resetSwfProps = (function(){
-		var resetProtoProps = ['_calledMeta', 'lastDuration', '_bufferedEnd', '_bufferedStart', '_ppFlag', 'currentSrc', 'currentTime', 'duration', 'ended', 'networkState', 'paused', 'videoHeight', 'videoWidth'];
+		var resetProtoProps = ['_calledMeta', 'lastDuration', '_bufferedEnd', '_bufferedStart', '_ppFlag', 'currentSrc', 'currentTime', 'duration', 'ended', 'networkState', 'paused', 'seeking', 'videoHeight', 'videoWidth'];
 		var len = resetProtoProps.length;
 		return function(data){
 			
 			if(!data){return;}
+			clearTimeout(data._seekedTimer);
 			var lenI = len;
 			var networkState = data.networkState;
 			setReadyState(0, data);
@@ -864,6 +888,8 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 			descs[key].set = setFn;
 		};
 		
+		createGetSetProp('seeking');
+		
 		createGetSetProp('volume', function(v){
 			var data = getSwfDataFromElem(this);
 			if(data){
@@ -974,8 +1000,26 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 		});
 		
 		mediaSup = webshims.defineNodeNameProperties(nodeName, descs, 'prop');
+		
+		if(!Modernizr.mediaDefaultMuted){
+			webshims.defineNodeNameProperties(nodeName, {
+				defaultMuted: {
+					get: function(){
+						return $.attr(this, 'muted') != null;
+					},
+					set: function(val){
+						if(val){
+							$.attr(this, 'muted', '');
+						} else {
+							$(this).removeAttr('muted');
+						}
+					}
+				}
+			}, 'prop');
+		}
 	});
 	
+	
 	if(hasFlash && $.cleanData){
 		var oldClean = $.cleanData;
 		var flashNames = {