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

merge branch master into config

This commit is contained in:
dkanada 2020-04-02 01:46:44 +09:00
commit 850df11f27
351 changed files with 12788 additions and 5249 deletions

View file

@ -96,7 +96,7 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
appHost.setThemeColor(color);
}
} catch (err) {
console.log('Error setting theme color: ' + err);
console.error('error setting theme color: ' + err);
}
}
@ -162,6 +162,7 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
function playSound(path, volume) {
lastSound = new Date().getTime();
require(['howler'], function (howler) {
/* globals Howl */
try {
var sound = new Howl({
src: [path],
@ -170,7 +171,7 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
sound.play();
currentSound = sound;
} catch (err) {
console.log('Error playing sound: ' + err);
console.error('error playing sound: ' + err);
}
});
}