diff --git a/plugin/PlayerSkins/PlayerSkins.php b/plugin/PlayerSkins/PlayerSkins.php index 193c9ece75..b34a17c28c 100644 --- a/plugin/PlayerSkins/PlayerSkins.php +++ b/plugin/PlayerSkins/PlayerSkins.php @@ -482,8 +482,9 @@ class PlayerSkins extends PluginAbstract static function includeFullscreenBlock(){ //$o->type = array(0=>'Show In all devices', 1=>'Show In Mobile Only', 2=>'Show In Desktop Only'); $obj = AVideoPlugin::getObjectData('PlayerSkins'); + //var_dump($obj->showFullscreenToggle->value);exit; if (!empty($obj->showFullscreenToggle->value)) { - if (($obj->showFullscreenToggle->value==1 && isMobile()) || $obj->showFullscreenToggle->value==2) { + if (($obj->showFullscreenToggle->value==1 && !isMobile()) || $obj->showFullscreenToggle->value==2) { return true; } } @@ -518,7 +519,7 @@ class PlayerSkins extends PluginAbstract $controlBar[] = 'pictureInPictureToggle: false'; } if (self::includeFullscreenBlock()) { - $controlBar[] = "fullscreenToggle: false"; + //$controlBar[] = "fullscreenToggle: false"; } if (!empty($controlBar)) { $dataSetup[] = "controlBar: {" . implode(', ', $controlBar) . "}"; diff --git a/plugin/PlayerSkins/fullscrenCheck.js b/plugin/PlayerSkins/fullscrenCheck.js index 1a89cc7f18..4528fba7d4 100644 --- a/plugin/PlayerSkins/fullscrenCheck.js +++ b/plugin/PlayerSkins/fullscrenCheck.js @@ -1,15 +1,4 @@ -this.tech_.el_.addEventListener('fullscreenchange', function (e) { - if (isMobile() && this.player_.isFullscreen()) { - this.player_.exitFullscreen(); - } +player.on('fullscreenchange', function(e, data) { + console.log('player fullscreenchange isFullscreen', player.isFullscreen()); + player.exitFullscreen(); }); - -this.tech_.el_.addEventListener('dblclick', function (e) { - e.preventDefault(); // Prevents double-click fullscreen on supported devices/browsers -}); - -document.addEventListener('keydown', function (e) { - if (e.key === 'F11') { // Disables the F11 key for fullscreen - e.preventDefault(); - } -}); \ No newline at end of file