diff options
| author |  vantezzen <hello@vantezzen.io> | 2019-10-18 11:00:51 +0200 |
|---|---|---|
| committer | vantezzen <hello@vantezzen.io> | 2019-10-18 11:00:51 +0200 |
| commit | ddd08c2ed24df403136a3051373ac89cff655598 (patch) | |
| tree | 1b3bc962e0c8698df984e80116c5144a7082805a | |
| parent | Merge branch 'develop' of https://github.com/getferdi/ferdi into develop (diff) | |
| download | ferdium-app-ddd08c2ed24df403136a3051373ac89cff655598.tar.gz ferdium-app-ddd08c2ed24df403136a3051373ac89cff655598.tar.zst ferdium-app-ddd08c2ed24df403136a3051373ac89cff655598.zip | |
Fix lint
| -rw-r--r-- | src/components/layout/Sidebar.js | 6 | ||||
| -rw-r--r-- | src/index.js | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index e2f056f5c..f7d10735c 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js | |||
| @@ -116,7 +116,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp | |||
| 116 | { stores.settings.all.app.lockingFeatureEnabled ? ( | 116 | { stores.settings.all.app.lockingFeatureEnabled ? ( |
| 117 | <button | 117 | <button |
| 118 | type="button" | 118 | type="button" |
| 119 | className={`sidebar__button`} | 119 | className="sidebar__button" |
| 120 | onClick={() => { | 120 | onClick={() => { |
| 121 | // Disable lock first - otherwise the application might not update correctly | 121 | // Disable lock first - otherwise the application might not update correctly |
| 122 | actions.settings.update({ | 122 | actions.settings.update({ |
| @@ -201,8 +201,8 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp | |||
| 201 | data-tip={`${intl.formatMessage(messages.settings)} (${ctrlKey}+,)`} | 201 | data-tip={`${intl.formatMessage(messages.settings)} (${ctrlKey}+,)`} |
| 202 | > | 202 | > |
| 203 | <i className="mdi mdi-settings" /> | 203 | <i className="mdi mdi-settings" /> |
| 204 | { (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE || | 204 | { (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE |
| 205 | this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.DOWNLOADED) && ( | 205 | || this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.DOWNLOADED) && ( |
| 206 | <span className="update-availible"> | 206 | <span className="update-availible"> |
| 207 | • | 207 | • |
| 208 | </span> | 208 | </span> |
diff --git a/src/index.js b/src/index.js index 799e762f5..4d7215d5e 100644 --- a/src/index.js +++ b/src/index.js | |||
| @@ -11,7 +11,7 @@ import windowStateKeeper from 'electron-window-state'; | |||
| 11 | 11 | ||
| 12 | // Set app directory before loading user modules | 12 | // Set app directory before loading user modules |
| 13 | if (process.env.FERDI_APPDATA_DIR || process.env.PORTABLE_EXECUTABLE_DIR) { | 13 | if (process.env.FERDI_APPDATA_DIR || process.env.PORTABLE_EXECUTABLE_DIR) { |
| 14 | const appDataPath = process.env.FERDI_APPDATA_DIR || process.env.PORTABLE_EXECUTABLE_DIR | 14 | const appDataPath = process.env.FERDI_APPDATA_DIR || process.env.PORTABLE_EXECUTABLE_DIR; |
| 15 | app.setPath('appData', appDataPath); | 15 | app.setPath('appData', appDataPath); |
| 16 | app.setPath('userData', path.join(app.getPath('appData'), app.getName())); | 16 | app.setPath('userData', path.join(app.getPath('appData'), app.getName())); |
| 17 | } | 17 | } |