HS4 Compatibilty fix

dk307 · Nov 26, 2020 · 890e60e · 890e60e
1 parent 88fbbaa
commit 890e60e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Pages/ConfigPage.cs b/Pages/ConfigPage.cs
@@ -136,18 +136,18 @@ public string PostBackProc(string data, [AllowNull]string user, int userRights)
 
                     pluginConfig.AddDevice(device);
                     pluginConfig.FireConfigChanged();
-                    divToUpdate.Add(SaveErrorDivId, RedirectPage(Invariant($"/{HttpUtility.UrlEncode(ConfigPage.Name)}")));
+                    divToUpdate.Add(SaveErrorDivId, RedirectPageJS(Invariant($"/{HttpUtility.UrlEncode(ConfigPage.Name)}")));
                 }
             }
             else if (form == NameToIdWithPrefix(CancelDeviceName))
             {
-                divToUpdate.Add(SaveErrorDivId, RedirectPage(Invariant($"/{HttpUtility.UrlEncode(ConfigPage.Name)}")));
+                divToUpdate.Add(SaveErrorDivId, RedirectPageJS(Invariant($"/{HttpUtility.UrlEncode(ConfigPage.Name)}")));
             }
             else if (form == NameToIdWithPrefix(DeleteDeviceName))
             {
                 pluginConfig.RemoveDevice(parts[DeviceIdId]);
                 pluginConfig.FireConfigChanged();
-                divToUpdate.Add(SaveErrorDivId, RedirectPage(Invariant($"/{HttpUtility.UrlEncode(ConfigPage.Name)}")));
+                divToUpdate.Add(SaveErrorDivId, RedirectPageJS(Invariant($"/{HttpUtility.UrlEncode(ConfigPage.Name)}")));
             }
             else if (form == NameToIdWithPrefix(SaveSettingName))
             {

diff --git a/Pages/PageHelper.cs b/Pages/PageHelper.cs
@@ -121,6 +121,14 @@ protected static NameValueCollection CreateNameValueCreation<T>() where T : Enum
 
             return collection;
         }
+        protected static string RedirectPageJS(string url)
+        {
+            StringBuilder stb = new StringBuilder();
+            stb.AppendLine("<script type='text/javascript'>");
+            stb.AppendLine(Invariant($"$(document).ready(function() {{ location.assign('{url}'); }});"));
+            stb.AppendLine("</script>");
+            return stb.ToString();
+        }
 
         protected const string DeviceIdId = "DeviceIdId";
         protected const string PageTypeId = "type";