cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 19:08:18 -07:00
Code Issues Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dashboard-ui/addplugin.html
View File

@ -4,7 +4,7 @@
<title>${TitlePlugins}</title> <title>${TitlePlugins}</title>
</head> </head>
<body> <body>
<div id="addPluginPage" data-role="page" class="page type-interior pluginConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Plugins" data-require="scripts/registrationservices,scripts/ratingdialog,scripts/addpluginpage,fontawesome"> <div id="addPluginPage" data-role="page" class="page type-interior pluginConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Plugins" data-require="scripts/registrationservices,scripts/ratingdialog,scripts/addpluginpage">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
@ -86,9 +86,11 @@
<input type="hidden" id="featureId" name="item_number" value=""> <input type="hidden" id="featureId" name="item_number" value="">
<input type="hidden" name="notify_url" value="http://mb3admin.com/admin/service/services/ppipn.php"> <input type="hidden" name="notify_url" value="http://mb3admin.com/admin/service/services/ppipn.php">
<input type="hidden" name="return" id="paypalReturnUrl" value="#"> <input type="hidden" name="return" id="paypalReturnUrl" value="#">
<button type="submit" id="ppButton" data-role="none" class="btn" style="background-color:#179BD7"> <button type="submit" id="ppButton" class="clearButton">
<i class="fa fa-paypal"></i> <paper-button raised class="block" style="background-color: #179BD7;color:#fff;">
<span>${RegisterWithPayPal}</span> <iron-icon icon="check"></iron-icon>
<span>${RegisterWithPayPal}</span>
</paper-button>
</button> </button>
</div> </div>

5
dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
View File

@ -55,7 +55,10 @@
html += '<paper-icon-item role="menuitem" class="lnkPath">'; html += '<paper-icon-item role="menuitem" class="lnkPath">';
html += '<paper-fab class="listAvatar" style="background:#52B54B;" icon="folder" item-icon></paper-fab>'; if (!$.browser.msie) {
// Not sure why, but this is causing the entire browser to hang
html += '<paper-fab class="listAvatar" style="background:#52B54B;" icon="folder" item-icon></paper-fab>';
}
html += '<paper-item-body>'; html += '<paper-item-body>';
html += path; html += path;

0
dashboard-ui/tvproviders/schedulesdirect.js → dashboard-ui/components/tvproviders/schedulesdirect.js
View File

0
dashboard-ui/tvproviders/schedulesdirect.template.html → dashboard-ui/components/tvproviders/schedulesdirect.template.html
View File

3
dashboard-ui/css/librarybrowser.css
View File

@ -1032,6 +1032,8 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
right: 5px; right: 5px;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
width: 26px;
height: 26px;
border-radius: 50%; border-radius: 50%;
color: #fff; color: #fff;
background: rgb(82, 181, 75); background: rgb(82, 181, 75);
@ -1039,7 +1041,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
line-height: 21px; line-height: 21px;
line-height: initial; line-height: initial;
font-weight: 500; font-weight: 500;
padding: 5px;
} }
.mediaSourceIndicator { .mediaSourceIndicator {

0
dashboard-ui/themes/android.css → dashboard-ui/devices/android/android.css
View File

2
dashboard-ui/css/ie.css → dashboard-ui/devices/ie/ie.css
View File

@ -3,5 +3,5 @@
} }
paper-fab.keyboard-focus.paper-fab-0 { paper-fab.keyboard-focus.paper-fab-0 {
background: #444; /*background: #444;*/
} }

33
dashboard-ui/devices/ie/ie.js Normal file
View File

@ -0,0 +1,33 @@
(function () {
Dashboard.importCss('devices/ie/ie.css');
function onPageShow() {
var page = this;
if (navigator.userAgent.toLowerCase().indexOf('Windows NT 10.') != -1) {
var expectedValue = new Date().toDateString();
if (appStorage.getItem("ieswitchtoedge") == expectedValue) {
return;
}
appStorage.setItem("ieswitchtoedge", expectedValue);
var msg = Globalize.translate('MessageTryMicrosoftEdge');
msg += "<br/><br/>";
msg += '<a href="https://www.microsoft.com/en-us/windows/microsoft-edge" target="_blank">' + Globalize.translate('ButtonLearnMore') + '</a>';
Dashboard.alert({
message: msg,
title: Globalize.translate('HeaderTryMicrosoftEdge')
});
}
}
pageClassOn('pageshow', "libraryPage", onPageShow);
pageClassOn('pageshow', "type-interior", onPageShow);
})();

0
dashboard-ui/themes/ios.css → dashboard-ui/devices/ios/ios.css
View File

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

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

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

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

4
dashboard-ui/strings/javascript/en-US.json
View File

@ -909,5 +909,7 @@
"ButtonAddMediaLibrary": "Add Media Library", "ButtonAddMediaLibrary": "Add Media Library",
"ButtonManageFolders": "Manage folders", "ButtonManageFolders": "Manage folders",
"HeaderTryDragAndDrop": "Try Drag and Drop", "HeaderTryDragAndDrop": "Try Drag and Drop",
"TryDragAndDropMessage": "To re-arrange playlist items, just drag and drop. Try it!" "TryDragAndDropMessage": "To re-arrange playlist items, just drag and drop. Try it!",
"HeaderTryMicrosoftEdge": "Try Microsoft Edge",
"MessageTryMicrosoftEdge": "For a better experience on Windows 10, try the new Microsoft Edge Browser."
} }

4
dashboard-ui/strings/javascript/javascript.json
View File

@ -919,5 +919,7 @@
"ButtonAddMediaLibrary": "Add Media Library", "ButtonAddMediaLibrary": "Add Media Library",
"ButtonManageFolders": "Manage folders", "ButtonManageFolders": "Manage folders",
"HeaderTryDragAndDrop": "Try Drag and Drop", "HeaderTryDragAndDrop": "Try Drag and Drop",
"TryDragAndDropMessage": "To re-arrange playlist items, just drag and drop. Try it!" "TryDragAndDropMessage": "To re-arrange playlist items, just drag and drop. Try it!",
"HeaderTryMicrosoftEdge": "Try Microsoft Edge",
"MessageTryMicrosoftEdge": "For a better experience on Windows 10, try the new Microsoft Edge Browser."
} }