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

update image sizes

Browse Source
This commit is contained in:
Luke Pulverenti 2015-05-12 09:58:03 -04:00
parent 6c6ea6083c
commit cb36ebbf93
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Api/Dlna/DlnaServerService.cs
View File

@ -108,6 +108,7 @@ namespace MediaBrowser.Api.Dlna
private readonly IConnectionManager _connectionManager; private readonly IConnectionManager _connectionManager;
private readonly IMediaReceiverRegistrar _mediaReceiverRegistrar; private readonly IMediaReceiverRegistrar _mediaReceiverRegistrar;
// TODO: Add utf-8
private const string XMLContentType = "text/xml"; private const string XMLContentType = "text/xml";
public DlnaServerService(IDlnaManager dlnaManager, IContentDirectory contentDirectory, IConnectionManager connectionManager, IMediaReceiverRegistrar mediaReceiverRegistrar) public DlnaServerService(IDlnaManager dlnaManager, IContentDirectory contentDirectory, IConnectionManager connectionManager, IMediaReceiverRegistrar mediaReceiverRegistrar)

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

@ -9,6 +9,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using WebMarkupMin.Core;
using WebMarkupMin.Core.Minifiers; using WebMarkupMin.Core.Minifiers;
using WebMarkupMin.Core.Settings; using WebMarkupMin.Core.Settings;
@ -32,9 +33,9 @@ namespace MediaBrowser.WebDashboard.Api
} }
public async Task<Stream> GetResource(string path, public async Task<Stream> GetResource(string path,
string mode, string mode,
string localizationCulture, string localizationCulture,
string appVersion, string appVersion,
bool enableMinification) bool enableMinification)
{ {
var isHtml = IsHtml(path); var isHtml = IsHtml(path);
@ -58,7 +59,7 @@ namespace MediaBrowser.WebDashboard.Api
{ {
// Don't apply any caching for html pages // Don't apply any caching for html pages
// jQuery ajax doesn't seem to handle if-modified-since correctly // jQuery ajax doesn't seem to handle if-modified-since correctly
if (isHtml) if (isHtml && path.IndexOf("cordovaindex.html", StringComparison.OrdinalIgnoreCase) == -1)
{ {
resourceStream = await ModifyHtml(resourceStream, mode, localizationCulture, enableMinification).ConfigureAwait(false); resourceStream = await ModifyHtml(resourceStream, mode, localizationCulture, enableMinification).ConfigureAwait(false);
} }
@ -137,7 +138,12 @@ namespace MediaBrowser.WebDashboard.Api
{ {
try try
{ {
var minifier = new HtmlMinifier(new HtmlMinificationSettings()); var minifier = new HtmlMinifier(new HtmlMinificationSettings
{
AttributeQuotesRemovalMode = HtmlAttributeQuotesRemovalMode.KeepQuotes,
RemoveOptionalEndTags = false,
RemoveTagsWithoutContent = false
});
var result = minifier.Minify(html, false); var result = minifier.Minify(html, false);
if (result.Errors.Count > 0) if (result.Errors.Count > 0)
@ -325,7 +331,7 @@ namespace MediaBrowser.WebDashboard.Api
{ {
apiClientFiles.Add("thirdparty/cordova/remotecontrols.js"); apiClientFiles.Add("thirdparty/cordova/remotecontrols.js");
} }
foreach (var file in apiClientFiles) foreach (var file in apiClientFiles)
{ {
using (var fs = _fileSystem.GetFileStream(GetDashboardResourcePath(file), FileMode.Open, FileAccess.Read, FileShare.ReadWrite, true)) using (var fs = _fileSystem.GetFileStream(GetDashboardResourcePath(file), FileMode.Open, FileAccess.Read, FileShare.ReadWrite, true))

3
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -213,6 +213,9 @@
<Content Include="dashboard-ui\thirdparty\apiclient\connectservice.js"> <Content Include="dashboard-ui\thirdparty\apiclient\connectservice.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\thirdparty\cordova\cordovaindex.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\thirdparty\cordova\remotecontrols.js"> <Content Include="dashboard-ui\thirdparty\cordova\remotecontrols.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>