From c93286c071bca17ecba91cd130908fe2e33a4766 Mon Sep 17 00:00:00 2001 From: kyarik Date: Sun, 2 Jun 2019 14:57:50 +0200 Subject: [PATCH 1/2] 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 c097152ff7ee343aeb4a916ff5a27e30b3824f6e Mon Sep 17 00:00:00 2001 From: Linh Le Date: Tue, 4 Jun 2019 22:56:29 -0400 Subject: [PATCH 2/2] resolve conflict --- content/docs/accessibility.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/docs/accessibility.md b/content/docs/accessibility.md index 6e46a2ef4..3be676242 100644 --- a/content/docs/accessibility.md +++ b/content/docs/accessibility.md @@ -298,11 +298,7 @@ class OuterClickExample extends React.Component { 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. -<<<<<<< HEAD Chúng ta cũng có thể đạt được chức năng tương tự bằng cách sử dụng những event handlers thích hợp, như `onBlur` và `onFocus`: -======= -The same functionality can be achieved by using appropriate event handlers instead, such as `onBlur` and `onFocus`: ->>>>>>> c93286c071bca17ecba91cd130908fe2e33a4766 ```javascript{19-29,31-34,37-38,40-41} class BlurExample extends React.Component {