From 80283b5f556d4ffb195d8b4babb6777af8937280 Mon Sep 17 00:00:00 2001 From: Paul Rosset Date: Tue, 24 Oct 2017 22:27:03 +0100 Subject: [PATCH 1/6] Adjust notification HotKeyTab --- .../main/modals/PreferencesModal/ConfigTab.styl | 15 +++++++++++---- browser/main/modals/PreferencesModal/HotkeyTab.js | 9 +++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/browser/main/modals/PreferencesModal/ConfigTab.styl b/browser/main/modals/PreferencesModal/ConfigTab.styl index 101f2f33..23eef574 100644 --- a/browser/main/modals/PreferencesModal/ConfigTab.styl +++ b/browser/main/modals/PreferencesModal/ConfigTab.styl @@ -67,10 +67,17 @@ text-align right :global .alert - font-size 12px - line-height 30px - padding 0 5px - float right + display inline-block + position absolute + top 60px + right 15px + font-size 14px + .success + color green + .error + color red + + .group-control-leftButton colorDefaultButton() diff --git a/browser/main/modals/PreferencesModal/HotkeyTab.js b/browser/main/modals/PreferencesModal/HotkeyTab.js index edbd06a5..e0a09686 100644 --- a/browser/main/modals/PreferencesModal/HotkeyTab.js +++ b/browser/main/modals/PreferencesModal/HotkeyTab.js @@ -69,6 +69,14 @@ class HotkeyTab extends React.Component { }) } + clearMessage() { + setTimeout(() => { + this.setState({ + keymapAlert: null + }) + }, 3000) + } + render () { let keymapAlert = this.state.keymapAlert let keymapAlertElement = keymapAlert != null @@ -76,6 +84,7 @@ class HotkeyTab extends React.Component { {keymapAlert.message}

: null + this.clearMessage() let { config } = this.state return ( From c0368ce713f31465633687bea44c92681f2c72ed Mon Sep 17 00:00:00 2001 From: Paul Rosset Date: Tue, 24 Oct 2017 23:01:16 +0100 Subject: [PATCH 2/6] correction --- browser/main/modals/PreferencesModal/HotkeyTab.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/browser/main/modals/PreferencesModal/HotkeyTab.js b/browser/main/modals/PreferencesModal/HotkeyTab.js index e0a09686..98f70930 100644 --- a/browser/main/modals/PreferencesModal/HotkeyTab.js +++ b/browser/main/modals/PreferencesModal/HotkeyTab.js @@ -69,12 +69,12 @@ class HotkeyTab extends React.Component { }) } - clearMessage() { + componentDidUpdate() { setTimeout(() => { this.setState({ keymapAlert: null }) - }, 3000) + }, 2500) } render () { @@ -84,7 +84,6 @@ class HotkeyTab extends React.Component { {keymapAlert.message}

: null - this.clearMessage() let { config } = this.state return ( From bd013adb4d5c9150851cb53a37dce4898cbf76b4 Mon Sep 17 00:00:00 2001 From: Paul Rosset Date: Tue, 24 Oct 2017 23:09:21 +0100 Subject: [PATCH 3/6] correction eslint syntax --- browser/main/modals/PreferencesModal/HotkeyTab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/main/modals/PreferencesModal/HotkeyTab.js b/browser/main/modals/PreferencesModal/HotkeyTab.js index 98f70930..8fe253e8 100644 --- a/browser/main/modals/PreferencesModal/HotkeyTab.js +++ b/browser/main/modals/PreferencesModal/HotkeyTab.js @@ -69,7 +69,7 @@ class HotkeyTab extends React.Component { }) } - componentDidUpdate() { + componentDidUpdate () { setTimeout(() => { this.setState({ keymapAlert: null From d23156d11a0971e77f06965c0cc1d8a70bd6ae3e Mon Sep 17 00:00:00 2001 From: Paul Rosset Date: Tue, 24 Oct 2017 23:40:15 +0100 Subject: [PATCH 4/6] Correction build error --- browser/main/modals/PreferencesModal/HotkeyTab.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/browser/main/modals/PreferencesModal/HotkeyTab.js b/browser/main/modals/PreferencesModal/HotkeyTab.js index 8fe253e8..6253e6d5 100644 --- a/browser/main/modals/PreferencesModal/HotkeyTab.js +++ b/browser/main/modals/PreferencesModal/HotkeyTab.js @@ -50,6 +50,12 @@ class HotkeyTab extends React.Component { type: 'SET_UI', config: newConfig }) + + setTimeout(() => { + this.setState({ + keymapAlert: null + }) + }, 2000) } handleHintToggleButtonClick (e) { @@ -69,14 +75,6 @@ class HotkeyTab extends React.Component { }) } - componentDidUpdate () { - setTimeout(() => { - this.setState({ - keymapAlert: null - }) - }, 2500) - } - render () { let keymapAlert = this.state.keymapAlert let keymapAlertElement = keymapAlert != null From 1c02b4e62a2ac75125b89eabb1a8f13731dbe7b9 Mon Sep 17 00:00:00 2001 From: Paul Rosset Date: Tue, 24 Oct 2017 23:50:29 +0100 Subject: [PATCH 5/6] Delete setTimeout() due to problem wih test --- browser/main/modals/PreferencesModal/HotkeyTab.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/browser/main/modals/PreferencesModal/HotkeyTab.js b/browser/main/modals/PreferencesModal/HotkeyTab.js index 6253e6d5..8ce56f2d 100644 --- a/browser/main/modals/PreferencesModal/HotkeyTab.js +++ b/browser/main/modals/PreferencesModal/HotkeyTab.js @@ -50,12 +50,6 @@ class HotkeyTab extends React.Component { type: 'SET_UI', config: newConfig }) - - setTimeout(() => { - this.setState({ - keymapAlert: null - }) - }, 2000) } handleHintToggleButtonClick (e) { @@ -75,6 +69,11 @@ class HotkeyTab extends React.Component { }) } + componentWillUnmount () { + console.log("YAYA") + clearTimeout(this.timer) + } + render () { let keymapAlert = this.state.keymapAlert let keymapAlertElement = keymapAlert != null From c97c65b7073984d4d86b530b08d09bd4ce6b8371 Mon Sep 17 00:00:00 2001 From: Paul Rosset Date: Tue, 24 Oct 2017 23:54:14 +0100 Subject: [PATCH 6/6] Delete clearMessage due to problem wih test [WIP] --- browser/main/modals/PreferencesModal/HotkeyTab.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/browser/main/modals/PreferencesModal/HotkeyTab.js b/browser/main/modals/PreferencesModal/HotkeyTab.js index 8ce56f2d..edbd06a5 100644 --- a/browser/main/modals/PreferencesModal/HotkeyTab.js +++ b/browser/main/modals/PreferencesModal/HotkeyTab.js @@ -69,11 +69,6 @@ class HotkeyTab extends React.Component { }) } - componentWillUnmount () { - console.log("YAYA") - clearTimeout(this.timer) - } - render () { let keymapAlert = this.state.keymapAlert let keymapAlertElement = keymapAlert != null