Rename class "error-ui" to "blazor-error-ui"

Adrian Wright · SteveSandersonMS · commit 0cf058711f16 · 2019-10-10T19:57:23.000+01:00
diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/wwwroot/css/site.css b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/wwwroot/css/site.css
@@ -96,7 +96,7 @@ app {
     color: red;
 }
 
-#error-ui {
+#blazor-error-ui {
     background: lightyellow;
     bottom: 0;
     box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
@@ -108,7 +108,7 @@ app {
     z-index: 1000;
 }
 
-#error-ui .dismiss {
+#blazor-error-ui .dismiss {
     cursor: pointer;
     position: absolute;
     right: 0.75rem;
diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/wwwroot/index.html b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/wwwroot/index.html
@@ -13,7 +13,7 @@
 <body>
     <app>Loading...</app>
 
-    <div id="error-ui">
+    <div id="blazor-error-ui">
         An unhandled error has occurred.
         <a href class="reload">Reload</a>
         <a class="dismiss">🗙</a>
diff --git a/src/Components/Samples/BlazorServerApp/Shared/MainLayout.razor b/src/Components/Samples/BlazorServerApp/Shared/MainLayout.razor
@@ -1,4 +1,4 @@
-﻿@inherits LayoutComponentBase
+@inherits LayoutComponentBase
 
 <div class="sidebar">
     <NavMenu />
@@ -14,7 +14,7 @@
     </div>
 
 </div>
-<div id="error-ui">
+<div id="blazor-error-ui">
     An unhandled error has occurred.
     <a class="reload">Reload</a>
     <a class="dismiss">X</a>
diff --git a/src/Components/Samples/BlazorServerApp/wwwroot/css/site.css b/src/Components/Samples/BlazorServerApp/wwwroot/css/site.css
@@ -111,7 +111,7 @@ app {
     color: red;
 }
 
-#error-ui {
+#blazor-error-ui {
     background: lightyellow;
     position: fixed;
     border: "1px solid";
@@ -122,7 +122,7 @@ app {
     z-index: 1000;
 }
 
-#error-ui .dismiss {
+#blazor-error-ui .dismiss {
     position: absolute;
     right: 5px;
     top: 5px;
diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js
diff --git a/src/Components/Web.JS/dist/Release/blazor.webassembly.js b/src/Components/Web.JS/dist/Release/blazor.webassembly.js
diff --git a/src/Components/Web.JS/src/BootErrors.ts b/src/Components/Web.JS/src/BootErrors.ts
@@ -1,25 +1,25 @@
 let hasFailed = false;
 
 export async function showErrorNotification() {
-    let errorUi = document.querySelector('#error-ui') as HTMLElement;
+    let errorUi = document.querySelector('#blazor-error-ui') as HTMLElement;
     if (errorUi) {
         errorUi.style.display = 'block';
     }
 
     if (!hasFailed) {
         hasFailed = true;
-        const errorUiReloads = document.querySelectorAll<HTMLElement>('#error-ui .reload');
+        const errorUiReloads = document.querySelectorAll<HTMLElement>('#blazor-error-ui .reload');
         errorUiReloads.forEach(reload => {
             reload.onclick = function (e) {
                 location.reload();
                 e.preventDefault();
             };
         });
 
-        let errorUiDismiss = document.querySelectorAll<HTMLElement>('#error-ui .dismiss');
+        let errorUiDismiss = document.querySelectorAll<HTMLElement>('#blazor-error-ui .dismiss');
         errorUiDismiss.forEach(dismiss => {
             dismiss.onclick = function (e) {
-                const errorUi = document.querySelector<HTMLElement>('#error-ui');
+                const errorUi = document.querySelector<HTMLElement>('#blazor-error-ui');
                 if (errorUi) {
                     errorUi.style.display = 'none';
                 }
diff --git a/src/Components/test/E2ETest/Tests/ErrorNotificationClientSideTest.cs b/src/Components/test/E2ETest/Tests/ErrorNotificationClientSideTest.cs
@@ -28,20 +28,20 @@ protected override void InitializeAsyncCore()
             // On WebAssembly, page reloads are expensive so skip if possible
             Navigate(ServerPathBase, noReload: _serverFixture.ExecutionMode == ExecutionMode.Client);
             Browser.MountTestComponent<ErrorComponent>();
-            Browser.Exists(By.Id("error-ui"));
+            Browser.Exists(By.Id("blazor-error-ui"));
             Browser.Exists(By.TagName("button"));
         }
 
         [Fact]
         public void ShowsErrorNotification_OnError_Dismiss()
         {
-            var errorUi = Browser.FindElement(By.Id("error-ui"));
+            var errorUi = Browser.FindElement(By.Id("blazor-error-ui"));
             Assert.Equal("none", errorUi.GetCssValue("display"));
 
             var causeErrorButton = Browser.FindElement(By.TagName("button"));
             causeErrorButton.Click();
 
-            Browser.Exists(By.CssSelector("#error-ui[style='display: block;']"), TimeSpan.FromSeconds(10));
+            Browser.Exists(By.CssSelector("#blazor-error-ui[style='display: block;']"), TimeSpan.FromSeconds(10));
 
             var reload = Browser.FindElement(By.ClassName("reload"));
             reload.Click();
@@ -53,15 +53,15 @@ public void ShowsErrorNotification_OnError_Dismiss()
         public void ShowsErrorNotification_OnError_Reload()
         {
             var causeErrorButton = Browser.Exists(By.TagName("button"));
-            var errorUi = Browser.FindElement(By.Id("error-ui"));
+            var errorUi = Browser.FindElement(By.Id("blazor-error-ui"));
             Assert.Equal("none", errorUi.GetCssValue("display"));
 
             causeErrorButton.Click();
-            Browser.Exists(By.CssSelector("#error-ui[style='display: block;']"));
+            Browser.Exists(By.CssSelector("#blazor-error-ui[style='display: block;']"));
 
             var dismiss = Browser.FindElement(By.ClassName("dismiss"));
             dismiss.Click();
-            Browser.Exists(By.CssSelector("#error-ui[style='display: none;']"));
+            Browser.Exists(By.CssSelector("#blazor-error-ui[style='display: none;']"));
         }
     }
 }
diff --git a/src/Components/test/testassets/BasicTestApp/Index.razor b/src/Components/test/testassets/BasicTestApp/Index.razor
@@ -83,7 +83,7 @@
     @((RenderFragment)RenderSelectedComponent)
 </app>
 
-<div id="error-ui">
+<div id="blazor-error-ui">
     An unhandled error has occurred.
     <a href class='reload'>Reload</a>
     <a class='dismiss' style="cursor: pointer;">🗙</a>
diff --git a/src/Components/test/testassets/BasicTestApp/wwwroot/style.css b/src/Components/test/testassets/BasicTestApp/wwwroot/style.css
@@ -6,11 +6,11 @@
     outline: 1px solid red;
 }
 
-#error-ui {
+#blazor-error-ui {
     display: none;
 }
 
-    #error-ui dismiss {
+    #blazor-error-ui dismiss {
         cursor: pointer;
     }
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml
@@ -17,7 +17,7 @@
         @(await Html.RenderComponentAsync<App>(RenderMode.ServerPrerendered))
     </app>
 
-    <div id="error-ui">
+    <div id="blazor-error-ui">
         <environment include="Staging,Production">
             An error has occurred. This application may no longer respond until reloaded.
         </environment>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/wwwroot/css/site.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/wwwroot/css/site.css
@@ -111,7 +111,7 @@ app {
     color: red;
 }
 
-#error-ui {
+#blazor-error-ui {
     background: lightyellow;
     bottom: 0;
     box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
@@ -123,7 +123,7 @@ app {
     z-index: 1000;
 }
 
-#error-ui .dismiss {
+#blazor-error-ui .dismiss {
     cursor: pointer;
     position: absolute;
     right: 0.75rem;

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@`
`6`	`6`	`outline: 1px solid red;`
`7`	`7`	`}`
`8`	`8`
`9`		`-#error-ui {`
	`9`	`+#blazor-error-ui {`
`10`	`10`	`display: none;`
`11`	`11`	`}`
`12`	`12`
`13`		`- #error-ui dismiss {`
	`13`	`+ #blazor-error-ui dismiss {`
`14`	`14`	`cursor: pointer;`
`15`	`15`	`}`
`16`	`16`