|
|
@ -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;
|
|
|
|
|
|
|
|
|
|
|
@ -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)
|
|
|
|