milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into query

Browse source
This commit is contained in:
dkanada 2020-03-16 15:36:31 +09:00 • committed by GitHub
commit 51ca49e479
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 6289 additions and 781 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/scripts/inputManager.js
View file

@ -58,7 +58,15 @@ define(['playbackManager', 'focusManager', 'appRouter', 'dom', 'apphost'], funct
sourceElement = focusManager.focusableParent(sourceElement);
}
sourceElement = sourceElement || document.activeElement || window;
if (!sourceElement) {
sourceElement = document.activeElement || window;
var dlg = document.querySelector('.dialogContainer .dialog.opened');
if (dlg && (!sourceElement || !dlg.contains(sourceElement))) {
sourceElement = dlg;
}
}
if (eventListenerCount) {
var customEvent = new CustomEvent("command", {

5
src/scripts/site.js
View file

@ -739,7 +739,8 @@ var AppInfo = {};
"webcomponents",
"material-icons",
"jellyfin-noto",
"page"
"page",
"polyfill"
]
},
urlArgs: urlArgs,
@ -747,6 +748,8 @@ var AppInfo = {};
onError: onRequireJsError
});
require(["polyfill"]);
// Expose jQuery globally
require(["jQuery"], function(jQuery) {
window.$ = jQuery;