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

fix sync status display

Browse source
This commit is contained in:
Luke Pulverenti 2015-10-02 02:14:04 -04:00
parent a07e6b59a3
commit 94a5cf7549
26 changed files with 415 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -100,6 +100,12 @@ var Dashboard = {
return;
}
// Don't bounce if the failure is in a sync service
if (url.indexOf('/sync') != -1) {
Dashboard.hideLoadingMsg();
return;
}
// Bounce to the login screen, but not if a password entry fails, obviously
if (url.indexOf('/password') == -1 &&
url.indexOf('/authenticate') == -1 &&
@ -238,6 +244,8 @@ var Dashboard = {
importCss: function (url) {
url += "?v=" + window.dashboardVersion;
if (!Dashboard.importedCss) {
Dashboard.importedCss = [];
}
@ -2019,12 +2027,20 @@ var AppInfo = {};
urlArgs += new Date().getTime();
}
var paths = {
velocity: "bower_components/velocity/velocity.min"
};
if (Dashboard.isRunningInCordova()) {
paths.prompt = "cordova/prompt";
} else {
paths.prompt = "components/prompt";
}
requirejs.config({
urlArgs: urlArgs,
paths: {
"velocity": "bower_components/velocity/velocity.min"
}
paths: paths
});
// Required since jQuery is loaded before requireJs