open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update web components

Browse Source
pull/702/head
Luke Pulverenti 10 years ago
parent 1e4a975574
commit 4c44315b30
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File

19
MediaBrowser.WebDashboard/Api/PackageCreator.cs
Unescape View File

@ -68,14 +68,14 @@ namespace MediaBrowser.WebDashboard.Api
} }
else if (IsFormat(path, "js")) else if (IsFormat(path, "js"))
{ {
if (path.IndexOf("thirdparty", StringComparison.OrdinalIgnoreCase) == -1) if (path.IndexOf("thirdparty", StringComparison.OrdinalIgnoreCase) == -1 && path.IndexOf("bower_components", StringComparison.OrdinalIgnoreCase) == -1)
{ {
resourceStream = await ModifyJs(resourceStream, enableMinification).ConfigureAwait(false); resourceStream = await ModifyJs(resourceStream, enableMinification).ConfigureAwait(false);
} }
} }
else if (IsFormat(path, "css")) else if (IsFormat(path, "css"))
{ {
if (path.IndexOf("thirdparty", StringComparison.OrdinalIgnoreCase) == -1) if (path.IndexOf("thirdparty", StringComparison.OrdinalIgnoreCase) == -1 && path.IndexOf("bower_components", StringComparison.OrdinalIgnoreCase) == -1)
{ {
resourceStream = await ModifyCss(resourceStream, enableMinification).ConfigureAwait(false); resourceStream = await ModifyCss(resourceStream, enableMinification).ConfigureAwait(false);
} }
@ -269,11 +269,12 @@ namespace MediaBrowser.WebDashboard.Api
html = _localization.LocalizeDocument(html, localizationCulture, GetLocalizationToken); html = _localization.LocalizeDocument(html, localizationCulture, GetLocalizationToken);
html = html.Replace("<html>", "<html lang=\"" + lang + "\">") html = html.Replace("<html>", "<html lang=\"" + lang + "\">");
.Replace("<body>", "<body><paper-drawer-panel class=\"mainDrawerPanel mainDrawerPanelPreInit\" forceNarrow><div class=\"mainDrawer\" drawer></div><div main><div class=\"pageContainer\">")
.Replace("</body>", "</div></div></paper-drawer-panel></body>");
} }
html = html.Replace("<body>", "<body><paper-drawer-panel class=\"mainDrawerPanel mainDrawerPanelPreInit\" forceNarrow><div class=\"mainDrawer\" drawer></div><div main><div class=\"pageContainer\">")
.Replace("</body>", "</div></div></paper-drawer-panel></body>");
if (enableMinification) if (enableMinification)
{ {
try try
@ -439,6 +440,7 @@ namespace MediaBrowser.WebDashboard.Api
var files = new List<string> var files = new List<string>
{ {
"bower_components/webcomponentsjs/webcomponents-lite.js" + versionString,
"scripts/all.js" + versionString "scripts/all.js" + versionString
}; };
@ -463,15 +465,14 @@ namespace MediaBrowser.WebDashboard.Api
var memoryStream = new MemoryStream(); var memoryStream = new MemoryStream();
var newLineBytes = Encoding.UTF8.GetBytes(Environment.NewLine); var newLineBytes = Encoding.UTF8.GetBytes(Environment.NewLine);
await AppendResource(memoryStream, "bower_components/webcomponentsjs/webcomponents-lite.min.js", newLineBytes).ConfigureAwait(false);
await AppendResource(memoryStream, "thirdparty/jquery-2.1.1.min.js", newLineBytes).ConfigureAwait(false); await AppendResource(memoryStream, "thirdparty/jquery-2.1.1.min.js", newLineBytes).ConfigureAwait(false);
await AppendResource(memoryStream, "thirdparty/require.js", newLineBytes).ConfigureAwait(false);
await AppendResource(memoryStream, "thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.min.js", newLineBytes).ConfigureAwait(false); await AppendResource(memoryStream, "thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.min.js", newLineBytes).ConfigureAwait(false);
await AppendResource(memoryStream, "thirdparty/browser.js", newLineBytes).ConfigureAwait(false); await AppendResource(memoryStream, "thirdparty/browser.js", newLineBytes).ConfigureAwait(false);
await AppendResource(memoryStream, "thirdparty/require.js", newLineBytes).ConfigureAwait(false);
await AppendResource(memoryStream, "thirdparty/jquery.unveil-custom.js", newLineBytes).ConfigureAwait(false); await AppendResource(memoryStream, "thirdparty/jquery.unveil-custom.js", newLineBytes).ConfigureAwait(false);
var excludePhrases = new List<string>(); var excludePhrases = new List<string>();

4
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
Unescape View File

@ -116,7 +116,9 @@
<Content Include="dashboard-ui\bower_components\webcomponentsjs\ShadowDOM.min.js"> <Content Include="dashboard-ui\bower_components\webcomponentsjs\ShadowDOM.min.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\bower_components\webcomponentsjs\webcomponents-lite.js" /> <Content Include="dashboard-ui\bower_components\webcomponentsjs\webcomponents-lite.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\bower_components\webcomponentsjs\webcomponents-lite.min.js"> <Content Include="dashboard-ui\bower_components\webcomponentsjs\webcomponents-lite.min.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>

Write Preview
Loading…
Cancel
Save