aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.WebDashboard/Api/PackageCreator.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.WebDashboard/Api/PackageCreator.cs')
-rw-r--r--MediaBrowser.WebDashboard/Api/PackageCreator.cs20
1 files changed, 10 insertions, 10 deletions
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index 2823733ea..f6601ce80 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -291,7 +291,7 @@ namespace MediaBrowser.WebDashboard.Api
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>${ButtonPurchase}</span>");
return html;
}
@@ -299,14 +299,20 @@ namespace MediaBrowser.WebDashboard.Api
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)
+ if (start == -1)
{
return html;
}
- string result = html.Substring(start + 1, end - start - 1);
+ var end = html.IndexOf(endToken, start, StringComparison.OrdinalIgnoreCase);
+
+ if (end == -1)
+ {
+ return html;
+ }
+
+ string result = html.Substring(start, end - start);
html = html.Replace(result, newHtml);
return ReplaceBetween(html, startToken, endToken, newHtml);
@@ -575,7 +581,6 @@ namespace MediaBrowser.WebDashboard.Api
"cinemamodeconfiguration.js",
"encodingsettings.js",
- "externalplayer.js",
"forgotpassword.js",
"forgotpasswordpin.js",
"indexpage.js",
@@ -584,12 +589,7 @@ namespace MediaBrowser.WebDashboard.Api
"kids.js",
"librarypathmapping.js",
"librarysettings.js",
- "livetvchannel.js",
- "livetvguide.js",
- "livetvnewrecording.js",
- "livetvprogram.js",
"livetvrecording.js",
- "livetvrecordinglist.js",
"livetvtimer.js",
"livetvseriestimer.js",
"livetvsettings.js",