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

Merge pull request #1346 from MediaBrowser/master

Browse source 
merge from master
This commit is contained in:
Luke 2015-12-21 12:50:25 -05:00
commit 4c0ac8e795
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dashboard-ui/scripts/site.js
View file

@ -1771,7 +1771,6 @@ var AppInfo = {};
var urlArgs = "v=" + (window.dashboardVersion || new Date().getDate()); var urlArgs = "v=" + (window.dashboardVersion || new Date().getDate());
var bowerPath = "bower_components"; var bowerPath = "bower_components";
var apiClientBowerPath = "bower_components/emby-apiclient";
// Put the version into the bower path since we can't easily put a query string param on html imports // Put the version into the bower path since we can't easily put a query string param on html imports
// Emby server will handle this // Emby server will handle this
@ -1779,6 +1778,8 @@ var AppInfo = {};
bowerPath += window.dashboardVersion; bowerPath += window.dashboardVersion;
} }
var apiClientBowerPath = bowerPath + "/emby-apiclient";
var paths = { var paths = {
velocity: bowerPath + "/velocity/velocity.min", velocity: bowerPath + "/velocity/velocity.min",
tvguide: 'components/tvguide/tvguide', tvguide: 'components/tvguide/tvguide',

2
dashboard-ui/themes/holiday/theme.js
View file

@ -40,7 +40,7 @@
if (lastSound == 0) { if (lastSound == 0) {
playSound('https://github.com/MediaBrowser/Emby.Resources/raw/master/themes/holiday/christmas.wav', .1); playSound('https://github.com/MediaBrowser/Emby.Resources/raw/master/themes/holiday/christmas.wav', .1);
} else if ((new Date().getTime() - lastSound) > 30000) { } else if ((new Date().getTime() - lastSound) > 30000) {
playSound('https://github.com/MediaBrowser/Emby.Resources/raw/master/themes/holiday/sleighbells.wav'); playSound('https://github.com/MediaBrowser/Emby.Resources/raw/master/themes/holiday/sleighbells.wav', .25);
} }
} }