huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Adrian Wright 2019-10-10 12:57:27 +01:00 committed by Steve Sanderson
parent 1141654673
commit 0cf058711f
12 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/wwwroot/css/site.css
View File

@ -96,7 +96,7 @@ app {
color: red; color: red;
} }
#error-ui { #blazor-error-ui {
background: lightyellow; background: lightyellow;
bottom: 0; bottom: 0;
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
@ -108,7 +108,7 @@ app {
z-index: 1000; z-index: 1000;
} }
#error-ui .dismiss { #blazor-error-ui .dismiss {
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
right: 0.75rem; right: 0.75rem;

2
src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/wwwroot/index.html
View File

@ -13,7 +13,7 @@
<body> <body>
<app>Loading...</app> <app>Loading...</app>
<div id="error-ui"> <div id="blazor-error-ui">
An unhandled error has occurred. An unhandled error has occurred.
<a href class="reload">Reload</a> <a href class="reload">Reload</a>
<a class="dismiss">🗙</a> <a class="dismiss">🗙</a>

4
src/Components/Samples/BlazorServerApp/Shared/MainLayout.razor
View File

@ -1,4 +1,4 @@
@inherits LayoutComponentBase @inherits LayoutComponentBase
<div class="sidebar"> <div class="sidebar">
<NavMenu /> <NavMenu />
@ -14,7 +14,7 @@
</div> </div>
</div> </div>
<div id="error-ui"> <div id="blazor-error-ui">
An unhandled error has occurred. An unhandled error has occurred.
<a class="reload">Reload</a> <a class="reload">Reload</a>
<a class="dismiss">X</a> <a class="dismiss">X</a>

4
src/Components/Samples/BlazorServerApp/wwwroot/css/site.css
View File

@ -111,7 +111,7 @@ app {
color: red; color: red;
} }
#error-ui { #blazor-error-ui {
background: lightyellow; background: lightyellow;
position: fixed; position: fixed;
border: "1px solid"; border: "1px solid";
@ -122,7 +122,7 @@ app {
z-index: 1000; z-index: 1000;
} }
#error-ui .dismiss { #blazor-error-ui .dismiss {
position: absolute; position: absolute;
right: 5px; right: 5px;
top: 5px; top: 5px;

4
src/Components/Web.JS/dist/Release/blazor.server.js generated vendored
View File

File diff suppressed because one or more lines are too long

2
src/Components/Web.JS/dist/Release/blazor.webassembly.js generated vendored
View File

File diff suppressed because one or more lines are too long

8
src/Components/Web.JS/src/BootErrors.ts
View File

@ -1,14 +1,14 @@
let hasFailed = false; let hasFailed = false;
export async function showErrorNotification() { export async function showErrorNotification() {
let errorUi = document.querySelector('#error-ui') as HTMLElement; let errorUi = document.querySelector('#blazor-error-ui') as HTMLElement;
if (errorUi) { if (errorUi) {
errorUi.style.display = 'block'; errorUi.style.display = 'block';
} }
if (!hasFailed) { if (!hasFailed) {
hasFailed = true; hasFailed = true;
const errorUiReloads = document.querySelectorAll<HTMLElement>('#error-ui .reload'); const errorUiReloads = document.querySelectorAll<HTMLElement>('#blazor-error-ui .reload');
errorUiReloads.forEach(reload => { errorUiReloads.forEach(reload => {
reload.onclick = function (e) { reload.onclick = function (e) {
location.reload(); location.reload();
@ -16,10 +16,10 @@ export async function showErrorNotification() {
}; };
}); });
let errorUiDismiss = document.querySelectorAll<HTMLElement>('#error-ui .dismiss'); let errorUiDismiss = document.querySelectorAll<HTMLElement>('#blazor-error-ui .dismiss');
errorUiDismiss.forEach(dismiss => { errorUiDismiss.forEach(dismiss => {
dismiss.onclick = function (e) { dismiss.onclick = function (e) {
const errorUi = document.querySelector<HTMLElement>('#error-ui'); const errorUi = document.querySelector<HTMLElement>('#blazor-error-ui');
if (errorUi) { if (errorUi) {
errorUi.style.display = 'none'; errorUi.style.display = 'none';
} }

12
src/Components/test/E2ETest/Tests/ErrorNotificationClientSideTest.cs
View File

@ -28,20 +28,20 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests
// On WebAssembly, page reloads are expensive so skip if possible // On WebAssembly, page reloads are expensive so skip if possible
Navigate(ServerPathBase, noReload: _serverFixture.ExecutionMode == ExecutionMode.Client); Navigate(ServerPathBase, noReload: _serverFixture.ExecutionMode == ExecutionMode.Client);
Browser.MountTestComponent<ErrorComponent>(); Browser.MountTestComponent<ErrorComponent>();
Browser.Exists(By.Id("error-ui")); Browser.Exists(By.Id("blazor-error-ui"));
Browser.Exists(By.TagName("button")); Browser.Exists(By.TagName("button"));
} }
[Fact] [Fact]
public void ShowsErrorNotification_OnError_Dismiss() 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")); Assert.Equal("none", errorUi.GetCssValue("display"));
var causeErrorButton = Browser.FindElement(By.TagName("button")); var causeErrorButton = Browser.FindElement(By.TagName("button"));
causeErrorButton.Click(); 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")); var reload = Browser.FindElement(By.ClassName("reload"));
reload.Click(); reload.Click();
@ -53,15 +53,15 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests
public void ShowsErrorNotification_OnError_Reload() public void ShowsErrorNotification_OnError_Reload()
{ {
var causeErrorButton = Browser.Exists(By.TagName("button")); 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")); Assert.Equal("none", errorUi.GetCssValue("display"));
causeErrorButton.Click(); 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")); var dismiss = Browser.FindElement(By.ClassName("dismiss"));
dismiss.Click(); dismiss.Click();
Browser.Exists(By.CssSelector("#error-ui[style='display: none;']")); Browser.Exists(By.CssSelector("#blazor-error-ui[style='display: none;']"));
} }
} }
} }

2
src/Components/test/testassets/BasicTestApp/Index.razor
View File

@ -83,7 +83,7 @@
@((RenderFragment)RenderSelectedComponent) @((RenderFragment)RenderSelectedComponent)
</app> </app>
<div id="error-ui"> <div id="blazor-error-ui">
An unhandled error has occurred. An unhandled error has occurred.
<a href class='reload'>Reload</a> <a href class='reload'>Reload</a>
<a class='dismiss' style="cursor: pointer;">🗙</a> <a class='dismiss' style="cursor: pointer;">🗙</a>

4
src/Components/test/testassets/BasicTestApp/wwwroot/style.css
View File

@ -6,11 +6,11 @@
outline: 1px solid red; outline: 1px solid red;
} }
#error-ui { #blazor-error-ui {
display: none; display: none;
} }
#error-ui dismiss { #blazor-error-ui dismiss {
cursor: pointer; cursor: pointer;
} }

2
src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml
View File

@ -17,7 +17,7 @@
@(await Html.RenderComponentAsync<App>(RenderMode.ServerPrerendered)) @(await Html.RenderComponentAsync<App>(RenderMode.ServerPrerendered))
</app> </app>
<div id="error-ui"> <div id="blazor-error-ui">
<environment include="Staging,Production"> <environment include="Staging,Production">
An error has occurred. This application may no longer respond until reloaded. An error has occurred. This application may no longer respond until reloaded.
</environment> </environment>

4
src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/wwwroot/css/site.css
View File

@ -111,7 +111,7 @@ app {
color: red; color: red;
} }
#error-ui { #blazor-error-ui {
background: lightyellow; background: lightyellow;
bottom: 0; bottom: 0;
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
@ -123,7 +123,7 @@ app {
z-index: 1000; z-index: 1000;
} }
#error-ui .dismiss { #blazor-error-ui .dismiss {
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
right: 0.75rem; right: 0.75rem;