videojs-hotkeys - npm Package Compare versions

Comparing version 0.2.29 to 0.2.30

package.json

 {
 	"name": "videojs-hotkeys",
-	"version": "0.2.29",
+	"version": "0.2.30",
 	"description": "Adds more hotkey support to video.js",
@@ -5,0 +5,0 @@ "author": "Chris Dougherty",

videojs.hotkeys.js

@@ -23,3 +23,3 @@ /*
 	if (typeof window !== "undefined") {
-		window["videojs_hotkeys"] = { version: "0.2.29" };
+		window["videojs_hotkeys"] = { version: "0.2.30" };
 	}
@@ -42,3 +42,3 @@
 			captureDocumentHotkeys: false,
-			documentHotkeysFocusElementFilter: function () {
+			documentHotkeysFocusElementFilter: () => {
 				return false;
@@ -68,3 +68,3 @@ },
 		// Use built-in merge function from Video.js v5.0+ or v4.4.0+
-		var mergeOptions = videojs.obj.merge ||videojs.mergeOptions || videojs.util.mergeOptions;
+		var mergeOptions = videojs.obj?.merge || videojs.mergeOptions || videojs.util.mergeOptions;
 		options = mergeOptions(def_options, options || {});
@@ -99,3 +99,3 @@
 			if (!skipInitialFocus) {
-				player.one("play", function () {
+				player.one("play", () => {
 					pEl.focus(); // Fixes the .vjs-big-play-button handing focus back to body instead of the player
@@ -107,12 +107,13 @@ });
 		if (enableInactiveFocus) {
-			player.on("userinactive", function () {
+			player.on("userinactive", () => {
 				// When the control bar fades, re-apply focus to the player if last focus was a control button
-				var cancelFocusingPlayer = function () {
+				var cancelFocusingPlayer = () => {
 					clearTimeout(focusingPlayerTimeout);
 				};
-				var focusingPlayerTimeout = setTimeout(function () {
+				var focusingPlayerTimeout = setTimeout(() => {
 					player.off("useractive", cancelFocusingPlayer);
 					var activeElement = doc.activeElement;
+					var parentEl = activeElement.parentElement;
 					var controlBar = pEl.querySelector(".vjs-control-bar");
-					if (activeElement && activeElement.parentElement == controlBar) {
+					if (activeElement && (controlBar == parentEl || controlBar == parentEl.parentElement)) {
 						pEl.focus();
@@ -126,3 +127,3 @@ }
 
-		player.on("play", function () {
+		player.on("play", () => {
 			// Fix allowing the YouTube plugin to have hotkey support.
@@ -307,8 +308,8 @@ var ifblocker = pEl.querySelector(".iframeblocker");
 		if (volumeSelector != null) {
-			volumeSelector.onmouseover = function () {
+			volumeSelector.addEventListener("mouseover", () => {
 				volumeHover = true;
-			};
-			volumeSelector.onmouseout = function () {
+			});
+			volumeSelector.addEventListener("mouseout", () => {
 				volumeHover = false;
-			};
+			});
 		}
@@ -440,3 +441,3 @@
 
-			this.dispose = function () {
+			this.dispose = () => {
 				document.removeEventListener("keydown", capDocHK);
@@ -443,0 +444,0 @@ };

videojs.hotkeys.min.js

@@ -1,2 +0,2 @@
-/* videojs-hotkeys v0.2.29 - https://github.com/ctd1500/videojs-hotkeys */
-(n=>{var e;"undefined"!=typeof window&&window.videojs?n(window.videojs):"function"==typeof define&&define.amd?define("videojs-hotkeys",["video.js"],function(e){return n(e.default||e)}):"undefined"!=typeof module&&module.exports&&(e=require("video.js"),module.exports=n(e.default||e))})(function(I){"undefined"!=typeof window&&(window.videojs_hotkeys={version:"0.2.29"});(I.registerPlugin||I.plugin)("hotkeys",function(a){function e(e){var n;n=u?0:y.activeElement,s.controls()&&(q||n==m||n==m.querySelector(".vjs-tech")||n==m.querySelector(".iframeblocker")||n==m.querySelector(".vjs-control-bar")||x)&&r&&(e=window.event||e,n=Math.max(-1,Math.min(1,e.wheelDelta||-e.detail)),e.preventDefault(),1==n?s.volume(s.volume()+k):-1==n&&s.volume(s.volume()-k))}var n,s=this,m=s.el(),y=document,f=1,d=2,v=3,p=4,b=5,h=6,w=7,t=I.obj.merge||I.mergeOptions||I.util.mergeOptions,k=(a=t({volumeStep:.1,seekStep:5,enableMute:!0,enableVolumeScroll:!0,enableHoverScroll:!1,enableFullscreen:!0,enableNumbers:!0,enableJogStyle:!1,alwaysCaptureHotkeys:!1,captureDocumentHotkeys:!1,documentHotkeysFocusElementFilter:function(){return!1},enableModifiersForNumbers:!0,enableInactiveFocus:!0,skipInitialFocus:!1,playPauseKey:function(e){return 32===e.which||179===e.which},rewindKey:function(e){return 37===e.which||177===e.which},forwardKey:function(e){return 39===e.which||176===e.which},volumeUpKey:function(e){return 38===e.which},volumeDownKey:function(e){return 40===e.which},muteKey:function(e){return 77===e.which},fullscreenKey:function(e){return 70===e.which},customKeys:{}},a||{})).volumeStep,o=a.seekStep,S=a.enableMute,r=a.enableVolumeScroll,u=a.enableHoverScroll,K=a.enableFullscreen,F=a.enableNumbers,j=a.enableJogStyle,q=a.alwaysCaptureHotkeys,T=a.captureDocumentHotkeys,E=a.documentHotkeysFocusElementFilter,g=a.enableModifiersForNumbers,t=a.enableInactiveFocus,l=a.skipInitialFocus,i=I.VERSION,c=(m.hasAttribute("tabIndex")||m.setAttribute("tabIndex","-1"),m.style.outline="none",!q&&s.autoplay()||l||s.one("play",function(){m.focus()}),t&&s.on("userinactive",function(){function t(){clearTimeout(e)}var e=setTimeout(function(){s.off("useractive",t);var e=y.activeElement,n=m.querySelector(".vjs-control-bar");e&&e.parentElement==n&&m.focus()},10);s.one("useractive",t)}),s.on("play",function(){var e=m.querySelector(".iframeblocker");e&&""===e.style.display&&(e.style.display="block",e.style.bottom="39px")}),function(e){var n=e.which,t=e.preventDefault.bind(e),o=s.duration();if(s.controls()){var r,u,l,i=y.activeElement;if(q||T&&E(i)||i==m||i==m.querySelector(".vjs-tech")||i==m.querySelector(".vjs-control-bar")||i==m.querySelector(".iframeblocker"))switch(D(e,s)){case f:t(),(q||T)&&e.stopPropagation(),s.paused()?M(s.play()):s.pause();break;case d:r=!s.paused(),t(),r&&s.pause(),u=s.currentTime()-H(e),s.currentTime(u=u<=0?0:u),r&&M(s.play());break;case v:r=!s.paused(),t(),r&&s.pause(),u=s.currentTime()+H(e),s.currentTime(u=o<=u?r?o-.001:o:u),r&&M(s.play());break;case b:t(),j?(u=s.currentTime()-1,s.currentTime()<=1&&(u=0),s.currentTime(u)):s.volume(s.volume()-k);break;case p:t(),j?(u=s.currentTime()+1,s.currentTime(u=o<=u?o:u)):s.volume(s.volume()+k);break;case h:S&&s.muted(!s.muted());break;case w:K&&(s.isFullscreen()?s.exitFullscreen():s.requestFullscreen());break;default:for(l in!(47<n&&n<59||95<n&&n<106)||!g&&(e.metaKey||e.ctrlKey||e.altKey)||F&&(r=48,u=n-(r=95<n?96:r),t(),s.currentTime(s.duration()*u*.1)),a.customKeys){var c=a.customKeys[l];c&&c.key&&c.handler&&c.key(e)&&(t(),c.handler(s,a,e))}}}}),x=!1,l=m.querySelector(".vjs-volume-menu-button")||m.querySelector(".vjs-volume-panel"),D=(null!=l&&(l.onmouseover=function(){x=!0},l.onmouseout=function(){x=!1}),function(e,n){return a.playPauseKey(e,n)?f:a.rewindKey(e,n)?d:a.forwardKey(e,n)?v:a.volumeUpKey(e,n)?p:a.volumeDownKey(e,n)?b:a.muteKey(e,n)?h:a.fullscreenKey(e,n)?w:void 0});function H(e){return"function"==typeof o?o(e):o}function M(e){null!=e&&"function"==typeof e.then&&e.then(null,function(e){})}return T?(n=function(e){c(e)},document.addEventListener("keydown",n),this.dispose=function(){document.removeEventListener("keydown",n)}):s.on("keydown",c),s.on("dblclick",function(e){null!=i&&i<="7.1.0"&&(!s.controls()||(e=e.relatedTarget||e.toElement||y.activeElement)!=m&&e!=m.querySelector(".vjs-tech")&&e!=m.querySelector(".iframeblocker")||K&&(s.isFullscreen()?s.exitFullscreen():s.requestFullscreen()))}),s.on("mousewheel",e),s.on("DOMMouseScroll",e),this})});
+/* videojs-hotkeys v0.2.30 - https://github.com/ctd1500/videojs-hotkeys */
+(t=>{var e;"undefined"!=typeof window&&window.videojs?t(window.videojs):"function"==typeof define&&define.amd?define("videojs-hotkeys",["video.js"],function(e){return t(e.default||e)}):"undefined"!=typeof module&&module.exports&&(e=require("video.js"),module.exports=t(e.default||e))})(function(I){"undefined"!=typeof window&&(window.videojs_hotkeys={version:"0.2.30"});(I.registerPlugin||I.plugin)("hotkeys",function(a){function e(e){var t;t=u?0:y.activeElement,s.controls()&&(q||t==m||t==m.querySelector(".vjs-tech")||t==m.querySelector(".iframeblocker")||t==m.querySelector(".vjs-control-bar")||x)&&r&&(e=window.event||e,t=Math.max(-1,Math.min(1,e.wheelDelta||-e.detail)),e.preventDefault(),1==t?s.volume(s.volume()+k):-1==t&&s.volume(s.volume()-k))}var t,s=this,m=s.el(),y=document,d=1,v=2,f=3,p=4,b=5,h=6,w=7,n=I.obj?.merge||I.mergeOptions||I.util.mergeOptions,k=(a=n({volumeStep:.1,seekStep:5,enableMute:!0,enableVolumeScroll:!0,enableHoverScroll:!1,enableFullscreen:!0,enableNumbers:!0,enableJogStyle:!1,alwaysCaptureHotkeys:!1,captureDocumentHotkeys:!1,documentHotkeysFocusElementFilter:()=>!1,enableModifiersForNumbers:!0,enableInactiveFocus:!0,skipInitialFocus:!1,playPauseKey:function(e){return 32===e.which||179===e.which},rewindKey:function(e){return 37===e.which||177===e.which},forwardKey:function(e){return 39===e.which||176===e.which},volumeUpKey:function(e){return 38===e.which},volumeDownKey:function(e){return 40===e.which},muteKey:function(e){return 77===e.which},fullscreenKey:function(e){return 70===e.which},customKeys:{}},a||{})).volumeStep,o=a.seekStep,S=a.enableMute,r=a.enableVolumeScroll,u=a.enableHoverScroll,K=a.enableFullscreen,F=a.enableNumbers,j=a.enableJogStyle,q=a.alwaysCaptureHotkeys,E=a.captureDocumentHotkeys,T=a.documentHotkeysFocusElementFilter,g=a.enableModifiersForNumbers,n=a.enableInactiveFocus,l=a.skipInitialFocus,i=I.VERSION,c=(m.hasAttribute("tabIndex")||m.setAttribute("tabIndex","-1"),m.style.outline="none",!q&&s.autoplay()||l||s.one("play",()=>{m.focus()}),n&&s.on("userinactive",()=>{var o=()=>{clearTimeout(e)},e=setTimeout(()=>{s.off("useractive",o);var e=y.activeElement,t=e.parentElement,n=m.querySelector(".vjs-control-bar");!e||n!=t&&n!=t.parentElement||m.focus()},10);s.one("useractive",o)}),s.on("play",()=>{var e=m.querySelector(".iframeblocker");e&&""===e.style.display&&(e.style.display="block",e.style.bottom="39px")}),function(e){var t=e.which,n=e.preventDefault.bind(e),o=s.duration();if(s.controls()){var r,u,l,i=y.activeElement;if(q||E&&T(i)||i==m||i==m.querySelector(".vjs-tech")||i==m.querySelector(".vjs-control-bar")||i==m.querySelector(".iframeblocker"))switch(D(e,s)){case d:n(),(q||E)&&e.stopPropagation(),s.paused()?M(s.play()):s.pause();break;case v:r=!s.paused(),n(),r&&s.pause(),u=s.currentTime()-H(e),s.currentTime(u=u<=0?0:u),r&&M(s.play());break;case f:r=!s.paused(),n(),r&&s.pause(),u=s.currentTime()+H(e),s.currentTime(u=o<=u?r?o-.001:o:u),r&&M(s.play());break;case b:n(),j?(u=s.currentTime()-1,s.currentTime()<=1&&(u=0),s.currentTime(u)):s.volume(s.volume()-k);break;case p:n(),j?(u=s.currentTime()+1,s.currentTime(u=o<=u?o:u)):s.volume(s.volume()+k);break;case h:S&&s.muted(!s.muted());break;case w:K&&(s.isFullscreen()?s.exitFullscreen():s.requestFullscreen());break;default:for(l in!(47<t&&t<59||95<t&&t<106)||!g&&(e.metaKey||e.ctrlKey||e.altKey)||F&&(r=48,u=t-(r=95<t?96:r),n(),s.currentTime(s.duration()*u*.1)),a.customKeys){var c=a.customKeys[l];c&&c.key&&c.handler&&c.key(e)&&(n(),c.handler(s,a,e))}}}}),x=!1,l=m.querySelector(".vjs-volume-menu-button")||m.querySelector(".vjs-volume-panel"),D=(null!=l&&(l.addEventListener("mouseover",()=>{x=!0}),l.addEventListener("mouseout",()=>{x=!1})),function(e,t){return a.playPauseKey(e,t)?d:a.rewindKey(e,t)?v:a.forwardKey(e,t)?f:a.volumeUpKey(e,t)?p:a.volumeDownKey(e,t)?b:a.muteKey(e,t)?h:a.fullscreenKey(e,t)?w:void 0});function H(e){return"function"==typeof o?o(e):o}function M(e){null!=e&&"function"==typeof e.then&&e.then(null,function(e){})}return E?(t=function(e){c(e)},document.addEventListener("keydown",t),this.dispose=()=>{document.removeEventListener("keydown",t)}):s.on("keydown",c),s.on("dblclick",function(e){null!=i&&i<="7.1.0"&&(!s.controls()||(e=e.relatedTarget||e.toElement||y.activeElement)!=m&&e!=m.querySelector(".vjs-tech")&&e!=m.querySelector(".iframeblocker")||K&&(s.isFullscreen()?s.exitFullscreen():s.requestFullscreen()))}),s.on("mousewheel",e),s.on("DOMMouseScroll",e),this})});

No alert changes

Improved metrics

Total package byte prevSize

48117

increased by0.11%

Lines of code

548

increased by0.18%

No dependency changes