Skip to content
This repository has been archived by the owner on May 15, 2024. It is now read-only.

Commit

Permalink
chore(language): make more inclusive
Browse files Browse the repository at this point in the history
  • Loading branch information
MirandaBrawnerSavannah authored Oct 4, 2021
1 parent 02616b5 commit 90a5ca7
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ function Users({ children }) {
return (
<div>
<h1>Users</h1>
<div className="master">
<div className="overview">
<ul>
{/* use Link to route around the app */}
{users.map(user => (
Expand Down
2 changes: 1 addition & 1 deletion docs/Introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ render(<App />, document.body)

As the hash portion of the URL changes, `<App>` will render a different `<Child>` by branching on `this.state.route`. Pretty straightforward stuff. But it gets complicated fast.

Imagine now that `Inbox` has some nested UI at different URLs, maybe something like this master detail view:
Imagine now that `Inbox` has some nested UI at different URLs, maybe something like this overview-detail setup:

```
path: /inbox/messages/1234
Expand Down
2 changes: 1 addition & 1 deletion docs/guides/RouteConfiguration.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ Now when someone clicks on that link to `/inbox/messages/5` they'll automaticall

### Enter and Leave Hooks

[Route](/docs/Glossary.md#route)s may also define [`onEnter`](/docs/Glossary.md#enterhook) and [`onLeave`](/docs/Glossary.md#leavehook) hooks that are invoked once a transition has been [confirmed](/docs/guides/ConfirmingNavigation.md). These hooks are useful for various things like [requiring auth](https://github.com/americanexpress/one-app-router/tree/master/examples/auth-flow) when a route is entered and saving stuff to persistent storage before a route unmounts.
[Route](/docs/Glossary.md#route)s may also define [`onEnter`](/docs/Glossary.md#enterhook) and [`onLeave`](/docs/Glossary.md#leavehook) hooks that are invoked once a transition has been [confirmed](/docs/guides/ConfirmingNavigation.md). These hooks are useful for various things like [requiring auth](https://github.com/americanexpress/one-app-router/tree/main/examples/auth-flow) when a route is entered and saving stuff to persistent storage before a route unmounts.

During a transition, [`onLeave` hooks](/docs/Glossary.md#leavehook) run first on all routes we are leaving, starting with the leaf route on up to the first common ancestor route. Next, [`onEnter` hooks](/docs/Glossary.md#enterhook) run starting with the first parent route we're entering down to the leaf route.

Expand Down
2 changes: 1 addition & 1 deletion examples/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h1>One App Router Examples</h1>
<li><a href="confirming-navigation">Confirming Navigation</a></li>
<li><a href="dynamic-segments">Dynamic Segments</a></li>
<li><a href="huge-apps">Huge Apps (Partial App Loading)</a></li>
<li><a href="master-detail">Master Detail</a></li>
<li><a href="overview-detail">Overview-Detail</a></li>
<li><a href="nested-animations">Nested Animations</a></li>
<li><a href="passing-props-to-children">Passing Props to Children</a></li>
<li><a href="pinterest">Pinterest-style UI (<code>location.state</code>)</a></li>
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
-->

<!doctype html public "embarassment">
<title>Master Detail Example</title>
<title>Overview-Detail Example</title>
<link href="/global.css" rel="stylesheet"/>
<body>
<h1 class="breadcrumbs"><a href="/">One App Router Examples</a> / Master Detail</h1>
<h1 class="breadcrumbs"><a href="/">One App Router Examples</a> / Overview-Detail</h1>
<div id="example"/>
<script src="/__build__/shared.js"></script>
<script src="/__build__/master-detail.js"></script>
<script src="/__build__/overview-detail.js"></script>
2 changes: 1 addition & 1 deletion examples/passing-props-to-children/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ a.active {
height: 500px;
}

.Master {
.Overview {
position: absolute;
left: 0;
top: 0;
Expand Down
2 changes: 1 addition & 1 deletion examples/passing-props-to-children/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class AppBase extends Component {
return (
<div className="App">
<button onClick={this.addTaco}>Add Taco</button>
<ul className="Master">
<ul className="Overview">
{links}
</ul>
<div className="Detail">
Expand Down
2 changes: 1 addition & 1 deletion modules/IndexRedirect.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class IndexRedirect extends Component {
static displayName = 'IndexRedirect'

static createRouteFromReactElement(element, parentRoute) {
/* istanbul ignore else: sanity check */
/* istanbul ignore else: quick check */
if (parentRoute) {
parentRoute.indexRoute = Redirect.createRouteFromReactElement(element)
} else {
Expand Down
4 changes: 2 additions & 2 deletions modules/IndexRoute.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class IndexRoute extends Component {
static displayName = 'IndexRoute'

static createRouteFromReactElement(element, parentRoute) {
/* istanbul ignore else: sanity check */
/* istanbul ignore else: quick check */
if (parentRoute) {
parentRoute.indexRoute = createRouteFromReactElement(element)
} else {
Expand All @@ -47,7 +47,7 @@ class IndexRoute extends Component {
getComponents: func
}

/* istanbul ignore next: sanity check */
/* istanbul ignore next: quick check */
render() {
invariant(
false,
Expand Down
2 changes: 1 addition & 1 deletion modules/Route.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Route extends Component {
getComponents: func
}

/* istanbul ignore next: sanity check */
/* istanbul ignore next: quick check */
render() {
invariant(
false,
Expand Down
2 changes: 1 addition & 1 deletion modules/Router.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class Router extends Component {
this._unlisten = this.transitionManager.listen(this.listener)
}

/* istanbul ignore next: sanity check */
/* istanbul ignore next: quick check */
componentDidUpdate(prevProps) {
warning(
prevProps.history === this.props.history,
Expand Down

0 comments on commit 90a5ca7

Please # to comment.