webshims-rails 1.14.4 → 1.14.5

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

@@ -111,7 +111,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				shadowType = shadowElem.prop('type');
 			}
 			if(
-				(chromeBugs && (e.type == 'change' || webkitVersion < 537.36) && noFocusWidgets[shadowType] && $(e.target).is(':focus')) ||
+				(chromeBugs && (e.type == 'change' || webkitVersion < 537.36) && noFocusWidgets[shadowType] && $.find.matchesSelector(e.target, ':focus')) ||
 				(e.type == 'focusout' && elem.type == 'radio' && isInGroup(elem.name))
 				){
 					return;
@@ -438,9 +438,9 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			this.lastElement = $(element).getShadowFocusElement();
 			if(!this.prepared || !this.options.prepareFor){
 				if(opts.appendTo == 'element' || (opts.inline && opts.appendTo == 'auto')){
-					parentElem = element.parent();
+					parentElem = visual.parent();
 				} else if(opts.appendTo == 'auto'){
-					parentElem = this._getAutoAppendElement(element);
+					parentElem = this._getAutoAppendElement(visual);
 				} else {
 					parentElem = $(opts.appendTo);
 				}
@@ -679,7 +679,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				var ret = $(elem).data('errortype');
 				if(!ret){
 					$.each(fields, function(errorName, cNames){
-						if($(elem).is(cNames)){
+						if($.find.matchesSelector(elem, cNames)){
 							ret = errorName;
 							return false;
 						}
@@ -724,7 +724,8 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			};
 		})(),
 		initIvalContentMessage: function(elem){
-			if($(elem).jProp('form').is(iVal.sel)){
+			var form;
+			if(iVal.sel && (form = $.prop(elem, 'form')) && $.find.matchesSelector(form, iVal.sel)){
 				this.get(elem);
 			}
 		},
@@ -794,7 +795,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 					switchValidityClass({type: 'input', target: input});
 				};
 				$(input)
-					.filter('input:not([type="checkbox"]):not([type="radio"])')
+					.filter('input:not([type="checkbox"]):not([type="radio"]), textarea')
 					.off('.recheckinvalid')
 					.on('input.recheckinvalid', function(){
 						clearTimeout(timer);
@@ -840,7 +841,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 			this.hideError(elem, true).removeClass(successWrapperClass);
 		},
 		toggle: function(elem){
-			if($(elem).is(':invalid')){
+			if($.find.matchesSelector(elem, ':invalid')){
 				this.showError(elem);
 			} else {
 				this.hideError(elem);
@@ -851,25 +852,21 @@ webshims.register('form-validation', function($, webshims, window, document, und
 	$(document.body)
 		.on({
 			'changedvaliditystate': function(e){
-				if(iVal.sel){
-					var form = $(e.target).jProp('form');
-					if(form.is(iVal.sel)){
-						webshims.errorbox.toggle(e.target);
-					}
+				var form;
+				if(iVal.sel && (form = $.prop(e.target, 'form')) && $.find.matchesSelector(form, iVal.sel)){
+					webshims.errorbox.toggle(e.target);
 				}
 			},
 			'resetvalidityui.webshims': function(e){
-				if (iVal.sel) {
-					var form = $(e.target).jProp('form');
-					if (form.is(iVal.sel)) {
-						webshims.errorbox.reset(e.target);
-					}
+				var form;
+				if(iVal.sel && (form = $.prop(e.target, 'form')) && $.find.matchesSelector(form, iVal.sel)){
+					webshims.errorbox.reset(e.target);
 				}
 			},
 			firstinvalid: function(e){
+				var form;
 				if(iVal.sel && iVal.handleBubble){
-					var form = $(e.target).jProp('form');
-					if(form.is(iVal.sel)){
+					if(iVal.sel && (form = $.prop(e.target, 'form')) && $.find.matchesSelector(form, iVal.sel)){
 						e.preventDefault();
 						if(iVal.handleBubble != 'none'){
 							webshims.validityAlert.showFor( e.target, false, false, iVal.handleBubble == 'hide' );
@@ -878,7 +875,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				}
 			},
 			submit: function(e){
-				if(iVal.sel && iVal.submitCheck && $(e.target).is(iVal.sel) && $.prop(e.target, 'noValidate') && !$(e.target).checkValidity()){
+				if(iVal.sel && iVal.submitCheck && $.find.matchesSelector(e.target, iVal.sel) && $.prop(e.target, 'noValidate') && !$(e.target).checkValidity()){
 					e.stopImmediatePropagation();
 					return false;
 				}

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

@@ -1,6 +1,11 @@
 webshims.register('form-validators', function($, webshims, window, document, undefined, options){
 "use strict";
-var iValClasses = '.'+ options.iVal.errorClass +', .'+options.iVal.successClass;
+
+var iValClasses;
+webshims.ready('form-validation', function(){
+	iValClasses = '.'+ options.iVal.errorClass +', .'+options.iVal.successClass;
+});
+
 (function(){
 	if(webshims.refreshCustomValidityRules){
 		webshims.error("form-validators already included. please remove custom-validity.js");
@@ -30,7 +35,7 @@ var iValClasses = '.'+ options.iVal.errorClass +', .'+options.iVal.successClass;
 					elem = elements[id].elem;
 					if(elem != noTest && elements[id].val != (val = elem.value)){
 						elements[id].val = val;
-						if($(elem).hasClass(iValClasses)){
+						if(iValClasses && $.find.matchesSelector(elem, iValClasses)){
 							$(elem).trigger('updatevalidation.webshims');
 						} else {
 							testValidityRules(elem);
@@ -337,7 +342,7 @@ var iValClasses = '.'+ options.iVal.errorClass +', .'+options.iVal.successClass;
 				val = !val;
 			}
 			$.prop( elem, data.prop, val);
-			if(e){
+			if(iValClasses && e){
 				$(elem).getShadowElement().filter(iValClasses).trigger('updatevalidation.webshims');
 			}
 		};
@@ -377,11 +382,13 @@ var iValClasses = '.'+ options.iVal.errorClass +', .'+options.iVal.successClass;
 			} else {
 				$(data.masterElement).on('change', function(){
 					webshims.refreshCustomValidityRules(elem);
-					$(elem)
-						.getShadowElement()
-						.filter(iValClasses)
-						.trigger('updatevalidation.webshims')
-					;
+					if(iValClasses){
+						$(elem)
+							.getShadowElement()
+							.filter(iValClasses)
+							.trigger('updatevalidation.webshims')
+						;
+					}
 				});
 			}
 		}
@@ -416,7 +423,7 @@ var iValClasses = '.'+ options.iVal.errorClass +', .'+options.iVal.successClass;
 			}
 
 			data.ajaxvalidate.depends.on('change', function(){
-				if($(this).is(':valid')){
+				if($.find.matchesSelector(this, ':valid')){
 					webshims.refreshCustomValidityRules(elem);
 				}
 			});
@@ -479,7 +486,7 @@ var iValClasses = '.'+ options.iVal.errorClass +', .'+options.iVal.successClass;
 					data = {};
 					data[$.prop(elem, 'name') || $.prop(elem, 'id')] = $(elem).val();
 					opts.depends.each(function(){
-						if($(this).is(':invalid')){
+						if($.find.matchesSelector(this, ':invalid')){
 							data = false;
 							return false;
 						}

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

@@ -1495,7 +1495,7 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 		data._commonDateInit = true;
 		var o = data.options;
 		var actionfn = function(e){
-			if(!$(this).is('.othermonth') || $(this).css('cursor') == 'pointer'){
+			if(!$(this).hasClass('othermonth') || $(this).css('cursor') == 'pointer'){
 				popover.actionFn({
 					'data-action': $.attr(this, 'data-action'),
 					value: $(this).val() || $.attr(this, 'value')
@@ -1550,13 +1550,13 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 				
 				$('button', popover.buttonRow).each(function(){
 					var text;
-					if($(this).is('.ws-empty')){
+					if($(this).hasClass('ws-empty')){
 						text = curCfg.date.clear;
 						if(!text){
 							text = formcfg[''].date.clear || 'clear';
 							webshims.warn("could not get clear text from form cfg");
 						}
-					} else if($(this).is('.ws-current')){
+					} else if($(this).hasClass('ws-current')){
 						text = (curCfg[data.type] || {}).currentText;
 						if(!text){
 							text = (formcfg[''][[data.type]] || {}).currentText || (curCfg.date || {}).currentText || 'current';

data/vendor/assets/javascripts/webshims/shims/jme/base.js

@@ -276,30 +276,6 @@ webshims.register('jmebase', function($, webshims, window, doc, undefined){
 				jmeData.media = media;
 				jmeData.player = base;
 				media
-					.on('ended emptied play', (function(){
-						var timer;
-						var releaseEmptied = function(){
-							stopEmptiedEvent = false;
-						};
-						var ended = function(){
-							removeCanPlay();
-							media.jmeFn('pause');
-							if(!options.noReload && media.prop('ended') && media.prop('paused') && !media.prop('autoplay') && !media.prop('loop') && !media.hasClass('no-reload')){
-								stopEmptiedEvent = true;
-								media.jmeFn('load');
-								base.attr('data-state', 'ended');
-								setTimeout(releaseEmptied);
-
-							}
-						};
-						return function(e){
-
-							clearTimeout(timer);
-							if(e.type == 'ended' && !options.noReload && !media.prop('autoplay') && !media.prop('loop') && !media.hasClass('no-reload')){
-								timer = setTimeout(ended);
-							}
-						};
-					})())
 					.on('emptied waiting canplay canplaythrough playing ended pause mediaerror', mediaUpdateFn)
 					.on('volumechange updateJMEState', function(){
 						var volume = $.prop(this, 'volume');

data/vendor/assets/javascripts/webshims/shims/jme/controls.css

@@ -1,5 +1,5 @@
 /* thx to http://icomoon.io */
-.mediaplayer[data-state="waiting"] > .jme-media-overlay, .mediaplayer .fullscreen, .mediaplayer .fullscreen.state-exitfullscreen, .mediaplayer .mediaconfigmenu, .mediaplayer[data-state="idle"] > .jme-media-overlay, .mediaplayer button.play-pause, .mediaplayer button.play-pause.state-playing, .mediaplayer .mute-unmute, .mediaplayer[data-volume="medium"] .mute-unmute, .mediaplayer[data-volume="low"] .mute-unmute, .mediaplayer[data-volume="no"] .mute-unmute, .mediaplayer .state-unmute.mute-unmute, .mediaplayer .captions, .mediaplayer .subtitle-menu button[aria-checked="true"], .mediaplayer .subtitle-menu button, .mediaplayer .playlist-next, .mediaplayer .playlist-prev, .mediaplayer .chapters, .mediaplayer[data-state="ended"] > .jme-media-overlay {
+.mediaplayer[data-state="waiting"] > .jme-media-overlay, .mediaplayer .fullscreen, .mediaplayer .fullscreen.state-exitfullscreen, .mediaplayer .mediaconfigmenu, .mediaplayer.initial-state > .jme-media-overlay, .mediaplayer button.play-pause, .mediaplayer button.play-pause.state-playing, .mediaplayer .mute-unmute, .mediaplayer[data-volume="medium"] .mute-unmute, .mediaplayer[data-volume="low"] .mute-unmute, .mediaplayer[data-volume="no"] .mute-unmute, .mediaplayer .state-unmute.mute-unmute, .mediaplayer .captions, .mediaplayer .subtitle-menu button[aria-checked="true"], .mediaplayer .subtitle-menu button, .mediaplayer .playlist-next, .mediaplayer .playlist-prev, .mediaplayer .chapters, .mediaplayer.ended-state > .jme-media-overlay {
   font-family: 'jme';
   speak: none;
   font-style: normal;
@@ -29,7 +29,7 @@
   content: "\e606";
 }
 
-.mediaplayer[data-state="idle"] > .jme-media-overlay:before {
+.mediaplayer.initial-state > .jme-media-overlay:before {
   content: "\e608";
 }
 
@@ -85,7 +85,7 @@
   content: "\e615";
 }
 
-.mediaplayer[data-state="ended"] > .jme-media-overlay:before {
+.mediaplayer.ended-state > .jme-media-overlay:before {
   content: "\e601";
 }
 
@@ -99,6 +99,15 @@
   font-weight: normal;
   font-style: normal;
 }
+@-webkit-keyframes jmespin {
+  0% {
+    -webkit-transform: rotate(0deg);
+  }
+
+  100% {
+    -webkit-transform: rotate(360deg);
+  }
+}
 @keyframes jmespin {
   0% {
     -webkit-transform: rotate(0deg);
@@ -264,17 +273,17 @@
 .mediaplayer[data-state="idle"] {
   cursor: pointer;
 }
-.mediaplayer[data-state="idle"] > .jme-media-overlay {
+.mediaplayer.initial-state > .jme-media-overlay {
   background-position: 1px 1px;
 }
-.mediaplayer[data-state="idle"].has-ytposter.no-backgroundsize > .jme-media-overlay:before {
+.mediaplayer.initial-state.has-ytposter.no-backgroundsize > .jme-media-overlay:before {
   content: "";
   background-position: 2px 2px;
 }
-.mediaplayer[data-state="ended"] {
+.mediaplayer.ended-state {
   cursor: pointer;
 }
-.mediaplayer[data-state="ended"] > .jme-media-overlay {
+.mediaplayer.ended-state > .jme-media-overlay {
   background-position: 3px 3px;
 }
 .mediaplayer[data-state="waiting"] {
@@ -284,6 +293,10 @@
   background-position: 4px 4px;
 }
 .mediaplayer[data-state="waiting"] > .jme-media-overlay:before {
+  -webkit-animation-name: jmespin;
+  -webkit-animation-iteration-count: infinite;
+  -webkit-animation-duration: 1100ms;
+  -webkit-animation-timing-function: linear;
   animation-name: jmespin;
   animation-iteration-count: infinite;
   animation-duration: 1100ms;
@@ -308,9 +321,10 @@
   left: 0;
   right: 0;
   bottom: 0;
-  background: #000 no-repeat center / contain;
+  background: #000 no-repeat center;
+  background-size: contain;
 }
-.mediaplayer.initial-state .ws-poster {
+.mediaplayer.initial-state .ws-poster, .mediaplayer.ended-state .ws-poster {
   display: block;
 }
 .mediaplayer.no-poster .ws-poster, .mediaplayer.no-backgroundsize div.ws-poster {

data/vendor/assets/javascripts/webshims/shims/jme/controls.scss

@@ -30,6 +30,15 @@ $browser-context: 16; // Default
 	@return #{$pixels/$context}em
 }
 
+@-webkit-keyframes jmespin {
+	0% {
+		-webkit-transform: rotate(0deg);
+	}
+
+	100% {
+		-webkit-transform: rotate(360deg);
+	}
+}
 
 @keyframes jmespin {
 	0% {
@@ -186,7 +195,9 @@ $browser-context: 16; // Default
 
 	&[data-state="idle"] {
 		cursor: pointer;
+	}
 
+	&.initial-state {
 		> .jme-media-overlay {
 			@extend %icon-play-circle;
 			background-position: 1px 1px;
@@ -198,7 +209,7 @@ $browser-context: 16; // Default
 		}
 	}
 
-	&[data-state="ended"] {
+	&.ended-state {
 		cursor: pointer;
 		> .jme-media-overlay {
 			@extend %icon-loop;
@@ -213,6 +224,11 @@ $browser-context: 16; // Default
 			background-position: 4px 4px;
 
 			&:before {
+				-webkit-animation-name: jmespin;
+				-webkit-animation-iteration-count: infinite;
+				-webkit-animation-duration: 1100ms;
+				-webkit-animation-timing-function: linear;
+
 				animation-name: jmespin;
 				animation-iteration-count: infinite;
 				animation-duration: 1100ms;
@@ -243,10 +259,12 @@ $browser-context: 16; // Default
 		left: 0;
 		right: 0;
 		bottom: 0;
-		background: #000 no-repeat center / contain;
+		background: #000 no-repeat center;
+		background-size: contain;
 	}
 
-	&.initial-state .ws-poster {
+	&.initial-state .ws-poster,
+	&.ended-state .ws-poster {
 		display: block;
 	}
 

data/vendor/assets/javascripts/webshims/shims/jme/mediacontrols-lazy.js

@@ -353,6 +353,7 @@ webshims.register('mediacontrols-lazy', function($, webshims, window, doc, undef
 								delete base._seekpause;
 							}
 							wasPaused = null;
+							media.triggerHandler('updateprogress');
 						}
 					});
 
@@ -1316,10 +1317,11 @@ webshims.register('mediacontrols-lazy', function($, webshims, window, doc, undef
 
 	$.jme.registerPlugin('buffer-progress', {
 		_create: function(control, media, base, options){
+			var progressTimer;
 			var indicator = $('<div class="buffer-progress-indicator" />').appendTo(control);
 			var drawBufferProgress = function(){
 				var progress = media.jmeProp('progress');
-
+				clearTimeout(progressTimer);
 
 				if(options.progress !== progress){
 					options.progress = progress;
@@ -1332,7 +1334,14 @@ webshims.register('mediacontrols-lazy', function($, webshims, window, doc, undef
 					indicator.css('width', 0);
 					options.progress = 0;
 				},
-				playing: drawBufferProgress
+				playing: drawBufferProgress,
+				'seeked seeking updateprogress': function(e){
+					clearTimeout(progressTimer);
+					if(e.type != 'seeking'){
+						progressTimer = setTimeout(drawBufferProgress, 100);
+					}
+				}
+
 			});
 			drawBufferProgress();
 		}
@@ -1418,8 +1427,8 @@ webshims.register('mediacontrols-lazy', function($, webshims, window, doc, undef
 				var buttons = this.buttons.not(':disabled');
 				var activeButton = buttons.filter(':focus');
 
-				activeButton = buttons[buttons.index(activeButton) + dir] || buttons.filter(dir > 0 ? ':first' : ':last');
-				activeButton.trigger('focus');
+				activeButton = (activeButton[0] && buttons[buttons.index(activeButton) + dir]) || buttons[dir > 0 ? 'first' : 'last']();
+				$(activeButton).trigger('focus');
 				e.preventDefault();
 			}
 		},

data/vendor/assets/javascripts/webshims/shims/jme/mediacontrols.js

@@ -151,17 +151,33 @@ webshims.register('mediacontrols', function($, webshims, window){
 						var regYt = /youtube\.com\/[watch\?|v\/]+/i;
 
 						var isInitial = data.media.prop('paused');
+						var isEnded = data.media.prop('ended');
 						if(isInitial){
 							data.player.addClass('initial-state');
 						}
+						if(isEnded){
+							data.player.addClass('ended-state');
+						}
 						if(!('backgroundSize' in $poster[0].style)){
 							data.player.addClass('no-backgroundsize');
 						}
-						data.media.on('playing waiting seeked seeking', function(){
+						data.media.on('play playing waiting seeked seeking', function(e){
+
 							if(isInitial){
 								isInitial = false;
 								data.player.removeClass('initial-state');
 							}
+
+							if(isEnded){
+								isEnded = false;
+								data.player.removeClass('ended-state');
+							}
+						});
+						data.media.on('ended', function(){
+							if(!isEnded && !data.media.prop('loop') && data.media.prop('ended')){
+								isEnded = true;
+								data.player.addClass('ended-state');
+							}
 						});
 						return function(){
 							var poster = data.media.attr('poster');
@@ -193,6 +209,11 @@ webshims.register('mediacontrols', function($, webshims, window){
 								isInitial = true;
 							}
 
+							if(isEnded){
+								isEnded = false;
+								data.player.removeClass('ended-state');
+							}
+
 							if(lastYoutubeState !== hasYt){
 								lastYoutubeState = hasYt;
 								data.player[hasYt ? 'addClass' : 'removeClass']('has-ytposter');