michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix fullscreen button with IE

Browse Source
This commit is contained in:
Luke Pulverenti 2015-05-17 21:27:48 -04:00
parent 5e5b3614c9
commit 6eb2d975ae
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
View File

@ -40,6 +40,7 @@
"TitleLiveTV": "Live TV",
"TitleSync": "Sync",
"ButtonDonate": "Donate",
"LabelRecurringDonationCanBeCancelledHelp": "Recurring donations can be cancelled at any time from within your PayPal account.",
"HeaderMyMedia": "My Media",
"TitleNotifications": "Notifications",
"ErrorLaunchingChromecast": "There was an error launching chromecast. Please ensure your device is connected to your wireless network.",

1
MediaBrowser.Server.Implementations/Localization/Server/server.json
View File

@ -1262,7 +1262,6 @@
"HeaderDeveloperInfo": "Developer Info",
"HeaderRevisionHistory": "Revision History",
"ButtonViewWebsite": "View website",
"LabelRecurringDonationCanBeCancelledHelp": "Recurring donations can be cancelled at any time from within your PayPal account.",
"HeaderXmlSettings": "Xml Settings",
"HeaderXmlDocumentAttributes": "Xml Document Attributes",
"HeaderXmlDocumentAttribute": "Xml Document Attribute",

23
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File

@ -1,4 +1,5 @@
using MediaBrowser.Common.IO;
using System.Text.RegularExpressions;
using MediaBrowser.Common.IO;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Localization;
using MediaBrowser.Model.Logging;
@ -288,19 +289,30 @@ namespace MediaBrowser.WebDashboard.Api
private string ModifyForCordova(string html)
{
// Strip everything between CORDOVA_EXCLUDE_START and CORDOVA_EXCLUDE_END
html = ReplaceBetween(html, "CORDOVA_EXCLUDE_START", "CORDOVA_EXCLUDE_END", string.Empty);
html = ReplaceBetween(html, "<!--CORDOVA_EXCLUDE_START-->", "<!--CORDOVA_EXCLUDE_END-->", string.Empty);
// Replace CORDOVA_REPLACE_SUPPORTER_SUBMIT_START
html = ReplaceBetween(html, "CORDOVA_REPLACE_SUPPORTER_SUBMIT_START", "CORDOVA_REPLACE_SUPPORTER_SUBMIT_END", "<i class=\"fa fa-check\"></i><span>${ButtonDonate}</span>");
html = ReplaceBetween(html, "<!--CORDOVA_REPLACE_SUPPORTER_SUBMIT_START-->", "<!--CORDOVA_REPLACE_SUPPORTER_SUBMIT_END-->", "<i class=\"fa fa-check\"></i><span>${ButtonDonate}</span>");
return html;
}
private string ReplaceBetween(string html, string startToken, string endToken, string newHtml)
{
var start = html.IndexOf(startToken, StringComparison.OrdinalIgnoreCase);
var end = html.IndexOf(endToken, StringComparison.OrdinalIgnoreCase);
if (start == -1 || end == -1)
{
return html;
}
string result = html.Substring(start + 1, end - start - 1);
html = html.Replace(result, newHtml);
return ReplaceBetween(html, startToken, endToken, newHtml);
}
private string GetLocalizationToken(string phrase)
{
return "${" + phrase + "}";
@ -600,7 +612,6 @@ namespace MediaBrowser.WebDashboard.Api
"livetvstatus.js",
"loginpage.js",
"logpage.js",
"medialibrarypage.js",
"metadataconfigurationpage.js",
"metadataimagespage.js",
@ -626,15 +637,11 @@ namespace MediaBrowser.WebDashboard.Api
"scheduledtaskspage.js",
"search.js",
"selectserver.js",
"streamingsettings.js",
"supporterkeypage.js",
"supporterpage.js",
"syncactivity.js",
"syncsettings.js",
"thememediaplayer.js",
"tvlatest.js",
"useredit.js",
"usernew.js",
"myprofile.js",
"userpassword.js",
"userprofilespage.js",