From 2635ff9beef81de5166b6a73ca8c67a0532a8e6f Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Sun, 29 Jan 2012 17:38:44 -0800
Subject: [PATCH] Fix: Grids will no longer display alerts when navigating to
 another page while the grid is still loading.

---
 NzbDrone.Web/NzbDrone.Web.csproj              |  1 +
 NzbDrone.Web/Scripts/NzbDrone/Notification.js |  3 ++-
 NzbDrone.Web/Scripts/NzbDrone/grid.js         |  4 ++++
 NzbDrone.Web/Views/History/Index.cshtml       |  6 ++++++
 NzbDrone.Web/Views/Log/Index.cshtml           |  6 ++++++
 NzbDrone.Web/Views/Misnamed/Index.cshtml      |  5 ++++-
 NzbDrone.Web/Views/Missing/Index.cshtml       |  6 ++++++
 NzbDrone.Web/Views/Series/Details.cshtml      |  3 +++
 NzbDrone.Web/Views/Series/Index.cshtml        |  3 +++
 .../Views/Shared/_ReferenceLayout.cshtml      |  3 ++-
 NzbDrone.Web/Views/Upcoming/Index.cshtml      | 21 +++++++++++++++++++
 11 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 NzbDrone.Web/Scripts/NzbDrone/grid.js

diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index cecff258d..711a65f64 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -380,6 +380,7 @@
     <Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
     <Content Include="Scripts\NzbDrone\addSeries.js" />
     <Content Include="Scripts\NzbDrone\AutoComplete.js" />
+    <Content Include="Scripts\NzbDrone\grid.js" />
     <Content Include="Scripts\NzbDrone\settings.js" />
     <Content Include="Scripts\NzbDrone\localSearch.js" />
     <Content Include="Scripts\NzbDrone\Notification.js" />
diff --git a/NzbDrone.Web/Scripts/NzbDrone/Notification.js b/NzbDrone.Web/Scripts/NzbDrone/Notification.js
index d5697be6e..1a6d7acee 100644
--- a/NzbDrone.Web/Scripts/NzbDrone/Notification.js
+++ b/NzbDrone.Web/Scripts/NzbDrone/Notification.js
@@ -32,9 +32,10 @@
 
         });
 
-        jqXHR.error(function (xhr, ajaxOptions, thrownError) {
+        jqXHR.error(function (xhr, textStatus, thrownError) {
             //ignore notification errors.
             if (this.url.indexOf("/notification/Comet") !== 0) {
+                alert("Status: " + textStatus + ", Error: " + thrownError);
                 $.gritter.add({
                     title: 'Request failed',
                     text: this.url,
diff --git a/NzbDrone.Web/Scripts/NzbDrone/grid.js b/NzbDrone.Web/Scripts/NzbDrone/grid.js
new file mode 100644
index 000000000..9dfb5a307
--- /dev/null
+++ b/NzbDrone.Web/Scripts/NzbDrone/grid.js
@@ -0,0 +1,4 @@
+function grid_onError(e) {
+    //Suppress the alert
+    e.preventDefault();
+}
\ No newline at end of file
diff --git a/NzbDrone.Web/Views/History/Index.cshtml b/NzbDrone.Web/Views/History/Index.cshtml
index 497acf2de..d82974c37 100644
--- a/NzbDrone.Web/Views/History/Index.cshtml
+++ b/NzbDrone.Web/Views/History/Index.cshtml
@@ -1,4 +1,5 @@
 @model List<HistoryModel>
+@using NzbDrone.Common
 @using NzbDrone.Web.Models
 @using NzbDrone.Web.Helpers
 @{ViewBag.Title = "History";}
@@ -49,6 +50,11 @@
               .Pageable(
                         c =>
                         c.PageSize(20).Position(GridPagerPosition.Bottom).Style(GridPagerStyles.NextPrevious))
+              .ClientEvents(clientEvents =>
+              {
+                  if (EnviromentProvider.IsProduction)
+                      clientEvents.OnError("grid_onError");
+              })
               .Render();}
 </div>
 <script type="text/javascript">
diff --git a/NzbDrone.Web/Views/Log/Index.cshtml b/NzbDrone.Web/Views/Log/Index.cshtml
index 1a19c49eb..08bf44234 100644
--- a/NzbDrone.Web/Views/Log/Index.cshtml
+++ b/NzbDrone.Web/Views/Log/Index.cshtml
@@ -1,3 +1,4 @@
+@using NzbDrone.Common
 @using NzbDrone.Core.Instrumentation
 @using NzbDrone.Web.Helpers
 @model IEnumerable<NzbDrone.Core.Instrumentation.Log>
@@ -50,6 +51,11 @@
             .Filterable()
             .ClientEvents(c => c.OnRowDataBound("onRowDataBound"))
             .Scrollable(c => c.Height(500))
+            .ClientEvents(clientEvents =>
+            {
+                if (EnviromentProvider.IsProduction)
+                    clientEvents.OnError("grid_onError");
+            })
             .Render();}
 <script type="text/javascript">
     function reloadGrid() {
diff --git a/NzbDrone.Web/Views/Misnamed/Index.cshtml b/NzbDrone.Web/Views/Misnamed/Index.cshtml
index b220156ab..8074627a3 100644
--- a/NzbDrone.Web/Views/Misnamed/Index.cshtml
+++ b/NzbDrone.Web/Views/Misnamed/Index.cshtml
@@ -1,4 +1,5 @@
-@using NzbDrone.Core.Model
+@using NzbDrone.Common
+@using NzbDrone.Core.Model
 @{ViewBag.Title = "Misnamed";}
 @section ActionMenu{
     <ul class="sub-menu">
@@ -47,6 +48,8 @@
                 .ClientEvents(clientEvents =>
                 {
                     clientEvents.OnDataBound("grid_dataBound");
+                    if (EnviromentProvider.IsProduction)
+                        clientEvents.OnError("grid_onError");
                 })
                 .Render();}
 </div>
diff --git a/NzbDrone.Web/Views/Missing/Index.cshtml b/NzbDrone.Web/Views/Missing/Index.cshtml
index 6ffbc29d0..2f1d57b5c 100644
--- a/NzbDrone.Web/Views/Missing/Index.cshtml
+++ b/NzbDrone.Web/Views/Missing/Index.cshtml
@@ -1,4 +1,5 @@
 @model List<MissingEpisodeModel>
+@using NzbDrone.Common
 @using NzbDrone.Web.Helpers
 @using NzbDrone.Web.Models;
 @{ViewBag.Title="Missing";}
@@ -48,4 +49,9 @@
             .Pageable(
                 c =>
                 c.PageSize(20).Position(GridPagerPosition.Bottom).Style(GridPagerStyles.NextPrevious))
+            .ClientEvents(clientEvents =>
+            {
+                if (EnviromentProvider.IsProduction)
+                    clientEvents.OnError("grid_onError");
+            })
             .Render();}
diff --git a/NzbDrone.Web/Views/Series/Details.cshtml b/NzbDrone.Web/Views/Series/Details.cshtml
index 2b8625a2e..882250599 100644
--- a/NzbDrone.Web/Views/Series/Details.cshtml
+++ b/NzbDrone.Web/Views/Series/Details.cshtml
@@ -1,4 +1,5 @@
 @model SeriesModel
+@using NzbDrone.Common
 @using NzbDrone.Web.Helpers
 @using NzbDrone.Web.Models
 @{ViewBag.Title = Model.Title;}
@@ -128,6 +129,8 @@
         {
             clientEvents.OnRowDataBound("grid_rowBound");
             clientEvents.OnDataBound("grid_dataBound");
+            if (EnviromentProvider.IsProduction)
+                clientEvents.OnError("grid_onError");
         })
         .Sortable(sorting => sorting
         .OrderBy(sortOrder => sortOrder.Add(o => o.EpisodeNumber).Descending()).SortMode(GridSortMode.SingleColumn))
diff --git a/NzbDrone.Web/Views/Series/Index.cshtml b/NzbDrone.Web/Views/Series/Index.cshtml
index e5881a2f8..a77e80f78 100644
--- a/NzbDrone.Web/Views/Series/Index.cshtml
+++ b/NzbDrone.Web/Views/Series/Index.cshtml
@@ -1,3 +1,4 @@
+@using NzbDrone.Common
 @using NzbDrone.Web.Helpers
 @using NzbDrone.Web.Models;
 @model IEnumerable<NzbDrone.Core.Repository.Series>
@@ -98,6 +99,8 @@
                     clientEvents.OnEdit("grid_edit");
                     clientEvents.OnSave("grid_save");
                     clientEvents.OnRowDataBound("grid_rowBound");
+                    if(EnviromentProvider.IsProduction)
+                        clientEvents.OnError("grid_onError");
                 })
                 .Render();}
 @section Scripts{
diff --git a/NzbDrone.Web/Views/Shared/_ReferenceLayout.cshtml b/NzbDrone.Web/Views/Shared/_ReferenceLayout.cshtml
index 0660cffd8..701b53690 100644
--- a/NzbDrone.Web/Views/Shared/_ReferenceLayout.cshtml
+++ b/NzbDrone.Web/Views/Shared/_ReferenceLayout.cshtml
@@ -34,6 +34,7 @@
     @Html.IncludeScript("NzbDrone/AutoComplete.js")
     @Html.IncludeScript("NzbDrone/Notification.js")
     @Html.IncludeScript("NzbDrone/AutoBind.js")
+    @Html.IncludeScript("NzbDrone/grid.js")
     @RenderSection("Scripts", required: false)
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/NzbDrone.Web/Views/Upcoming/Index.cshtml b/NzbDrone.Web/Views/Upcoming/Index.cshtml
index 328f42742..b738c3bd1 100644
--- a/NzbDrone.Web/Views/Upcoming/Index.cshtml
+++ b/NzbDrone.Web/Views/Upcoming/Index.cshtml
@@ -1,4 +1,5 @@
 @model List<UpcomingEpisodeModel>
+@using NzbDrone.Common
 @using NzbDrone.Web.Helpers
 @using NzbDrone.Web.Models
 @{ViewBag.Title = "Upcoming";}
@@ -43,6 +44,11 @@
                                                     ))
                     .DataBinding(data => data.Ajax().Select("_AjaxBindingYesterday", "Upcoming"))
                     .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDateTime).Ascending()).Enabled(true))
+                    .ClientEvents(clientEvents =>
+                    {
+                        if (EnviromentProvider.IsProduction)
+                            clientEvents.OnError("grid_onError");
+                    })
                     .Render();}
     </div>
 </div>
@@ -78,6 +84,11 @@
                                                     ))
                     .DataBinding(data => data.Ajax().Select("_AjaxBindingToday", "Upcoming"))
                     .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDateTime).Ascending()).Enabled(true))
+                    .ClientEvents(clientEvents =>
+                    {
+                        if (EnviromentProvider.IsProduction)
+                            clientEvents.OnError("grid_onError");
+                    })
                     .Render();}
     </div>
 </div>
@@ -115,6 +126,11 @@
 
                     .DataBinding(data => data.Ajax().Select("_AjaxBindingTomorrow", "Upcoming"))
                     .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDateTime).Ascending()).Enabled(true))
+                    .ClientEvents(clientEvents =>
+                    {
+                        if (EnviromentProvider.IsProduction)
+                            clientEvents.OnError("grid_onError");
+                    })
                     .Render();}
     </div>
 </div>
@@ -151,6 +167,11 @@
                                                   ))
                     .DataBinding(data => data.Ajax().Select("_AjaxBindingWeek", "Upcoming"))
                     .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDateTime).Ascending()).Enabled(true))
+                    .ClientEvents(clientEvents =>
+                    {
+                        if (EnviromentProvider.IsProduction)
+                            clientEvents.OnError("grid_onError");
+                    })
                     .Render();}
     </div>
 </div>