From c93286c071bca17ecba91cd130908fe2e33a4766 Mon Sep 17 00:00:00 2001 From: kyarik Date: Sun, 2 Jun 2019 14:57:50 +0200 Subject: [PATCH 1/4] Some fixes to the Accessibility guide (#2047) Added missing code indentation; removed an extra "an" determiner in a sentence. --- content/docs/accessibility.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/docs/accessibility.md b/content/docs/accessibility.md index 11668c0c3..4b202fe4b 100644 --- a/content/docs/accessibility.md +++ b/content/docs/accessibility.md @@ -248,7 +248,7 @@ This is typically implemented by attaching a `click` event to the `window` objec ```javascript{12-14,26-30} class OuterClickExample extends React.Component { -constructor(props) { + constructor(props) { super(props); this.state = { isOpen: false }; @@ -299,7 +299,7 @@ This may work fine for users with pointer devices, such as a mouse, but operatin A toggle button opening a popover list implemented with the click outside pattern and operated with the keyboard showing the popover not being closed on blur and it obscuring other screen elements. -The same functionality can be achieved by using an appropriate event handlers instead, such as `onBlur` and `onFocus`: +The same functionality can be achieved by using appropriate event handlers instead, such as `onBlur` and `onFocus`: ```javascript{19-29,31-34,37-38,40-41} class BlurExample extends React.Component { From ca9dc1c1e22b75b61fb6bbba82a95a80c02404cb Mon Sep 17 00:00:00 2001 From: Hugo Jobling Date: Mon, 3 Jun 2019 19:55:39 +0100 Subject: [PATCH 2/4] Use imperative tone for suggested commit message (#2050) This is both widely recommended as the preferred style and also that in which actual commit messages on this project are written. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3044c0d66..10b706b1a 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ The documentation is divided into several sections with a different tone and pur ### Push it -1. `git add -A && git commit -m "My message"` (replacing `My message` with a commit message, such as `Fixed header logo on Android`) to stage and commit your changes +1. `git add -A && git commit -m "My message"` (replacing `My message` with a commit message, such as `Fix header logo on Android`) to stage and commit your changes 1. `git push my-fork-name the-name-of-my-branch` 1. Go to the [reactjs.org repo](https://github.com/reactjs/reactjs.org) and you should see recently pushed branches. 1. Follow GitHub's instructions. From 957f0b3a4067a9ba46d1ffda898658925ffa0549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=20V=C3=A9ras=20Valentim?= Date: Mon, 3 Jun 2019 22:37:16 -0300 Subject: [PATCH 3/4] Remove outdated link to React FAQ website (#2043) * Add canonical url to the head * Renaming ogUrl to canonicalUrl * Changing home page canonical url * Rename the createOgUrl.js file to createCanonicalUrl.js * Updating ogUrl name and usage (now canonicalUrl) * Add canonicalUrl to TitleAndMetaTags component on pages where it was missing * Adding missing trailing slashes * Remove deprecated link to React FAQ webpage --- content/community/articles.md | 1 - 1 file changed, 1 deletion(-) diff --git a/content/community/articles.md b/content/community/articles.md index 53586fe30..a18335975 100644 --- a/content/community/articles.md +++ b/content/community/articles.md @@ -12,5 +12,4 @@ permalink: community/articles.html - [You're missing the point of React](https://medium.com/@dan_abramov/youre-missing-the-point-of-react-a20e34a51e1a) - Dan Abramov's article about the best parts of React. - [Timeline for Learning React](https://daveceddia.com/timeline-for-learning-react/) - Dave Ceddia's recommended timeline for learning React and the React ecosystem. - [Simple React Development in 2017](https://hackernoon.com/simple-react-development-in-2017-113bd563691f) - Joshua Comeau's guide to showcase how easy it can be to start modern React development. -- [React FAQ](https://reactfaq.site/) - An external site with articles that try to answer frequently asked questions about React. - [Visual Guide to State in React](https://daveceddia.com/visual-guide-to-state-in-react/) - Dave Ceddia's visual guide to React state. From 61337601b7822a1e93074d0e6859f3754f8bea4c Mon Sep 17 00:00:00 2001 From: Wojciech Grzebieniowski Date: Fri, 7 Jun 2019 10:43:49 +0200 Subject: [PATCH 4/4] Update accessibility.md --- content/docs/accessibility.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/docs/accessibility.md b/content/docs/accessibility.md index ba1667ea4..a43a258fc 100644 --- a/content/docs/accessibility.md +++ b/content/docs/accessibility.md @@ -301,11 +301,7 @@ Powyższy przykład działa poprawnie dla użytkowników korzystających ze wska Przycisk pokazujący dymek z listą, ukrywany poprzez kliknięcie poza dymkiem. Obsługiwany za pomocą klawiatury, co skutkuje nie zamknięciem dymku po utracie fokusa, powodując trwałe przysłonięcie innych elementów interfejsu. -<<<<<<< HEAD Ta sama funkcjonalność może zostać uzyskana poprzez użycie odpowiednich procedur obsługi zdarzeń, takich jak `onBlur` i` onFocus`: -======= -The same functionality can be achieved by using appropriate event handlers instead, such as `onBlur` and `onFocus`: ->>>>>>> 957f0b3a4067a9ba46d1ffda898658925ffa0549 ```javascript{19-29,31-34,37-38,40-41} class BlurExample extends React.Component {