mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Revert "pull fonts from official repository"

Browse source
This commit is contained in:
Joshua M. Boniface 2020-11-17 20:47:08 -05:00 • committed by GitHub
parent f59003568f
commit 1abe4845f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/scripts/autoThemes.js
View file

@ -1,22 +1,11 @@
import * as userSettings from 'userSettings';
import * as webSettings from 'webSettings';
import skinManager from 'skinManager';
import events from 'events';
// set the default theme when loading
// Set the default theme when loading
skinManager.setTheme(userSettings.theme());
// set the saved theme once a user authenticates
// Set the user's prefered theme when signing in
events.on(window.connectionManager, 'localusersignedin', function (e, user) {
skinManager.setTheme(userSettings.theme());
});
webSettings.getFonts().then(fonts => {
for (const font of fonts) {
const link = document.createElement('link');
link.setAttribute('rel', 'stylesheet');
link.href = font;
document.getElementsByTagName('head')[0].appendChild(link);
}
});

9
src/scripts/settings/webSettings.js
View file

@ -102,12 +102,3 @@ export function getPlugins() {
return [];
});
}
export function getFonts() {
return getConfig().then(config => {
return config.fonts;
}).catch(error => {
console.log('cannot get web config:', error);
return [];
});
}

3
src/scripts/site.js
View file

@ -506,6 +506,7 @@ function initClient() {
'sortable',
'webcomponents',
'material-icons',
'jellyfin-noto',
'date-fns',
'page',
'polyfill',
@ -528,7 +529,7 @@ function initClient() {
});
promise = require(['fetch'])
.then(() => require(['jQuery', 'polyfill', 'fast-text-encoding', 'intersection-observer', 'classlist-polyfill', 'css!assets/css/site'], (jQuery) => {
.then(() => require(['jQuery', 'polyfill', 'fast-text-encoding', 'intersection-observer', 'classlist-polyfill', 'css!assets/css/site', 'jellyfin-noto'], (jQuery) => {
// Expose jQuery globally
window.$ = jQuery;
window.jQuery = jQuery;