diff options
| author | Tavares André <tavares_and@hotmail.com> | 2015-05-26 18:31:47 +0200 |
|---|---|---|
| committer | Tavares André <tavares_and@hotmail.com> | 2015-05-26 18:31:47 +0200 |
| commit | fb597815483c470b8f5218b4e2324bdf930df7ad (patch) | |
| tree | 291d325783a8d491079479590d467183de175a64 /MediaBrowser.WebDashboard/Api/PackageCreator.cs | |
| parent | 428dfd183d224b9ec1e85828319399d80e1876e0 (diff) | |
| parent | 217c5fbe749d39554f23c1d9701d7260c1c5b0d0 (diff) | |
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
Diffstat (limited to 'MediaBrowser.WebDashboard/Api/PackageCreator.cs')
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/PackageCreator.cs | 20 |
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", |