mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
module resolution for fullscreenManager
This commit is contained in:
parent
e0ac97c109
commit
86c19ee4a3
3 changed files with 28 additions and 33 deletions
|
@ -1,26 +0,0 @@
|
||||||
define(['dom', 'fullscreenManager'], function (dom, fullscreenManager) {
|
|
||||||
'use strict';
|
|
||||||
|
|
||||||
function isTargetValid(target) {
|
|
||||||
|
|
||||||
if (dom.parentWithTag(target, ['BUTTON', 'INPUT', 'TEXTAREA'])) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
dom.addEventListener(window, 'dblclick', function (e) {
|
|
||||||
|
|
||||||
if (isTargetValid(e.target)) {
|
|
||||||
if (fullscreenManager.isFullScreen()) {
|
|
||||||
fullscreenManager.exitFullscreen();
|
|
||||||
} else {
|
|
||||||
fullscreenManager.requestFullscreen();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}, {
|
|
||||||
passive: true
|
|
||||||
});
|
|
||||||
});
|
|
|
@ -1,4 +1,4 @@
|
||||||
define(['events', 'dom'], function (events, dom) {
|
define(['events', 'dom', 'apphost', 'browser'], function (events, dom, appHost, browser) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
function fullscreenManager() {
|
function fullscreenManager() {
|
||||||
|
@ -79,5 +79,30 @@ define(['events', 'dom'], function (events, dom) {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (appHost.supports("fullscreenchange") && (browser.edgeUwp || -1 !== navigator.userAgent.toLowerCase().indexOf("electron"))) {
|
||||||
|
function isTargetValid(target) {
|
||||||
|
|
||||||
|
if (dom.parentWithTag(target, ['BUTTON', 'INPUT', 'TEXTAREA'])) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
dom.addEventListener(window, 'dblclick', function (e) {
|
||||||
|
|
||||||
|
if (isTargetValid(e.target)) {
|
||||||
|
if (manager.isFullScreen()) {
|
||||||
|
manager.exitFullscreen();
|
||||||
|
} else {
|
||||||
|
manager.requestFullscreen();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}, {
|
||||||
|
passive: true
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return manager;
|
return manager;
|
||||||
});
|
});
|
|
@ -618,11 +618,7 @@ var AppInfo = {};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
require(["playerSelectionMenu"]);
|
require(["playerSelectionMenu", "fullscreenManager"]);
|
||||||
|
|
||||||
if (appHost.supports("fullscreenchange") && (browser.edgeUwp || -1 !== navigator.userAgent.toLowerCase().indexOf("electron"))) {
|
|
||||||
require(["fullscreen-doubleclick"]);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (appHost.supports("sync")) {
|
if (appHost.supports("sync")) {
|
||||||
initLocalSyncEvents();
|
initLocalSyncEvents();
|
||||||
|
@ -779,7 +775,7 @@ var AppInfo = {};
|
||||||
define("searchResults", [componentsPath + "/search/searchresults"], returnFirstDependency);
|
define("searchResults", [componentsPath + "/search/searchresults"], returnFirstDependency);
|
||||||
define("upNextDialog", [componentsPath + "/upnextdialog/upnextdialog"], returnFirstDependency);
|
define("upNextDialog", [componentsPath + "/upnextdialog/upnextdialog"], returnFirstDependency);
|
||||||
define("fullscreen-doubleclick", [componentsPath + "/fullscreen/fullscreen-dc"], returnFirstDependency);
|
define("fullscreen-doubleclick", [componentsPath + "/fullscreen/fullscreen-dc"], returnFirstDependency);
|
||||||
define("fullscreenManager", [componentsPath + "/fullscreen/fullscreenmanager", "events"], returnFirstDependency);
|
define("fullscreenManager", [componentsPath + "/fullscreenManager", "events"], returnFirstDependency);
|
||||||
define("headroom", [componentsPath + "/headroom/headroom"], returnFirstDependency);
|
define("headroom", [componentsPath + "/headroom/headroom"], returnFirstDependency);
|
||||||
define("subtitleAppearanceHelper", [componentsPath + "/subtitlesettings/subtitleappearancehelper"], returnFirstDependency);
|
define("subtitleAppearanceHelper", [componentsPath + "/subtitlesettings/subtitleappearancehelper"], returnFirstDependency);
|
||||||
define("subtitleSettings", [componentsPath + "/subtitlesettings/subtitlesettings"], returnFirstDependency);
|
define("subtitleSettings", [componentsPath + "/subtitlesettings/subtitlesettings"], returnFirstDependency);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue