mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-08 20:38:24 +02:00
deprecate firefox slider script
This commit is contained in:
parent
558a365e38
commit
f9e51a4a6b
3 changed files with 4 additions and 8 deletions
|
@ -170,7 +170,7 @@ namespace MediaBrowser.Controller.MediaInfo
|
||||||
private void DeleteDeadImages(IEnumerable<string> images, IEnumerable<ChapterInfo> chapters)
|
private void DeleteDeadImages(IEnumerable<string> images, IEnumerable<ChapterInfo> chapters)
|
||||||
{
|
{
|
||||||
var deadImages = images
|
var deadImages = images
|
||||||
.Except(chapters.Select(i => i.ImagePath), StringComparer.OrdinalIgnoreCase)
|
.Except(chapters.Select(i => i.ImagePath).Where(i => !string.IsNullOrEmpty(i)), StringComparer.OrdinalIgnoreCase)
|
||||||
.Where(i => BaseItem.SupportedImageExtensions.Contains(Path.GetExtension(i), StringComparer.OrdinalIgnoreCase))
|
.Where(i => BaseItem.SupportedImageExtensions.Contains(Path.GetExtension(i), StringComparer.OrdinalIgnoreCase))
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
@ -189,7 +189,7 @@ namespace MediaBrowser.Controller.MediaInfo
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private readonly CultureInfo UsCulture = new CultureInfo("en-US");
|
private readonly CultureInfo _usCulture = new CultureInfo("en-US");
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the subtitle cache path.
|
/// Gets the subtitle cache path.
|
||||||
|
@ -220,7 +220,7 @@ namespace MediaBrowser.Controller.MediaInfo
|
||||||
ticksParam += _fileSystem.GetLastWriteTimeUtc(stream.Path).Ticks;
|
ticksParam += _fileSystem.GetLastWriteTimeUtc(stream.Path).Ticks;
|
||||||
}
|
}
|
||||||
|
|
||||||
var filename = (input.Id + "_" + subtitleStreamIndex.ToString(UsCulture) + "_" + input.DateModified.Ticks.ToString(UsCulture) + ticksParam).GetMD5() + outputExtension;
|
var filename = (input.Id + "_" + subtitleStreamIndex.ToString(_usCulture) + "_" + input.DateModified.Ticks.ToString(_usCulture) + ticksParam).GetMD5() + outputExtension;
|
||||||
|
|
||||||
var prefix = filename.Substring(0, 1);
|
var prefix = filename.Substring(0, 1);
|
||||||
|
|
||||||
|
@ -229,7 +229,7 @@ namespace MediaBrowser.Controller.MediaInfo
|
||||||
|
|
||||||
public string GetChapterImagePath(Video video, long chapterPositionTicks)
|
public string GetChapterImagePath(Video video, long chapterPositionTicks)
|
||||||
{
|
{
|
||||||
var filename = video.DateModified.Ticks.ToString(UsCulture) + "_" + chapterPositionTicks.ToString(UsCulture) + ".jpg";
|
var filename = video.DateModified.Ticks.ToString(_usCulture) + "_" + chapterPositionTicks.ToString(_usCulture) + ".jpg";
|
||||||
|
|
||||||
var videoId = video.Id.ToString();
|
var videoId = video.Id.ToString();
|
||||||
var prefix = videoId.Substring(0, 1);
|
var prefix = videoId.Substring(0, 1);
|
||||||
|
|
|
@ -561,7 +561,6 @@ namespace MediaBrowser.WebDashboard.Api
|
||||||
await memoryStream.WriteAsync(newLineBytes, 0, newLineBytes.Length).ConfigureAwait(false);
|
await memoryStream.WriteAsync(newLineBytes, 0, newLineBytes.Length).ConfigureAwait(false);
|
||||||
|
|
||||||
await AppendResource(memoryStream, "thirdparty/autoNumeric.js", newLineBytes).ConfigureAwait(false);
|
await AppendResource(memoryStream, "thirdparty/autoNumeric.js", newLineBytes).ConfigureAwait(false);
|
||||||
await AppendResource(memoryStream, "thirdparty/html5slider.js", newLineBytes).ConfigureAwait(false);
|
|
||||||
|
|
||||||
await AppendResource(assembly, memoryStream, "MediaBrowser.WebDashboard.ApiClient.js", newLineBytes).ConfigureAwait(false);
|
await AppendResource(assembly, memoryStream, "MediaBrowser.WebDashboard.ApiClient.js", newLineBytes).ConfigureAwait(false);
|
||||||
|
|
||||||
|
|
|
@ -624,9 +624,6 @@
|
||||||
<Content Include="dashboard-ui\thirdparty\autoNumeric.js">
|
<Content Include="dashboard-ui\thirdparty\autoNumeric.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="dashboard-ui\thirdparty\html5slider.js">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Include="dashboard-ui\thirdparty\jstree1.0\jquery.jstree.js">
|
<Content Include="dashboard-ui\thirdparty\jstree1.0\jquery.jstree.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
|
Loading…
Reference in a new issue