fix fullscreen button with IE

pull/702/head
Luke Pulverenti 10 years ago
parent 5e5b3614c9
commit 6eb2d975ae

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

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

@ -1,4 +1,5 @@
using MediaBrowser.Common.IO; using System.Text.RegularExpressions;
using MediaBrowser.Common.IO;
using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Localization; using MediaBrowser.Controller.Localization;
using MediaBrowser.Model.Logging; using MediaBrowser.Model.Logging;
@ -288,17 +289,28 @@ namespace MediaBrowser.WebDashboard.Api
private string ModifyForCordova(string html) private string ModifyForCordova(string html)
{ {
// Strip everything between CORDOVA_EXCLUDE_START and CORDOVA_EXCLUDE_END // 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 // 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; return html;
} }
private string ReplaceBetween(string html, string startToken, string endToken, string newHtml) private string ReplaceBetween(string html, string startToken, string endToken, string newHtml)
{ {
return html; 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) private string GetLocalizationToken(string phrase)
@ -600,7 +612,6 @@ namespace MediaBrowser.WebDashboard.Api
"livetvstatus.js", "livetvstatus.js",
"loginpage.js", "loginpage.js",
"logpage.js",
"medialibrarypage.js", "medialibrarypage.js",
"metadataconfigurationpage.js", "metadataconfigurationpage.js",
"metadataimagespage.js", "metadataimagespage.js",
@ -626,15 +637,11 @@ namespace MediaBrowser.WebDashboard.Api
"scheduledtaskspage.js", "scheduledtaskspage.js",
"search.js", "search.js",
"selectserver.js", "selectserver.js",
"streamingsettings.js",
"supporterkeypage.js", "supporterkeypage.js",
"supporterpage.js",
"syncactivity.js", "syncactivity.js",
"syncsettings.js", "syncsettings.js",
"thememediaplayer.js", "thememediaplayer.js",
"tvlatest.js",
"useredit.js", "useredit.js",
"usernew.js",
"myprofile.js", "myprofile.js",
"userpassword.js", "userpassword.js",
"userprofilespage.js", "userprofilespage.js",

Loading…
Cancel
Save