-
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Add notification on change ui #1220
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 3 commits
b4a7b54
c86e451
d1e5781
f4fd131
83910b5
125a493
cb59458
795fe8a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,10 @@ class HotkeyTab extends React.Component { | |
| message: err.message != null ? err.message : 'Error occurs!' | ||
| }}) | ||
| } | ||
| if (JSON.parse(localStorage.getItem('config'))) { | ||
| const {hotkey} = JSON.parse(localStorage.getItem('config')) | ||
| this.hotkey = hotkey | ||
| } | ||
| ipc.addListener('APP_SETTING_DONE', this.handleSettingDone) | ||
| ipc.addListener('APP_SETTING_ERROR', this.handleSettingError) | ||
| } | ||
|
|
@@ -53,6 +57,7 @@ class HotkeyTab extends React.Component { | |
| config: newConfig | ||
| }) | ||
| this.clearMessage() | ||
| this.props.haveToSave(null) | ||
|
||
| } | ||
|
|
||
| handleHintToggleButtonClick (e) { | ||
|
|
@@ -70,6 +75,15 @@ class HotkeyTab extends React.Component { | |
| this.setState({ | ||
| config | ||
| }) | ||
| if (JSON.stringify(this.hotkey) === JSON.stringify(config.hotkey)) { | ||
| this.props.haveToSave(null) | ||
| } else { | ||
| this.props.haveToSave({ | ||
| tab: 'Hotkey', | ||
| type: 'warning', | ||
| message: 'You have to save!' | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| clearMessage () { | ||
|
|
@@ -161,7 +175,8 @@ class HotkeyTab extends React.Component { | |
| } | ||
|
|
||
| HotkeyTab.propTypes = { | ||
| dispatch: PropTypes.func | ||
| dispatch: PropTypes.func, | ||
| haveToSave: PropTypes.func | ||
| } | ||
|
|
||
| export default CSSModules(HotkeyTab, styles) | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,13 +42,21 @@ top-bar--height = 50px | |
| background-color transparent | ||
| color $ui-text-color | ||
| font-size 16px | ||
| .saving--warning | ||
| color #FFA500 | ||
| font-size 10px | ||
| margin-top 3px | ||
|
|
||
| .nav-button--active | ||
| @extend .nav-button | ||
| color $ui-text-color | ||
| background-color $ui-button--active-backgroundColor | ||
| &:hover | ||
| color $ui-text-color | ||
| .saving--warning | ||
| color #FFA500 | ||
| font-size 10px | ||
| margin-top 3px | ||
|
||
|
|
||
| .nav-button-icon | ||
| display block | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,8 @@ class UiTab extends React.Component { | |
| super(props) | ||
| this.state = { | ||
| config: props.config, | ||
| codemirrorTheme: props.config.editor.theme | ||
| codemirrorTheme: props.config.editor.theme, | ||
| haveToSave: null | ||
|
||
| } | ||
| } | ||
|
|
||
|
|
@@ -91,8 +92,21 @@ class UiTab extends React.Component { | |
| if (newCodemirrorTheme !== codemirrorTheme) { | ||
| checkHighLight.setAttribute('href', `../node_modules/codemirror/theme/${newCodemirrorTheme.split(' ')[0]}.css`) | ||
| } | ||
|
|
||
| this.setState({ config: newConfig, codemirrorTheme: newCodemirrorTheme }) | ||
| this.setState({ config: newConfig, codemirrorTheme: newCodemirrorTheme }, () => { | ||
| if (JSON.parse(localStorage.getItem('config'))) { | ||
|
||
| const {ui, editor, preview} = JSON.parse(localStorage.getItem('config')) | ||
| this.currentConfig = {ui, editor, preview} | ||
| if (JSON.stringify(this.currentConfig) === JSON.stringify(this.state.config)) { | ||
| this.props.haveToSave(null) | ||
| } else { | ||
| this.props.haveToSave({ | ||
| tab: 'UI', | ||
| type: 'warning', | ||
| message: 'You have to save!' | ||
| }) | ||
| } | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| handleSaveUIClick (e) { | ||
|
|
@@ -109,6 +123,7 @@ class UiTab extends React.Component { | |
| config: newConfig | ||
| }) | ||
| this.clearMessage() | ||
| this.props.haveToSave(null) | ||
| } | ||
|
|
||
| clearMessage () { | ||
|
|
@@ -346,7 +361,8 @@ UiTab.propTypes = { | |
| user: PropTypes.shape({ | ||
| name: PropTypes.string | ||
| }), | ||
| dispatch: PropTypes.func | ||
| dispatch: PropTypes.func, | ||
| haveToSave: PropTypes.func | ||
| } | ||
|
|
||
| export default CSSModules(UiTab, styles) | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,7 +17,9 @@ class Preferences extends React.Component { | |
| super(props) | ||
|
|
||
| this.state = { | ||
| currentTab: 'STORAGES' | ||
| currentTab: 'STORAGES', | ||
| UI: null, | ||
| Hotkey: null | ||
|
||
| } | ||
| } | ||
|
|
||
|
|
@@ -58,13 +60,15 @@ class Preferences extends React.Component { | |
| <HotkeyTab | ||
| dispatch={dispatch} | ||
| config={config} | ||
| haveToSave={msg => this.setState({Hotkey: msg})} | ||
| /> | ||
| ) | ||
| case 'UI': | ||
| return ( | ||
| <UiTab | ||
| dispatch={dispatch} | ||
| config={config} | ||
| haveToSave={msg => this.setState({UI: msg})} | ||
| /> | ||
| ) | ||
| case 'CROWDFUNDING': | ||
|
|
@@ -99,14 +103,15 @@ class Preferences extends React.Component { | |
|
|
||
| const tabs = [ | ||
| {target: 'STORAGES', label: 'Storages'}, | ||
| {target: 'HOTKEY', label: 'Hotkey'}, | ||
| {target: 'UI', label: 'UI'}, | ||
| {target: 'HOTKEY', label: 'Hotkey', Hotkey: this.state.Hotkey}, | ||
| {target: 'UI', label: 'UI', UI: this.state.UI}, | ||
| {target: 'INFO', label: 'Community / Info'}, | ||
| {target: 'CROWDFUNDING', label: 'Crowdfunding'} | ||
| ] | ||
|
|
||
| const navButtons = tabs.map((tab) => { | ||
| const isActive = this.state.currentTab === tab.target | ||
| const isOk = typeof tab[tab.label] !== 'undefined' && tab[tab.label] !== null | ||
|
||
| return ( | ||
| <button styleName={isActive | ||
| ? 'nav-button--active' | ||
|
|
@@ -118,6 +123,7 @@ class Preferences extends React.Component { | |
| <span styleName='nav-button-label'> | ||
| {tab.label} | ||
| </span> | ||
| {isOk && tab.label === tab[tab.label].tab ? <p styleName={`saving--${tab[tab.label].type}`}>{tab[tab.label].message}</p> : null} | ||
|
||
| </button> | ||
| ) | ||
| }) | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can get
hotkeyfromthis.state.config