diff options
author | 2019-04-11 16:47:28 +0200 | |
---|---|---|
committer | 2019-04-11 16:47:28 +0200 | |
commit | 2af294e00cd14e7ba26ab36bc1b8fe7680661739 (patch) | |
tree | 949f87a957afeddde42843fb15602b8b520c59f2 | |
parent | WIP: announcement feature and workspace fixes (diff) | |
download | ferdium-app-2af294e00cd14e7ba26ab36bc1b8fe7680661739.tar.gz ferdium-app-2af294e00cd14e7ba26ab36bc1b8fe7680661739.tar.zst ferdium-app-2af294e00cd14e7ba26ab36bc1b8fe7680661739.zip |
fix lint issues
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 1 | ||||
-rw-r--r-- | src/features/announcements/components/AnnouncementScreen.js | 2 | ||||
-rw-r--r-- | src/features/announcements/store.js | 16 | ||||
-rw-r--r-- | src/lib/Menu.js | 2 |
4 files changed, 10 insertions, 11 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 8a0e105e7..8c1d2dfc1 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -20,7 +20,6 @@ import Services from '../../components/services/content/Services'; | |||
20 | import AppLoader from '../../components/ui/AppLoader'; | 20 | import AppLoader from '../../components/ui/AppLoader'; |
21 | 21 | ||
22 | import { state as delayAppState } from '../../features/delayApp'; | 22 | import { state as delayAppState } from '../../features/delayApp'; |
23 | import { } from '../../features/announcements/store'; | ||
24 | import { workspaceActions } from '../../features/workspaces/actions'; | 23 | import { workspaceActions } from '../../features/workspaces/actions'; |
25 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; | 24 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; |
26 | import { workspaceStore } from '../../features/workspaces'; | 25 | import { workspaceStore } from '../../features/workspaces'; |
diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js index 2d5efc396..2682b7890 100644 --- a/src/features/announcements/components/AnnouncementScreen.js +++ b/src/features/announcements/components/AnnouncementScreen.js | |||
@@ -150,7 +150,7 @@ class AnnouncementScreen extends Component { | |||
150 | <div className={classes.mainText}> | 150 | <div className={classes.mainText}> |
151 | <p | 151 | <p |
152 | dangerouslySetInnerHTML={{ | 152 | dangerouslySetInnerHTML={{ |
153 | __html: marked(announcement.main.text,{ sanitize: true }), | 153 | __html: marked(announcement.main.text, { sanitize: true }), |
154 | }} | 154 | }} |
155 | /> | 155 | /> |
156 | <div className={classes.mainCtaButton}> | 156 | <div className={classes.mainCtaButton}> |
diff --git a/src/features/announcements/store.js b/src/features/announcements/store.js index d4fb0a52c..3c46828bb 100644 --- a/src/features/announcements/store.js +++ b/src/features/announcements/store.js | |||
@@ -112,14 +112,14 @@ export class AnnouncementsStore extends FeatureStore { | |||
112 | this._showAnnouncement(); | 112 | this._showAnnouncement(); |
113 | 113 | ||
114 | // Check if the user has already used current version (= has seen the announcement) | 114 | // Check if the user has already used current version (= has seen the announcement) |
115 | // const { currentVersion, lastSeenAnnouncementVersion } = this; | 115 | const { currentVersion, lastSeenAnnouncementVersion } = this; |
116 | // if (semver.gt(currentVersion, lastSeenAnnouncementVersion)) { | 116 | if (semver.gt(currentVersion, lastSeenAnnouncementVersion)) { |
117 | // debug(`${currentVersion} < ${lastSeenAnnouncementVersion}: announcement is shown`); | 117 | debug(`${currentVersion} < ${lastSeenAnnouncementVersion}: announcement is shown`); |
118 | // this._showAnnouncement(); | 118 | this._showAnnouncement(); |
119 | // } else { | 119 | } else { |
120 | // debug(`${currentVersion} >= ${lastSeenAnnouncementVersion}: announcement is hidden`); | 120 | debug(`${currentVersion} >= ${lastSeenAnnouncementVersion}: announcement is hidden`); |
121 | // this._hideAnnouncement(); | 121 | this._hideAnnouncement(); |
122 | // } | 122 | } |
123 | }; | 123 | }; |
124 | 124 | ||
125 | _fetchAnnouncements = () => { | 125 | _fetchAnnouncements = () => { |
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 3df06e05a..6bea67860 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -6,7 +6,7 @@ import { isMac, ctrlKey, cmdKey } from '../environment'; | |||
6 | import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../features/workspaces/index'; | 6 | import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../features/workspaces/index'; |
7 | import { workspaceActions } from '../features/workspaces/actions'; | 7 | import { workspaceActions } from '../features/workspaces/actions'; |
8 | import { gaEvent } from './analytics'; | 8 | import { gaEvent } from './analytics'; |
9 | import announcementActions from '../features/announcements/actions'; | 9 | import { announcementActions } from '../features/announcements/actions'; |
10 | 10 | ||
11 | const { app, Menu, dialog } = remote; | 11 | const { app, Menu, dialog } = remote; |
12 | 12 | ||