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 ie hang on library setup

Browse source
This commit is contained in:
Luke Pulverenti 2015-10-17 12:29:42 -04:00
parent 3d458f8076
commit 3d0d3247fd
13 changed files with 58 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/scripts/livetvguideprovider.js
View file

@ -2,7 +2,7 @@
function init(page, type, providerId) {
var url = 'tvproviders/' + type + '.js';
var url = 'components/tvproviders/' + type + '.js';
require([url], function (factory) {
@ -15,10 +15,10 @@
function loadTemplate(page, type, providerId) {
ApiClient.ajax({
HttpClient.send({
type: 'GET',
url: 'tvproviders/' + type + '.template.html'
url: 'components/tvproviders/' + type + '.template.html'
}).done(function (html) {

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

@ -1967,15 +1967,15 @@ var AppInfo = {};
function onDocumentReady() {
if ($.browser.msie) {
Dashboard.importCss('css/ie.css');
require(['devices/ie/ie']);
}
// Do these now to prevent a flash of content
if (AppInfo.isNativeApp) {
if ($.browser.android) {
Dashboard.importCss('themes/android.css');
Dashboard.importCss('devices/android.css');
} else if ($.browser.safari) {
Dashboard.importCss('themes/ios.css');
Dashboard.importCss('devices/ios/ios.css');
}
} else {
loadTheme();