@latest-thinking/lt-player 1.0.4-m → 1.0.4-o

package/src/components/controls/LTPlayerControlsEvents.ts

@@ -1,7 +1,6 @@
 import {LTPlayer} from "../LTPlayerType";
 import {plyr} from "../../global/types/ModuleTypes";
 
-
 export namespace LTPlayerControlsEvents  {
 
     export class Common {
@@ -9,14 +8,29 @@ export namespace LTPlayerControlsEvents  {
         backwardRewind = {
 
             getSelectors(instance: LTPlayer.LandscapeType | LTPlayer.PortraitType) {
-               return {
+
+               let selectors = {
                    playerContainer: instance.plyr.elements.container,
                    playerControlsContainer: instance.plyr.elements.controls,
                    forwardArea: instance.plyr.elements.controls.querySelector('.lt-player-forward-area'),
                    rewindArea: instance.plyr.elements.controls.querySelector('.lt-player-rewind-area'),
                    forwardAnimation: instance.plyr.elements.controls.querySelector('.lt-player-forward'),
-                   rewindAnimation: instance.plyr.elements.controls.querySelector('.lt-player-rewind')
-               };
+                   rewindAnimation: instance.plyr.elements.controls.querySelector('.lt-player-rewind'),
+                   forwardAreaBackground: null as Element,
+                   rewindAreaBackground:  null as Element,
+                   forwardAnimationBackground:  null as Element,
+                   rewindAnimationBackground:  null as Element,
+
+               }
+
+               if (instance.playerConfig.getDevice() === 'mobile') {
+                   selectors.forwardAreaBackground = instance.plyr.elements.container.querySelector('.plyr__controls__mobile-background').querySelector('.lt-player-forward-area')
+                   selectors.rewindAreaBackground = instance.plyr.elements.container.querySelector('.plyr__controls__mobile-background').querySelector('.lt-player-rewind-area')
+                   selectors.forwardAnimationBackground = instance.plyr.elements.container.querySelector('.plyr__controls__mobile-background').querySelector('.lt-player-forward')
+                   selectors.rewindAnimationBackground = instance.plyr.elements.container.querySelector('.plyr__controls__mobile-background').querySelector('.lt-player-rewind')
+               }
+
+               return selectors
             },
 
             updateCurrentTime(instance: LTPlayer.LandscapeType | LTPlayer.PortraitType ,time: number) {
@@ -29,29 +43,23 @@ export namespace LTPlayerControlsEvents  {
 
             playPause(instance: LTPlayer.LandscapeType | LTPlayer.PortraitType) {
 
-                const playInfoIcon = instance.plyr.elements.controls.querySelector('.player-state__play-icon');
-                const pauseInfoIcon = instance.plyr.elements.controls.querySelector('.player-state__pause-icon');
+                const icons = instance.iconService.getIconsByComponent('playPause') as {play : string, pause: string};
                 const playerStateInfo = instance.plyr.elements.controls.querySelector('.player-state');
+                const iconSelector: HTMLImageElement = playerStateInfo.querySelector('.player-state__icon');
 
                 const removeStateButtons = () => {
                     setTimeout(() => {
                         playerStateInfo.classList.remove('active');
-                        setTimeout(() => {
-                            playInfoIcon.classList.add('d-none');
-                            pauseInfoIcon.classList.add('d-none');
-                        }, 500)
-                    }, 500)
-
+                    }, 200)
                 }
 
-
                 if (instance.plyr.playing) {
-                    pauseInfoIcon.classList.remove('d-none');
+                    iconSelector.src = icons.pause;
                     playerStateInfo.classList.add('active');
                     instance.plyr.togglePlay(false);
                     removeStateButtons();
                 } else {
-                    playInfoIcon.classList.remove('d-none');
+                    iconSelector.src = icons.play;
                     playerStateInfo.classList.add('active');
                     instance.plyr.togglePlay(true);
                     removeStateButtons();
@@ -64,9 +72,58 @@ export namespace LTPlayerControlsEvents  {
 
             animateNotificationOut(selector: Element) {
                 selector.classList.remove('animate-in');
-            }
+            },
         }
 
+        checkTitleBreakWord(instance: LTPlayer.LandscapeType | LTPlayer.PortraitType) {
+            const controlsSelector = instance.plyr.elements.controls;
+            const videoTitle = controlsSelector.querySelector('.poster-paragraph__content');
+            const readButton = controlsSelector.querySelector('.poster-paragraph__button');
+
+            if (!videoTitle) {
+                return;
+            }
+
+            if (videoTitle.scrollHeight <= videoTitle.clientHeight) {
+                readButton.classList.add('d-none');
+                return;
+            }
+
+            const heightContent = videoTitle.scrollHeight;
+
+            const openHide = () => {
+
+                let inlineStyleElement = videoTitle as unknown as ElementCSSInlineStyle
+
+                if (videoTitle.classList.contains('open-content')) {
+                    inlineStyleElement.style.maxHeight = null;
+                    setTimeout(() => {
+                        videoTitle.classList.remove('open-content');
+                    }, 300)
+                    readButton.innerHTML = 'Read more'
+                } else {
+                    readButton.innerHTML = 'Hide'
+                    inlineStyleElement.style.maxHeight = `${heightContent}px`;
+                    videoTitle.classList.add('open-content');
+                }
+            }
+
+            if (readButton) {
+
+                if (instance.playerConfig.getDevice() === 'mobile') {
+                    let mobileEvent: HammerManager = instance.eventInstance.mobileEvents.setMobileEvent(readButton);
+                    mobileEvent.on('singletap', function LTPlayerMobileShowHideTitle() {
+                        openHide();
+                        instance.playerControl.mobileEvents.showControls(instance)
+                    })
+                } else {
+                    readButton.addEventListener('click', function LTPlayerTitleButton() {
+                        openHide();
+                    })
+                }
+            }
+
+        }
 
         playPauseIconTimeUpdate(instance: LTPlayer.LandscapeType | LTPlayer.PortraitType) {
 
@@ -94,7 +151,9 @@ export namespace LTPlayerControlsEvents  {
         constructor() {
             this.common = new Common();
         }
-
+        titleLineBreak(instance: LTPlayer.LandscapeType | LTPlayer.PortraitType) {
+            this.common.checkTitleBreakWord(instance)
+        }
         subtitles(instance: LTPlayer.LandscapeType | LTPlayer.PortraitType) {
 
             const playerContainer = instance.plyr.elements.container;
@@ -128,7 +187,7 @@ export namespace LTPlayerControlsEvents  {
 
 
             controls.addEventListener('mouseleave', function () {
-                controls.classList.remove('plyr__controls-enable')
+                // controls.classList.remove('plyr__controls-enable')
             })
         }
 
@@ -166,9 +225,23 @@ export namespace LTPlayerControlsEvents  {
         }
 
         playPauseIcon(instance: LTPlayer.LandscapeType | LTPlayer.PortraitType, type: string) {
+            let common = this.common;
             switch (type) {
                 case 'timeupdate':
                    this.common.playPauseIconTimeUpdate(instance);
+               break
+                case 'ready':
+                    const playButton = instance.plyr.elements.controls.querySelector('.play-button');
+                    if (playButton) {
+                        playButton.addEventListener('click', function LTPlayerPlayButton() {
+                            if (instance.plyr.playing) {
+                                instance.plyr.togglePlay(false);
+                            } else {
+                                instance.plyr.togglePlay(true);
+                            }
+                            common.playPauseIconTimeUpdate(instance);
+                        })
+                    }
             }
         }
 
@@ -180,22 +253,34 @@ export namespace LTPlayerControlsEvents  {
             if (selectors.forwardArea) {
                 selectors.forwardArea.addEventListener('dblclick', function LTPlayerForwardDbClick(event) {
                     event.preventDefault();
+
+                    const playerState = selectors.playerControlsContainer.querySelector('.lt-player-notification__notification-button-state');
+
+                    if (playerState && !playerState.classList.contains('d-none')) {
+                        playerState.classList.add('d-none');
+                    }
+
                     common.backwardRewind.animateNotificationIn(selectors.forwardAnimation);
                     common.backwardRewind.updateCurrentTime(instance, 10);
                     setTimeout(() => {
-                        common.backwardRewind.animateNotificationOut(selectors.forwardAnimation)
+                        common.backwardRewind.animateNotificationOut(selectors.forwardAnimation);
+                        playerState.classList.remove('d-none');
                     }, 500)
                 })
 
                 selectors.forwardArea.addEventListener('click', function LTPlayerForwardClick(event) {
                     event.preventDefault();
-                    const volumeControlArea = selectors.playerControlsContainer.querySelector('.bottom-controller__volume_control');
 
-                    if (volumeControlArea) {
-                        if (!volumeControlArea.classList.contains('volume-control-enable')) {
-                            common.backwardRewind.playPause(instance);
+                    setTimeout(() => {
+                        const volumeControlArea = selectors.playerControlsContainer.querySelector('.bottom-controller__volume_control');
+
+                        if (volumeControlArea) {
+                            if (!volumeControlArea.classList.contains('volume-control-enable')) {
+                                common.backwardRewind.playPause(instance);
+                            }
                         }
-                    }
+                    }, 100)
+
 
                 })
             }
@@ -204,22 +289,35 @@ export namespace LTPlayerControlsEvents  {
 
                 selectors.rewindArea.addEventListener('dblclick', function LTPlayerRewindDbClick(event) {
                     event.preventDefault();
+
+                    const playerState = selectors.playerControlsContainer.querySelector('.lt-player-notification__notification-button-state');
+
+                    if (playerState && !playerState.classList.contains('d-none')) {
+                        playerState.classList.add('d-none');
+                    }
+
+
                     common.backwardRewind.animateNotificationIn(selectors.rewindAnimation);
                     common.backwardRewind.updateCurrentTime(instance, -10);
                     setTimeout(() => {
-                        common.backwardRewind.animateNotificationOut(selectors.rewindAnimation)
+                        common.backwardRewind.animateNotificationOut(selectors.rewindAnimation);
+                        playerState.classList.remove('d-none');
                     }, 500)
                 })
 
                 selectors.rewindArea.addEventListener('click', function LTPlayerRewindClick(event) {
                     event.preventDefault();
-                    const volumeControlArea = selectors.playerControlsContainer.querySelector('.bottom-controller__volume_control');
 
-                    if (volumeControlArea) {
-                        if (!volumeControlArea.classList.contains('volume-control-enable')) {
-                            common.backwardRewind.playPause(instance);
+                    setTimeout(() => {
+                        const volumeControlArea = selectors.playerControlsContainer.querySelector('.bottom-controller__volume_control');
+
+                        if (volumeControlArea) {
+                            if (!volumeControlArea.classList.contains('volume-control-enable')) {
+                                common.backwardRewind.playPause(instance);
+                            }
                         }
-                    }
+                    }, 100)
+
                 })
 
             }
@@ -434,22 +532,31 @@ export namespace LTPlayerControlsEvents  {
                 clearTimeout(this.controlsTimeOut);
             }
 
-            this.hideControls(instance);
+            this.hideControls(instance, false);
         }
 
-        hideControls(instance: LTPlayer.PortraitType | LTPlayer.LandscapeType) {
+        hideControls(instance: LTPlayer.PortraitType | LTPlayer.LandscapeType, now: boolean) {
             const playerContainer = instance.plyr.elements.container;
             const playerControlsContainer = instance.plyr.elements.controls;
             let playerControlsBackground = playerContainer.querySelector('.plyr__controls__mobile-background');
 
             if (!playerControlsContainer.classList.contains('plyr__controls-enable-addInfo')) {
-                this.controlsTimeOut = setTimeout(() => {
+
+                if (now) {
                     playerControlsContainer.classList.remove('plyr__controls-enable');
                     playerContainer.classList.add('plyr--hide-controls');
                     if (!playerControlsContainer.classList.contains('player-lt__modal__mobile-show-modal')) {
                         playerControlsBackground.classList.remove('d-none');
                     }
-                }, 4000);
+                } else {
+                    this.controlsTimeOut = setTimeout(() => {
+                        playerControlsContainer.classList.remove('plyr__controls-enable');
+                        playerContainer.classList.add('plyr--hide-controls');
+                        if (!playerControlsContainer.classList.contains('player-lt__modal__mobile-show-modal')) {
+                            playerControlsBackground.classList.remove('d-none');
+                        }
+                    }, 4000);
+                }
             }
         }
 
@@ -467,17 +574,17 @@ export namespace LTPlayerControlsEvents  {
             }
         }
         playPauseIcon(instance: LTPlayer.LandscapeType | LTPlayer.PortraitType, type: string) {
-
             let common = this.common;
+            let instanceMobile = this;
 
             switch (type) {
                 case 'timeupdate':
                     common.playPauseIconTimeUpdate(instance);
                     break
                 case 'ready':
-                    const playButton = instance.plyr.elements.container.querySelector('.play-button');
+                    const playButton = instance.plyr.elements.controls.querySelector('.play-button');
                     let mobileEvent: HammerManager = instance.eventInstance.mobileEvents.setMobileEvent(playButton);
-                    if (mobileEvent && instance.plyr.isHTML5) {
+                    if (mobileEvent) {
                         mobileEvent.on('singletap', function LTPlayerMobilePLayPauseIcon() {
                             if (instance.plyr.playing) {
                                 instance.plyr.togglePlay(false);
@@ -485,7 +592,7 @@ export namespace LTPlayerControlsEvents  {
                                 instance.plyr.togglePlay(true);
                             }
                             common.playPauseIconTimeUpdate(instance);
-                            instance.playerControl.mobileEvents.showControls(instance);
+                            instanceMobile.showControls(instance);
                         });
                     }
             }
@@ -495,24 +602,17 @@ export namespace LTPlayerControlsEvents  {
 
             let common = this.common;
             const selectors = common.backwardRewind.getSelectors(instance);
-            const volumeControlArea = selectors.playerControlsContainer.querySelector('.bottom-controller__volume_control');
 
             const singleTapAction = () => {
-                if (instance.plyr.elements.controls.classList.contains('plyr__controls-enable')) {
-                    if (volumeControlArea) {
-                        if (!volumeControlArea.classList.contains('volume-control-enable')) {
-                            common.backwardRewind.playPause(instance);
-                            instance.playerControl.mobileEvents.showControls(instance);
-                        }
-                    }
-                }
+                instance.playerControl.mobileEvents.hideControls(instance, true);
             }
 
             if (selectors.forwardArea) {
 
                 let mobileEvent: HammerManager = instance.eventInstance.mobileEvents.setMobileEvent(selectors.forwardArea);
 
-                mobileEvent.on('doubletap', function LTPlayerMobileForwardDbClick() {
+                mobileEvent.on('doubletap', function LTPlayerMobileForwardDbClick(event) {
+
                     common.backwardRewind.animateNotificationIn(selectors.forwardAnimation);
                     common.backwardRewind.updateCurrentTime(instance, 10);
                     setTimeout(() => {
@@ -521,8 +621,18 @@ export namespace LTPlayerControlsEvents  {
                     instance.playerControl.mobileEvents.showControls(instance);
                 })
 
-                mobileEvent.on('singletap', function LTPlayerMobileForwardDbClick() {
+                mobileEvent.on('singletap', function LTPlayerMobileForwardDbClick(event) {
                     singleTapAction();
+                });
+
+                let mobileEventBackground: HammerManager = instance.eventInstance.mobileEvents.setMobileEvent(selectors.forwardAreaBackground);
+
+                mobileEventBackground.on('doubletap', function LTPlayerMobileForwardDbClickBackground(event) {
+                    common.backwardRewind.animateNotificationIn(selectors.forwardAnimationBackground);
+                    common.backwardRewind.updateCurrentTime(instance, 10);
+                    setTimeout(() => {
+                        common.backwardRewind.animateNotificationOut(selectors.forwardAnimationBackground)
+                    }, 500)
                 })
             }
 
@@ -530,7 +640,8 @@ export namespace LTPlayerControlsEvents  {
 
                 let mobileEvent: HammerManager = instance.eventInstance.mobileEvents.setMobileEvent(selectors.rewindArea);
 
-                mobileEvent.on('doubletap', function LTPlayerMobileRewindDbClick() {
+                mobileEvent.on('doubletap', function LTPlayerMobileRewindDbClick(event) {
+
                     common.backwardRewind.animateNotificationIn(selectors.rewindAnimation);
                     common.backwardRewind.updateCurrentTime(instance, -10);
                     setTimeout(() => {
@@ -539,10 +650,20 @@ export namespace LTPlayerControlsEvents  {
                     instance.playerControl.mobileEvents.showControls(instance);
                 })
 
-                mobileEvent.on('singletap', function LTPlayerMobileRewindClick() {
+                mobileEvent.on('singletap', function LTPlayerMobileRewindClick(event) {
                     singleTapAction();
                 })
 
+                let mobileEventBackground: HammerManager = instance.eventInstance.mobileEvents.setMobileEvent(selectors.rewindAreaBackground);
+
+                mobileEventBackground.on('doubletap', function LTPlayerMobileRewindDbClickBackground(event) {
+                    common.backwardRewind.animateNotificationIn(selectors.rewindAnimationBackground);
+                    common.backwardRewind.updateCurrentTime(instance, 10);
+                    setTimeout(() => {
+                        common.backwardRewind.animateNotificationOut(selectors.rewindAnimationBackground)
+                    }, 500)
+                })
+
             }
         }
 

package/src/components/controls/settings/LTPlayerDesktopSettingsControllers.ts

@@ -65,13 +65,11 @@ export class LTPlayerDesktopSettingsControllers implements SettingsControlsInter
         let values:any = [1,1.25,1.50,2];
 
         myRange.oninput = function() {
-
-            player.speed = parseInt(values[rangeInput.value]);
-
+            player.speed = parseFloat(values[rangeInput.value]);
             myValue.innerHTML = values[rangeInput.value] + 'x';
         };
 
-        player.speed = parseInt(String(values[0]));
+        player.speed = parseFloat(String(values[0]));
         myValue.innerHTML = values[0] + 'x';
     }
     initSaveButton() {

package/src/components/events/LTPlayer.ts

@@ -56,6 +56,7 @@ export namespace LTPlayerEvents {
                 const volumeBackground = volumeControl.querySelector('.volume_control__background');
                 const volumeBackgroundArea = volumeControl.querySelector('.volume_control__background__area');
                 const volumeArea = volumeControl.querySelector('.volume_control__background__area__range');
+                const controlsBackground = player.elements.container.querySelector('.plyr__controls__mobile-background');
 
 
                 if (volumeButton) {
@@ -79,6 +80,12 @@ export namespace LTPlayerEvents {
                     volumeControl.classList.remove('volume-control-enable');
                 }
 
+                if (controlsBackground) {
+                    if (!controlsBackground.classList.contains('d-none')) {
+                        controlsBackground.classList.add('d-none');
+                    }
+                }
+
             }
             const enablePoster = () => {
 

package/src/components/poster/LTPlayerPosterEvents.ts

@@ -87,6 +87,7 @@ export namespace LTPlayerPosterEvents {
             common.poster.getButtons(instance)?.forEach(button => {
                 button.addEventListener('click', function LTPlayerPosterButtons(event) {
                     event.preventDefault();
+                    instance.playerControl.desktopEvents.titleLineBreak(instance);
                     common.poster.reset(instance);
                 })
             });
@@ -108,6 +109,7 @@ export namespace LTPlayerPosterEvents {
 
                 if (mobileEvent) {
                     mobileEvent.on('singletap', function LTPlayerMobilePosterButtons() {
+                        instance.playerControl.desktopEvents.titleLineBreak(instance);
 
                         common.poster.reset(instance);
 

package/src/components/poster/LTPlayerPosterPreloadEvents.ts

@@ -16,6 +16,7 @@ export class LTPlayerPosterPreloadEvents {
             playerContainer.querySelector(`.lt-player__poster`).insertAdjacentHTML('afterend', LoaderService.getSpinner());
             const preloadData = instance.playerConfig.getPreload();
             const playAutoPreload = () => {
+                console.log('preload play')
                 if (preloadData.start !== 0) {
                     instance.plyr.embed.setCurrentTime(preloadData.start).then(() => {
                         instance.plyr.embed.setMuted(true).then(function () {
@@ -30,13 +31,20 @@ export class LTPlayerPosterPreloadEvents {
                     LoaderService.removeSpinner(playerContainer)
                 } else {
                     instance.plyr.volume = 0;
-                    instance.plyr.embed.play().then(function () {
+                    if (instance.plyr.embed) {
+                        instance.plyr.embed.play().then(function () {
+                            LoaderService.removeSpinner(playerContainer)
+                        });
+                    } else {
+                        instance.plyr.play()
                         LoaderService.removeSpinner(playerContainer)
-                    });
+                    }
+
                 }
             }
 
             const pausePreload = () => {
+                console.log('preload play')
                 if (preloadData.start !== 0) {
                     instance.plyr.embed.setCurrentTime(preloadData.start).then( () => {
                         instance.plyr.embed.pause().then(function() {
@@ -45,12 +53,15 @@ export class LTPlayerPosterPreloadEvents {
                         });
                     });
                 } else {
-                    instance.plyr.volume = 0;
-                    instance.plyr.embed.pause().then(function() {
+                    if (instance.plyr.embed) {
+                        instance.plyr.embed.pause().then(function () {
+                            LoaderService.removeSpinner(playerContainer)
+                        });
+                    } else {
+                        instance.plyr.pause()
                         LoaderService.removeSpinner(playerContainer)
-                    });
+                    }
                 }
-
                 LoaderService.removeSpinner(playerContainer)
             }
 

package/src/services/IconsService.ts

@@ -33,6 +33,11 @@ export class IconsService {
         'university',
     ]
 
+    playPause = [
+        'play',
+        'pause'
+    ]
+
     constructor() {
         this.path = require.context('../assets/icons', false);
     }
@@ -86,6 +91,16 @@ export class IconsService {
                         }
                     })
                 })
+            break
+            case 'playPause':
+                this.path.keys().forEach(item => {
+                    this.playPause.forEach(mapElement => {
+                        let name = item.replace(/(\.(?:jpg|png|svg))$/i, "").replace('./', '');
+                        if (name === mapElement) {
+                            Object.assign(response, {[name] : this.path(item)})
+                        }
+                    })
+                })
         }
 
 

package/src/services/LTPlayerRotateDeviceService.ts

@@ -3,7 +3,6 @@ export class LTPlayerRotateDeviceService {
     }
 
     getDeviceOrientation() {
-        console.log(window.matchMedia("(orientation: portrait)").matches)
         if (window.matchMedia("(orientation: portrait)").matches) {
             return 'portrait';
         }