From f9e51a4a6b63834ecc4f6edaab6f952e941b078f Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 15 Dec 2013 12:01:56 -0500
Subject: [PATCH] deprecate firefox slider script

---
 MediaBrowser.Controller/MediaInfo/FFMpegManager.cs        | 8 ++++----
 MediaBrowser.WebDashboard/Api/DashboardService.cs         | 1 -
 .../MediaBrowser.WebDashboard.csproj                      | 3 ---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
index fad204c694..445eb9fa53 100644
--- a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
+++ b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
@@ -170,7 +170,7 @@ namespace MediaBrowser.Controller.MediaInfo
         private void DeleteDeadImages(IEnumerable<string> images, IEnumerable<ChapterInfo> chapters)
         {
             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))
                 .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>
         /// Gets the subtitle cache path.
@@ -220,7 +220,7 @@ namespace MediaBrowser.Controller.MediaInfo
                 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);
 
@@ -229,7 +229,7 @@ namespace MediaBrowser.Controller.MediaInfo
 
         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 prefix = videoId.Substring(0, 1);
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 1a8b782628..5a167cccd4 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -561,7 +561,6 @@ namespace MediaBrowser.WebDashboard.Api
             await memoryStream.WriteAsync(newLineBytes, 0, newLineBytes.Length).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);
 
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 825bb9084e..41b76dbd22 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -624,9 +624,6 @@
     <Content Include="dashboard-ui\thirdparty\autoNumeric.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\html5slider.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\thirdparty\jstree1.0\jquery.jstree.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>