diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js index 23453857f9..ca67cddbe7 100644 --- a/src/controllers/playback/video/index.js +++ b/src/controllers/playback/video/index.js @@ -422,9 +422,6 @@ import 'css!assets/css/videoosd'; elem.classList.remove('hide'); elem.classList.remove('videoOsdBottom-hidden'); - mouseManager.removeIdleClasses(); // Remove Idle Classes To Show Cursor - mouseManager.lastMouseInputTime = new Date().getTime(); // Reset Mouse Input Time - if (!layoutManager.mobile) { setTimeout(function () { focusManager.focus(elem.querySelector('.btnPause')); @@ -440,7 +437,7 @@ import 'css!assets/css/videoosd'; clearHideAnimationEventListeners(elem); elem.classList.add('videoOsdBottom-hidden'); - mouseManager.addIdleClasses(); // Add Idle Classes To Hide Cursor + mouseManager.hideCursor(); dom.addEventListener(elem, transitionEndEventName, onHideAnimationComplete, { once: true diff --git a/src/scripts/mouseManager.js b/src/scripts/mouseManager.js index cc4d5459b5..b3faedbb58 100644 --- a/src/scripts/mouseManager.js +++ b/src/scripts/mouseManager.js @@ -31,6 +31,18 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd } } + function showCursor() { + isMouseIdle = false; + removeIdleClasses(); + events.trigger(self, 'mouseactive'); + } + + function hideCursor() { + isMouseIdle = true; + addIdleClasses(); + events.trigger(self, 'mouseidle'); + } + var lastPointerMoveData; function onPointerMove(e) { var eventX = e.screenX; @@ -62,9 +74,7 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd notifyApp(); if (isMouseIdle) { - isMouseIdle = false; - removeIdleClasses(); - events.trigger(self, 'mouseactive'); + showCursor(); } } @@ -99,9 +109,7 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd function onMouseInterval() { if (!isMouseIdle && mouseIdleTime() >= 5000) { - isMouseIdle = true; - addIdleClasses(); - events.trigger(self, 'mouseidle'); + hideCursor(); } } @@ -157,10 +165,8 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd events.on(layoutManager, 'modechange', initMouse); - // Make Both Idle Class Functions And Last Mouse Input Time Accessible - self.addIdleClasses = addIdleClasses; - self.removeIdleClasses = removeIdleClasses; - self.lastMouseInputTime = lastMouseInputTime; + self.hideCursor = hideCursor; + self.showCursor = showCursor; return self; });