From d83ae9895cce774f5124683c7829934ca7ce127a Mon Sep 17 00:00:00 2001
From: markus101 <markus.mcd5@gmail.com>
Date: Tue, 15 Feb 2011 22:23:28 -0800
Subject: [PATCH] Removed conflicting JavaScript additions, that broke Series
 Details.

---
 NzbDrone.Web/Controllers/SeriesController.cs | 9 ---------
 NzbDrone.Web/Views/Series/Details.aspx       | 4 ++--
 NzbDrone.Web/Views/Shared/Site.Master        | 4 +---
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/NzbDrone.Web/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs
index 23c0b1713..a02e6ac19 100644
--- a/NzbDrone.Web/Controllers/SeriesController.cs
+++ b/NzbDrone.Web/Controllers/SeriesController.cs
@@ -35,7 +35,6 @@ namespace NzbDrone.Web.Controllers
             return View();
         }
 
-
         public ActionResult Sync()
         {
             _syncProvider.BeginSyncUnmappedFolders();
@@ -48,13 +47,11 @@ namespace NzbDrone.Web.Controllers
             return RedirectToAction("Index");
         }
 
-
         public ActionResult UnMapped()
         {
             return View(_seriesProvider.GetUnmappedFolders().Select(c => new MappingModel() { Id = 1, Path = c.Value }).ToList());
         }
 
-
         public ActionResult LoadEpisodes(int seriesId)
         {
             _episodeProvider.RefreshEpisodeInfo(seriesId);
@@ -64,7 +61,6 @@ namespace NzbDrone.Web.Controllers
             });
         }
 
-
         [GridAction]
         public ActionResult _AjaxSeasonGrid(int seasonId)
         {
@@ -80,8 +76,6 @@ namespace NzbDrone.Web.Controllers
             return View(new GridModel(episodes));
         }
 
-
-
         [GridAction]
         public ActionResult _CustomBinding(GridCommand command, int seasonId)
         {
@@ -163,12 +157,9 @@ namespace NzbDrone.Web.Controllers
             return RedirectToAction("UnMapped");
         }
 
-
         public ActionResult Details(int seriesId)
         {
             return View(_seriesProvider.GetSeries(seriesId));
         }
-
-
     }
 }
diff --git a/NzbDrone.Web/Views/Series/Details.aspx b/NzbDrone.Web/Views/Series/Details.aspx
index aac13370b..af14d21c7 100644
--- a/NzbDrone.Web/Views/Series/Details.aspx
+++ b/NzbDrone.Web/Views/Series/Details.aspx
@@ -53,9 +53,9 @@
                               columns.Bound(c => c.Title).Title("Title");
                               columns.Bound(c => c.AirDate).Format("{0:d}").Width(0);
                           })
-            //.DetailView(detailView => detailView.Template(e => Html.RenderPartial("EpisodeDetail", e)))
+             //.DetailView(detailView => detailView.Template(e => Html.RenderPartial("EpisodeDetail", e)))
              .DetailView(detailView => detailView.ClientTemplate("<div><#= Overview #></div>"))
-             .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.EpisodeNumber).Ascending()).Enabled(false))
+             .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.EpisodeNumber)).Enabled(false))
                           .Footer(false)
                           .DataBinding(d => d.Ajax().Select("_AjaxSeasonGrid", "Series", new RouteValueDictionary { { "seasonId", season1.SeasonId.ToString() } }))
             //.EnableCustomBinding(true)
diff --git a/NzbDrone.Web/Views/Shared/Site.Master b/NzbDrone.Web/Views/Shared/Site.Master
index 9fdc083f8..7cd6f1ddf 100644
--- a/NzbDrone.Web/Views/Shared/Site.Master
+++ b/NzbDrone.Web/Views/Shared/Site.Master
@@ -52,13 +52,11 @@
 </body>
 <asp:ContentPlaceHolder runat="server" id="Scripts" />
 <% Html.Telerik().ScriptRegistrar().Scripts(
-           c => c.Add("jquery-1.4.3.min.js")
-               .Add("jquery-ui-1.8.8.min.js")
+           c => c.Add("jquery-ui-1.8.8.min.js")
                .Add("jquery.form.js")
                .Add("jquery.jgrowl.js")
                .Add("Notification.js")
                .Add("jquery-tgc-countdown-1.0.js")
-               .Add("jquery.simpledropdown.js")
                .Add("MicrosoftAjax.js")
                .Add("MicrosoftMvcValidation.js"))
                .Render();