webshims-rails 1.14.3 → 1.14.4

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

@@ -1,4 +1,4 @@
-webshims.register('jme', function($, webshims, window, doc, undefined){
+webshims.register('jmebase', function($, webshims, window, doc, undefined){
 	"use strict";
 	var props = {};
 	var fns = {};
@@ -9,8 +9,11 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 	
 	webshims.cfg.mediaelement.jme = options;
 
+	if(!$.jme){
+		$.jme = {};
+	}
 
-	$.jme = {
+	$.extend($.jme, {
 		pluginsClasses: [],
 		pluginsSel: '',
 		plugins: {},
@@ -56,6 +59,10 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 			}
 			this.runPlugin('.'+plugin.className);
 		},
+		configmenuPlugins: {},
+		addToConfigmenu: function(name, create){
+			this.configmenuPlugins[name] = create;
+		},
 		defineMethod: function(name, fn){
 			fns[name] = fn;
 		},
@@ -95,7 +102,7 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 				}
 			}
 		}
-	};
+	});
 
 	$.fn.jmeProp = function(name, value){
 		return $.access( this, $.jme.prop, name, value, arguments.length > 1 );
@@ -105,6 +112,10 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 		var args = slice.call( arguments, 1 );
 		var ret;
 		this.each(function(){
+			if(!$.jme.data(this).media){
+				$(this).closest(baseSelector).jmePlayer();
+				webshims.warn('jmeFn called to early or on wrong element!');
+			}
 			ret = (fns[fn] || $.prop(this, fn)).apply(this, args);
 			if(ret !== undefined){
 				return false;
@@ -182,11 +193,9 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 	$.fn.jmePlayer = function(opts){
 
 		return this.each(function(){
-			if(opts){
-				$.jme.data(this, $.extend(true, {}, opts));
-			}
 
-			var mediaUpdateFn, canPlay, removeCanPlay, canplayTimer, lastState, stopEmptiedEvent;
+
+			var mediaUpdateFn, canPlay, removeCanPlay, canplayTimer, lastState, stopEmptiedEvent, forceRender;
 			var media = $('audio, video', this).eq(0);
 			var base = $(this);
 
@@ -198,7 +207,9 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 			mediaData.player = base;
 			mediaData.media = media;
 			if(!jmeData.media){
-
+				forceRender = function(){
+					base[0].className = base[0].className;
+				};
 				removeCanPlay = function(){
 					media.off('canplay', canPlay);
 					clearTimeout(canplayTimer);
@@ -257,6 +268,7 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 					if(state){
 						lastState = state;
 						base.attr('data-state', state);
+						setTimeout(forceRender);
 					}
 				};
 
@@ -340,16 +352,16 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 				return [{src: src}];
 			}
 			srces = $.map($('source', data.media).get(), function(source){
+				var i, len;
 				var src = {
 					src: $.prop(source, 'src')
 				};
-				var tmp = $.attr(source, 'media');
-				if(tmp){
-					src.media = tmp;
-				}
-				tmp = $.attr(source, 'type');
-				if(tmp){
-					src.type = tmp;
+				var attributes = source.attributes;
+
+				for(i = 0, len = attributes.length; i < len; i++){
+					if(!('specified' in attributes[i]) || attributes[i].specified){
+						src[attributes[i].nodeName] = attributes[i].nodeValue;
+					}
 				}
 				return src;
 			});
@@ -421,18 +433,17 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 			data.player.triggerHandler('controlsadded');
 		}
 	});
-	webshims.isReady('jme', true);
-	webshims.addReady($.jme.initJME);
-	webshims._polyfill(['mediaelement']);
-	webshims.isReady('jme-base', true);
-
-	if(webshims.cfg.debug !== false){
-		$(function(){
-			if(document.getElementsByTagName('video').length && !document.querySelector(baseSelector)){
-				webshims.warn("found video element but video wasn't wrapped inside a ."+ baseSelector +" element. Will not add control UI");
-			}
-		});
-	}
+
+	webshims.ready('DOM mediaelement', function(){
+		webshims.isReady('jme', true);
+		webshims.addReady($.jme.initJME);
+		webshims.isReady('jme-base', true);
+
+		if(webshims.cfg.debug !== false && document.getElementsByTagName('video').length && !document.querySelector(baseSelector)){
+			webshims.warn("found video element but video wasn't wrapped inside a ."+ baseSelector +" element. Will not add control UI");
+		}
+	});
+
 });
 ;webshims.register('mediacontrols', function($, webshims, window){
 	"use strict";
@@ -441,9 +452,9 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 	var options = webshims.cfg.mediaelement.jme;
 	var baseSelector = options.selector;
 	var jme = $.jme;
-	var unknowStructure = '<div class="{%class%}"></div>'
+	var unknownStructure = '<div class="{%class%}"></div>';
 	var btnStructure = '<button class="{%class%}" type="button" aria-label="{%text%}"></button>';
-	var slideStructure = '<div class="{%class%} media-range"></div>';
+	var slideStructure = '<div class="{%class%} media-range" aria-label="{%text%}"></div>';
 	var timeStructure = '<div  class="{%class%}">00:00</div>';
 
 	var noVolumeClass = (function(){
@@ -475,7 +486,7 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 					if(plugin){
 						if(!plugin.structure){
 							webshims.warn('no structure option provided for plugin: '+ matchName +'. Fallback to standard div');
-							plugin.structure = unknowStructure;
+							plugin.structure = unknownStructure;
 						}
 						return plugin.structure.replace('{%class%}', matchName).replace('{%text%}', plugin.text || '');
 					}
@@ -580,18 +591,55 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 							}
 						};
 					})();
+					var $poster = $('<div class="ws-poster" />').insertAfter(data.media);
 					var posterState = (function(){
-						var lastPosterState, lastYoutubeState;
+						var lastPosterState, lastYoutubeState, lastPoster;
 						var hasFlash = window.swfmini && swfmini.hasFlashPlayerVersion('10.0.3');
 						var regYt = /youtube\.com\/[watch\?|v\/]+/i;
+
+						var isInitial = data.media.prop('paused');
+						if(isInitial){
+							data.player.addClass('initial-state');
+						}
+						if(!('backgroundSize' in $poster[0].style)){
+							data.player.addClass('no-backgroundsize');
+						}
+						data.media.on('playing waiting seeked seeking', function(){
+							if(isInitial){
+								isInitial = false;
+								data.player.removeClass('initial-state');
+							}
+						});
 						return function(){
-							var hasPoster = !!data.media.attr('poster');
-							var hasYt = (hasFlash && hasPoster) ? false : regYt.test(data.media.prop('currentSrc') || '');
+							var poster = data.media.attr('poster');
+							var hasPoster = !!poster;
+							var currentSrc = data.media.prop('currentSrc') || '';
+							var isYt = regYt.test(currentSrc);
+							var hasYt = (hasFlash && hasPoster) ? false : isYt;
+
+							if(!hasPoster && isYt){
+								poster =  currentSrc.match(/(?:youtube\.com\/(?:[^\/]+\/.+\/|(?:v|e(?:mbed)?)\/|.*[?&]v=)|youtu\.be\/)([^"&?\/ ]{11})/i) || '';
+								if(poster){
+									poster = 'https://img.youtube.com/vi/'+ poster[1] +'/0.jpg';
+									hasPoster = !!poster;
+								}
+							}
+
+							if(lastPoster !== poster){
+								lastPoster = poster;
+								$poster[0].style.backgroundImage = poster ? 'url('+poster+')' : '';
+							}
+
 							if(lastPosterState !== hasPoster){
 								lastPosterState = hasPoster;
 								data.player[hasPoster ? 'removeClass' : 'addClass']('no-poster');
 							}
 
+							if(data.media.prop('paused')){
+								data.player.addClass('initial-state');
+								isInitial = true;
+							}
+
 							if(lastYoutubeState !== hasYt){
 								lastYoutubeState = hasYt;
 								data.player[hasYt ? 'addClass' : 'removeClass']('has-ytposter');
@@ -602,13 +650,15 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 
 					userActivity._create(data.player, data.media, data.player);
 
-					data.media.on('emptied', posterState);
+					data.media.on('emptied loadstart', function(){
+						setTimeout(posterState);
+					});
 
 					playerSize();
 					posterState();
 					webshims.ready('dom-support', function(){
 						data.player.onWSOff('updateshadowdom', playerSize);
-						controls.add(data._controlbar).addClass(webshims.shadowClass);
+						controls.add(data._controlbar).add($poster).addClass(webshims.shadowClass);
 						webshims.addShadowDom();
 					});
 				}
@@ -641,7 +691,7 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 
 	jme.registerPlugin('volume-slider', {
 		structure: slideStructure,
-
+		text: 'volume level',
 		_create: lazyLoadPlugin()
 	});
 
@@ -651,6 +701,7 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 		options: {
 			format: ['mm', 'ss']
 		},
+		text: 'time position',
 		_create: lazyLoadPlugin()
 	});
 
@@ -725,12 +776,18 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 		_create: lazyLoadPlugin()
 	});
 
+	jme.registerPlugin('mediaconfigmenu', {
+		structure: btnStructure,
+		text: 'configuration',
+		_create: lazyLoadPlugin()
+	});
+
 
 	jme.registerPlugin('captions', {
 		structure: btnStructure,
 		text: 'subtitles',
 		_create: function(control, media, base){
-			var trackElems = media.find('track');
+			var trackElems = media.find('track').filter(':not([kind]), [kind="subtitles"], [data-kind="subtitles"], [kind="captions"], [data-kind="captions"]');
 			control.wsclonedcheckbox = $(control).clone().attr({role: 'checkbox'}).insertBefore(control);
 			base.attr('data-tracks', trackElems.length > 1 ? 'many' : trackElems.length);
 			control.attr('aria-haspopup', 'true');
@@ -738,9 +795,26 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 		}
 	});
 
+
+	jme.registerPlugin('chapters', {
+		structure: btnStructure,
+		text: 'chapters',
+		_create: function(control, media, base){
+			var trackElems = media.find('track').filter('[kind="chapters"], [data-kind="chapters"]');
+			control.attr('aria-haspopup', 'true');
+			if(trackElems.length){
+				webshims._polyfill(['track']);
+				base.addClass('has-chapter-tracks');
+			}
+			lazyLoadPlugin().apply(this, arguments);
+		}
+	});
+
+
+
 	webshims.ready(webshims.cfg.mediaelement.plugins.concat(['mediaelement', 'jme-base']), function(){
 		if(!options.barTemplate){
-			options.barTemplate = '<div class="play-pause-container">{{play-pause}}</div><div class="playlist-container"><div class="playlist-box">{{playlist-prev}}{{playlist-next}}</div></div><div class="currenttime-container">{{currenttime-display}}</div><div class="progress-container">{{time-slider}}</div><div class="duration-container">{{duration-display}}</div><div class="mute-container">{{mute-unmute}}</div><div class="volume-container">{{volume-slider}}</div><div class="subtitle-container"><div class="subtitle-controls">{{captions}}</div></div><div class="fullscreen-container">{{fullscreen}}</div>';
+			options.barTemplate = '<div class="play-pause-container">{{play-pause}}</div><div class="playlist-container"><div class="playlist-box"><div class="playlist-button-container">{{playlist-prev}}</div><div class="playlist-button-container">{{playlist-next}}</div></div></div><div class="currenttime-container">{{currenttime-display}}</div><div class="progress-container">{{time-slider}}</div><div class="duration-container">{{duration-display}}</div><div class="mute-container">{{mute-unmute}}</div><div class="volume-container">{{volume-slider}}</div><div class="chapters-container"><div class="chapters-controls mediamenu-wrapper">{{chapters}}</div></div><div class="subtitle-container mediamenu-wrapper"><div class="subtitle-controls">{{captions}}</div></div><div class="mediaconfig-container"><div class="mediaconfig-controls mediamenu-wrapper">{{mediaconfigmenu}}</div></div><div class="fullscreen-container">{{fullscreen}}</div>';
 		}
 		if(!options.barStructure){
 			options.barStructure = '<div class="jme-media-overlay"></div><div class="jme-controlbar'+ noVolumeClass +'" tabindex="-1"><div class="jme-cb-box"></div></div>';
@@ -752,7 +826,7 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 	});
 	webshims.ready('WINDOWLOAD', loadLazy);
 });
-;webshims.ready('jme DOM', function(){
+;webshims.ready('jme-base DOM', function(){
 	"use strict";
 	var webshims = window.webshims;
 	var $ = webshims.$;
@@ -1139,7 +1213,9 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 			$.each(item.tracks || [], function(i, track){
 				$('<track />').attr(track).appendTo(media);
 			});
-
+			if(!item.srces){
+				item.srces = item;
+			}
 			media.jmeProp('srces', item.srces);
 		},
 		_getItem: function(item){

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

@@ -1,4 +1,4 @@
-webshims.register('jme', function($, webshims, window, doc, undefined){
+webshims.register('jmebase', function($, webshims, window, doc, undefined){
 	"use strict";
 	var props = {};
 	var fns = {};
@@ -9,8 +9,11 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 	
 	webshims.cfg.mediaelement.jme = options;
 
+	if(!$.jme){
+		$.jme = {};
+	}
 
-	$.jme = {
+	$.extend($.jme, {
 		pluginsClasses: [],
 		pluginsSel: '',
 		plugins: {},
@@ -56,6 +59,10 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 			}
 			this.runPlugin('.'+plugin.className);
 		},
+		configmenuPlugins: {},
+		addToConfigmenu: function(name, create){
+			this.configmenuPlugins[name] = create;
+		},
 		defineMethod: function(name, fn){
 			fns[name] = fn;
 		},
@@ -95,7 +102,7 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 				}
 			}
 		}
-	};
+	});
 
 	$.fn.jmeProp = function(name, value){
 		return $.access( this, $.jme.prop, name, value, arguments.length > 1 );
@@ -105,6 +112,10 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 		var args = slice.call( arguments, 1 );
 		var ret;
 		this.each(function(){
+			if(!$.jme.data(this).media){
+				$(this).closest(baseSelector).jmePlayer();
+				webshims.warn('jmeFn called to early or on wrong element!');
+			}
 			ret = (fns[fn] || $.prop(this, fn)).apply(this, args);
 			if(ret !== undefined){
 				return false;
@@ -182,11 +193,9 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 	$.fn.jmePlayer = function(opts){
 
 		return this.each(function(){
-			if(opts){
-				$.jme.data(this, $.extend(true, {}, opts));
-			}
 
-			var mediaUpdateFn, canPlay, removeCanPlay, canplayTimer, lastState, stopEmptiedEvent;
+
+			var mediaUpdateFn, canPlay, removeCanPlay, canplayTimer, lastState, stopEmptiedEvent, forceRender;
 			var media = $('audio, video', this).eq(0);
 			var base = $(this);
 
@@ -198,7 +207,9 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 			mediaData.player = base;
 			mediaData.media = media;
 			if(!jmeData.media){
-
+				forceRender = function(){
+					base[0].className = base[0].className;
+				};
 				removeCanPlay = function(){
 					media.off('canplay', canPlay);
 					clearTimeout(canplayTimer);
@@ -257,6 +268,7 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 					if(state){
 						lastState = state;
 						base.attr('data-state', state);
+						setTimeout(forceRender);
 					}
 				};
 
@@ -340,16 +352,16 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 				return [{src: src}];
 			}
 			srces = $.map($('source', data.media).get(), function(source){
+				var i, len;
 				var src = {
 					src: $.prop(source, 'src')
 				};
-				var tmp = $.attr(source, 'media');
-				if(tmp){
-					src.media = tmp;
-				}
-				tmp = $.attr(source, 'type');
-				if(tmp){
-					src.type = tmp;
+				var attributes = source.attributes;
+
+				for(i = 0, len = attributes.length; i < len; i++){
+					if(!('specified' in attributes[i]) || attributes[i].specified){
+						src[attributes[i].nodeName] = attributes[i].nodeValue;
+					}
 				}
 				return src;
 			});
@@ -421,18 +433,17 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 			data.player.triggerHandler('controlsadded');
 		}
 	});
-	webshims.isReady('jme', true);
-	webshims.addReady($.jme.initJME);
-	webshims._polyfill(['mediaelement']);
-	webshims.isReady('jme-base', true);
-
-	if(webshims.cfg.debug !== false){
-		$(function(){
-			if(document.getElementsByTagName('video').length && !document.querySelector(baseSelector)){
-				webshims.warn("found video element but video wasn't wrapped inside a ."+ baseSelector +" element. Will not add control UI");
-			}
-		});
-	}
+
+	webshims.ready('DOM mediaelement', function(){
+		webshims.isReady('jme', true);
+		webshims.addReady($.jme.initJME);
+		webshims.isReady('jme-base', true);
+
+		if(webshims.cfg.debug !== false && document.getElementsByTagName('video').length && !document.querySelector(baseSelector)){
+			webshims.warn("found video element but video wasn't wrapped inside a ."+ baseSelector +" element. Will not add control UI");
+		}
+	});
+
 });
 ;webshims.register('mediacontrols', function($, webshims, window){
 	"use strict";
@@ -441,9 +452,9 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 	var options = webshims.cfg.mediaelement.jme;
 	var baseSelector = options.selector;
 	var jme = $.jme;
-	var unknowStructure = '<div class="{%class%}"></div>'
+	var unknownStructure = '<div class="{%class%}"></div>';
 	var btnStructure = '<button class="{%class%}" type="button" aria-label="{%text%}"></button>';
-	var slideStructure = '<div class="{%class%} media-range"></div>';
+	var slideStructure = '<div class="{%class%} media-range" aria-label="{%text%}"></div>';
 	var timeStructure = '<div  class="{%class%}">00:00</div>';
 
 	var noVolumeClass = (function(){
@@ -475,7 +486,7 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 					if(plugin){
 						if(!plugin.structure){
 							webshims.warn('no structure option provided for plugin: '+ matchName +'. Fallback to standard div');
-							plugin.structure = unknowStructure;
+							plugin.structure = unknownStructure;
 						}
 						return plugin.structure.replace('{%class%}', matchName).replace('{%text%}', plugin.text || '');
 					}
@@ -580,18 +591,55 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 							}
 						};
 					})();
+					var $poster = $('<div class="ws-poster" />').insertAfter(data.media);
 					var posterState = (function(){
-						var lastPosterState, lastYoutubeState;
+						var lastPosterState, lastYoutubeState, lastPoster;
 						var hasFlash = window.swfmini && swfmini.hasFlashPlayerVersion('10.0.3');
 						var regYt = /youtube\.com\/[watch\?|v\/]+/i;
+
+						var isInitial = data.media.prop('paused');
+						if(isInitial){
+							data.player.addClass('initial-state');
+						}
+						if(!('backgroundSize' in $poster[0].style)){
+							data.player.addClass('no-backgroundsize');
+						}
+						data.media.on('playing waiting seeked seeking', function(){
+							if(isInitial){
+								isInitial = false;
+								data.player.removeClass('initial-state');
+							}
+						});
 						return function(){
-							var hasPoster = !!data.media.attr('poster');
-							var hasYt = (hasFlash && hasPoster) ? false : regYt.test(data.media.prop('currentSrc') || '');
+							var poster = data.media.attr('poster');
+							var hasPoster = !!poster;
+							var currentSrc = data.media.prop('currentSrc') || '';
+							var isYt = regYt.test(currentSrc);
+							var hasYt = (hasFlash && hasPoster) ? false : isYt;
+
+							if(!hasPoster && isYt){
+								poster =  currentSrc.match(/(?:youtube\.com\/(?:[^\/]+\/.+\/|(?:v|e(?:mbed)?)\/|.*[?&]v=)|youtu\.be\/)([^"&?\/ ]{11})/i) || '';
+								if(poster){
+									poster = 'https://img.youtube.com/vi/'+ poster[1] +'/0.jpg';
+									hasPoster = !!poster;
+								}
+							}
+
+							if(lastPoster !== poster){
+								lastPoster = poster;
+								$poster[0].style.backgroundImage = poster ? 'url('+poster+')' : '';
+							}
+
 							if(lastPosterState !== hasPoster){
 								lastPosterState = hasPoster;
 								data.player[hasPoster ? 'removeClass' : 'addClass']('no-poster');
 							}
 
+							if(data.media.prop('paused')){
+								data.player.addClass('initial-state');
+								isInitial = true;
+							}
+
 							if(lastYoutubeState !== hasYt){
 								lastYoutubeState = hasYt;
 								data.player[hasYt ? 'addClass' : 'removeClass']('has-ytposter');
@@ -602,13 +650,15 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 
 					userActivity._create(data.player, data.media, data.player);
 
-					data.media.on('emptied', posterState);
+					data.media.on('emptied loadstart', function(){
+						setTimeout(posterState);
+					});
 
 					playerSize();
 					posterState();
 					webshims.ready('dom-support', function(){
 						data.player.onWSOff('updateshadowdom', playerSize);
-						controls.add(data._controlbar).addClass(webshims.shadowClass);
+						controls.add(data._controlbar).add($poster).addClass(webshims.shadowClass);
 						webshims.addShadowDom();
 					});
 				}
@@ -641,7 +691,7 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 
 	jme.registerPlugin('volume-slider', {
 		structure: slideStructure,
-
+		text: 'volume level',
 		_create: lazyLoadPlugin()
 	});
 
@@ -651,6 +701,7 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 		options: {
 			format: ['mm', 'ss']
 		},
+		text: 'time position',
 		_create: lazyLoadPlugin()
 	});
 
@@ -725,12 +776,18 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 		_create: lazyLoadPlugin()
 	});
 
+	jme.registerPlugin('mediaconfigmenu', {
+		structure: btnStructure,
+		text: 'configuration',
+		_create: lazyLoadPlugin()
+	});
+
 
 	jme.registerPlugin('captions', {
 		structure: btnStructure,
 		text: 'subtitles',
 		_create: function(control, media, base){
-			var trackElems = media.find('track');
+			var trackElems = media.find('track').filter(':not([kind]), [kind="subtitles"], [data-kind="subtitles"], [kind="captions"], [data-kind="captions"]');
 			control.wsclonedcheckbox = $(control).clone().attr({role: 'checkbox'}).insertBefore(control);
 			base.attr('data-tracks', trackElems.length > 1 ? 'many' : trackElems.length);
 			control.attr('aria-haspopup', 'true');
@@ -738,9 +795,26 @@ webshims.register('jme', function($, webshims, window, doc, undefined){
 		}
 	});
 
+
+	jme.registerPlugin('chapters', {
+		structure: btnStructure,
+		text: 'chapters',
+		_create: function(control, media, base){
+			var trackElems = media.find('track').filter('[kind="chapters"], [data-kind="chapters"]');
+			control.attr('aria-haspopup', 'true');
+			if(trackElems.length){
+				webshims._polyfill(['track']);
+				base.addClass('has-chapter-tracks');
+			}
+			lazyLoadPlugin().apply(this, arguments);
+		}
+	});
+
+
+
 	webshims.ready(webshims.cfg.mediaelement.plugins.concat(['mediaelement', 'jme-base']), function(){
 		if(!options.barTemplate){
-			options.barTemplate = '<div class="play-pause-container">{{play-pause}}</div><div class="playlist-container"><div class="playlist-box">{{playlist-prev}}{{playlist-next}}</div></div><div class="currenttime-container">{{currenttime-display}}</div><div class="progress-container">{{time-slider}}</div><div class="duration-container">{{duration-display}}</div><div class="mute-container">{{mute-unmute}}</div><div class="volume-container">{{volume-slider}}</div><div class="subtitle-container"><div class="subtitle-controls">{{captions}}</div></div><div class="fullscreen-container">{{fullscreen}}</div>';
+			options.barTemplate = '<div class="play-pause-container">{{play-pause}}</div><div class="playlist-container"><div class="playlist-box"><div class="playlist-button-container">{{playlist-prev}}</div><div class="playlist-button-container">{{playlist-next}}</div></div></div><div class="currenttime-container">{{currenttime-display}}</div><div class="progress-container">{{time-slider}}</div><div class="duration-container">{{duration-display}}</div><div class="mute-container">{{mute-unmute}}</div><div class="volume-container">{{volume-slider}}</div><div class="chapters-container"><div class="chapters-controls mediamenu-wrapper">{{chapters}}</div></div><div class="subtitle-container mediamenu-wrapper"><div class="subtitle-controls">{{captions}}</div></div><div class="mediaconfig-container"><div class="mediaconfig-controls mediamenu-wrapper">{{mediaconfigmenu}}</div></div><div class="fullscreen-container">{{fullscreen}}</div>';
 		}
 		if(!options.barStructure){
 			options.barStructure = '<div class="jme-media-overlay"></div><div class="jme-controlbar'+ noVolumeClass +'" tabindex="-1"><div class="jme-cb-box"></div></div>';

data/vendor/assets/javascripts/webshims/shims/dom-extend.js

@@ -62,7 +62,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	var supportHrefNormalized = !('hrefNormalized' in $.support) || $.support.hrefNormalized;
 	var supportGetSetAttribute = !('getSetAttribute' in $.support) || $.support.getSetAttribute;
 	var has = Object.prototype.hasOwnProperty;
-	webshims.assumeARIA = supportGetSetAttribute || Modernizr.canvas || Modernizr.video || Modernizr.boxsizing;
+	webshims.assumeARIA = true;
 	
 	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");
@@ -81,15 +81,6 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				}
 				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);
@@ -418,7 +409,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		var UNKNOWN = webshims.getPrototypeOf(document.createElement('foobar'));
 		
 		//see also: https://github.com/lojjic/PIE/issues/40 | https://prototype.lighthouseapp.com/projects/8886/tickets/1107-ie8-fatal-crash-when-prototypejs-is-loaded-with-rounded-cornershtc
-		var isExtendNativeSave = Modernizr.advancedObjectProperties && Modernizr.objectAccessor;
+		var isExtendNativeSave = webshims.support.advancedObjectProperties && webshims.support.objectAccessor;
 		return function(nodeName, prop, desc){
 			var elem , elemProto;
 			 if( isExtendNativeSave && (elem = document.createElement(nodeName)) && (elemProto = webshims.getPrototypeOf(elem)) && UNKNOWN !== elemProto && ( !elem[prop] || !has.call(elem, prop) ) ){
@@ -729,7 +720,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 							});
 						}
 						webshims.ready('WINDOWLOAD', this.test);
-						$(document).on('updatelayout.webshim pageinit popupafteropen panelbeforeopen tabsactivate collapsibleexpand shown.bs.modal shown.bs.collapse slid.bs.carousel', this.handler);
+						$(document).on('updatelayout.webshim pageinit popupafteropen panelbeforeopen tabsactivate collapsibleexpand shown.bs.modal shown.bs.collapse slid.bs.carousel playerdimensionchange', this.handler);
 						$(window).on('resize', this.handler);
 					}
 				}