enmi-conf.org: comparison wp/wp-includes/js/mediaelement/mediaelement-and-player.js

Mercurial Mercurial > enmi-conf.org / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

wp/wp-includes/js/mediaelement/mediaelement-and-player.js

changeset 21	48c4eec2b7e6
parent 18	be944660c56a

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var mejs = {};
-mejs.version = '4.2.16';
+mejs.version = '4.2.17';
 mejs.html5media = {
 	properties: ['volume', 'src', 'currentTime', 'muted', 'duration', 'paused', 'ended', 'buffered', 'error', 'networkState', 'readyState', 'seeking', 'seekable', 'currentSrc', 'preload', 'bufferedBytes', 'bufferedTime', 'initialTime', 'startOffsetTime', 'defaultPlaybackRate', 'playbackRate', 'played', 'autoplay', 'loop', 'controls'],
 	readOnlyProperties: ['duration', 'paused', 'ended', 'buffered', 'error', 'networkState', 'readyState', 'seeking', 'seekable'],
 		if (!t.isVideo) {
 			return;
 		}
-		if (t.options.useFakeFullscreen === false && Features.IS_IOS && Features.HAS_IOS_FULLSCREEN && typeof t.media.originalNode.webkitEnterFullscreen === 'function' && t.media.originalNode.canPlayType((0, _media.getTypeFromFile)(t.media.getSrc()))) {
+		if (t.options.useFakeFullscreen === false && (Features.IS_IOS || Features.IS_SAFARI) && Features.HAS_IOS_FULLSCREEN && typeof t.media.originalNode.webkitEnterFullscreen === 'function' && t.media.originalNode.canPlayType((0, _media.getTypeFromFile)(t.media.getSrc()))) {
 			t.media.originalNode.webkitEnterFullscreen();
 			return;
 		}
 		(0, _dom.addClass)(_document2.default.documentElement, t.options.classPrefix + 'fullscreen');
 		}
 	},
 	dfxp: {
 		parse: function parse(trackText) {
-			trackText = $(trackText).filter('tt');
+			var trackElem = _document2.default.adoptNode(new DOMParser().parseFromString(trackText, 'application/xml').documentElement),
-			var container = trackText.firstChild,
+			    container = trackElem.querySelector('div'),
 			    lines = container.querySelectorAll('p'),
-			    styleNode = trackText.getElementById('' + container.attr('style')),
+			    styleNode = _document2.default.getElementById(container.getAttribute('style')),
 			    entries = [];
 			var styles = void 0;
-			if (styleNode.length) {
+			if (styleNode) {
 				styleNode.removeAttribute('id');
 				var attributes = styleNode.attributes;
 				if (attributes.length) {
 					styles = {};
 					for (var i = 0, total = attributes.length; i < total; i++) {
 					stop: null,
 					style: null,
 					text: null
 				};
-				if (lines.eq(_i16).attr('begin')) {
+				if (lines[_i16].getAttribute('begin')) {
-					_temp.start = (0, _time.convertSMPTEtoSeconds)(lines.eq(_i16).attr('begin'));
+					_temp.start = (0, _time.convertSMPTEtoSeconds)(lines[_i16].getAttribute('begin'));
 				}
-				if (!_temp.start && lines.eq(_i16 - 1).attr('end')) {
+				if (!_temp.start && lines[_i16 - 1].getAttribute('end')) {
-					_temp.start = (0, _time.convertSMPTEtoSeconds)(lines.eq(_i16 - 1).attr('end'));
+					_temp.start = (0, _time.convertSMPTEtoSeconds)(lines[_i16 - 1].getAttribute('end'));
 				}
-				if (lines.eq(_i16).attr('end')) {
+				if (lines[_i16].getAttribute('end')) {
-					_temp.stop = (0, _time.convertSMPTEtoSeconds)(lines.eq(_i16).attr('end'));
+					_temp.stop = (0, _time.convertSMPTEtoSeconds)(lines[_i16].getAttribute('end'));
 				}
-				if (!_temp.stop && lines.eq(_i16 + 1).attr('begin')) {
+				if (!_temp.stop && lines[_i16 + 1].getAttribute('begin')) {
-					_temp.stop = (0, _time.convertSMPTEtoSeconds)(lines.eq(_i16 + 1).attr('begin'));
+					_temp.stop = (0, _time.convertSMPTEtoSeconds)(lines[_i16 + 1].getAttribute('begin'));
 				}
 				if (styles) {
 					style = '';
 					for (var _style in styles) {
-						style += _style + ':' + styles[_style] + ';';
+						style += _style + ': ' + styles[_style] + ';';
 					}
 				}
 				if (style) {
 					_temp.style = style;
 				}
 				if (_temp.start === 0) {
 					_temp.start = 0.200;
 				}
-				_temp.text = lines.eq(_i16).innerHTML.trim().replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig, "<a href='$1' target='_blank'>$1</a>");
+				_temp.text = lines[_i16].innerHTML.trim().replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_| !:, .; ]*[-A-Z0-9+&@#\/%=~_|])/ig, "<a href='$1' target='_blank'>$1</a>");
 				entries.push(_temp);
 			}
 			return entries;
 		}
 	}
 			if (t.muted) {
 				positionVolumeHandle(0);
 				(0, _dom.removeClass)(mute, t.options.classPrefix + 'mute');
 				(0, _dom.addClass)(mute, t.options.classPrefix + 'unmute');
 			} else {
 				positionVolumeHandle(media.volume);
 				(0, _dom.removeClass)(mute, t.options.classPrefix + 'unmute');
 				(0, _dom.addClass)(mute, t.options.classPrefix + 'mute');
 			}
 		};
 			if (!modified) {
 				setTimeout(function () {
 					rendered = true;
 					if (player.options.startVolume === 0 || media.originalNode.muted) {
 						media.setMuted(true);
-						player.options.startVolume = 0;
 					}
 					media.setVolume(player.options.startVolume);
 					t.setControlsSize();
 				}, 250);
 			}
 			setTimeout(function () {
 				if (!modified && !rendered) {
 					if (player.options.startVolume === 0 || media.originalNode.muted) {
 						media.setMuted(true);
 					}
+					if (player.options.startVolume === 0) {
+						player.options.startVolume = 0;
+					}
 					media.setVolume(player.options.startVolume);
 					t.setControlsSize();
 				}
 				rendered = false;
 			}, 250);
 		});
 		if (player.options.startVolume === 0 || media.originalNode.muted) {
 			media.setMuted(true);
-			player.options.startVolume = 0;
+			if (player.options.startVolume === 0) {
+				player.options.startVolume = 0;
+			}
 			toggleMute();
 		}
 		t.getElement(t.container).addEventListener('controlsresize', function () {
 			toggleMute();
 		key: '_meReady',
 		value: function _meReady(media, domNode) {
 			var t = this,
 			    autoplayAttr = domNode.getAttribute('autoplay'),
 			    autoplay = !(autoplayAttr === undefined || autoplayAttr === null || autoplayAttr === 'false'),
-			    isNative = media.rendererName !== null && /(native|html5)/i.test(t.media.rendererName);
+			    isNative = media.rendererName !== null && /(native|html5)/i.test(media.rendererName);
 			if (t.getElement(t.controls)) {
 				t.enableControls();
 			}
 				} else {
 					return t.options.defaultAudioHeight;
 				}
 			}(),
 			    aspectRatio = function () {
+				if (!t.options.enableAutosize) {
+					return t.initialAspectRatio;
+				}
 				var ratio = 1;
 				if (!t.isVideo) {
 					return ratio;
 				}
 			delete _mejs2.default.players[t.id];
 			if (_typeof(t.getElement(t.container)) === 'object') {
 				var offscreen = t.getElement(t.container).parentNode.querySelector('.' + t.options.classPrefix + 'offscreen');
-				offscreen.remove();
+				if (offscreen) {
+					offscreen.remove();
+				}
 				t.getElement(t.container).remove();
 			}
 			t.globalUnbind('resize', t.globalResizeCallback);
 			t.globalUnbind('keydown', t.globalKeydownCallback);
 			t.globalUnbind('click', t.globalClickCallback);
 			id: youtube.id,
 			containerId: youtubeContainer.id,
 			videoId: videoId,
 			height: height,
 			width: width,
+			host: youtube.options.youtube && youtube.options.youtube.nocookie ? 'https://www.youtube-nocookie.com' : undefined,
 			playerVars: Object.assign({
 				controls: 0,
 				rel: 0,
 				disablekb: 1,
 				showinfo: 0,
 	    normalizedExt = normalizeExtension(ext);
 	var mime = 'video/mp4';
 	if (normalizedExt) {
-		if (~['mp4', 'm4v', 'ogg', 'ogv', 'webm', 'flv', 'mpeg', 'mov'].indexOf(normalizedExt)) {
+		if (~['mp4', 'm4v', 'ogg', 'ogv', 'webm', 'flv', 'mpeg'].indexOf(normalizedExt)) {
 			mime = 'video/' + normalizedExt;
+		} else if ('mov' === normalizedExt) {
+			mime = 'video/quicktime';
 		} else if (~['mp3', 'oga', 'wav', 'mid', 'midi'].indexOf(normalizedExt)) {
 			mime = 'audio/' + normalizedExt;
 		}
 	}

enmi-conf.org