diff options
Diffstat (limited to 'src/features')
-rw-r--r-- | src/features/delayApp/index.js | 4 | ||||
-rw-r--r-- | src/features/webControls/components/WebControls.js | 8 | ||||
-rw-r--r-- | src/features/webControls/constants.js | 1 | ||||
-rw-r--r-- | src/features/workspaces/store.js | 12 |
4 files changed, 11 insertions, 14 deletions
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js index 28b079e6b..5b28fb7c8 100644 --- a/src/features/delayApp/index.js +++ b/src/features/delayApp/index.js | |||
@@ -67,12 +67,12 @@ export default function init(stores) { | |||
67 | gaPage('/delayApp'); | 67 | gaPage('/delayApp'); |
68 | gaEvent('DelayApp', 'show', 'Delay App Feature'); | 68 | gaEvent('DelayApp', 'show', 'Delay App Feature'); |
69 | 69 | ||
70 | timeLastDelay = moment(); | ||
71 | shownAfterLaunch = true; | ||
72 | 70 | ||
73 | setTimeout(() => { | 71 | setTimeout(() => { |
74 | debug('Resetting app delay'); | 72 | debug('Resetting app delay'); |
75 | 73 | ||
74 | shownAfterLaunch = true; | ||
75 | timeLastDelay = moment(); | ||
76 | setVisibility(false); | 76 | setVisibility(false); |
77 | }, config.delayDuration + 1000); // timer needs to be able to hit 0 | 77 | }, config.delayDuration + 1000); // timer needs to be able to hit 0 |
78 | } else { | 78 | } else { |
diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js index a39fcfe0e..c6331073b 100644 --- a/src/features/webControls/components/WebControls.js +++ b/src/features/webControls/components/WebControls.js | |||
@@ -148,6 +148,7 @@ class WebControls extends Component { | |||
148 | type="button" | 148 | type="button" |
149 | className={classes.button} | 149 | className={classes.button} |
150 | data-tip={intl.formatMessage(messages.goHome)} | 150 | data-tip={intl.formatMessage(messages.goHome)} |
151 | data-place="bottom" | ||
151 | > | 152 | > |
152 | <Icon | 153 | <Icon |
153 | icon={mdiHomeOutline} | 154 | icon={mdiHomeOutline} |
@@ -160,6 +161,7 @@ class WebControls extends Component { | |||
160 | className={classes.button} | 161 | className={classes.button} |
161 | disabled={!canGoBack} | 162 | disabled={!canGoBack} |
162 | data-tip={intl.formatMessage(messages.back)} | 163 | data-tip={intl.formatMessage(messages.back)} |
164 | data-place="bottom" | ||
163 | > | 165 | > |
164 | <Icon | 166 | <Icon |
165 | icon={mdiArrowLeft} | 167 | icon={mdiArrowLeft} |
@@ -172,6 +174,7 @@ class WebControls extends Component { | |||
172 | className={classes.button} | 174 | className={classes.button} |
173 | disabled={!canGoForward} | 175 | disabled={!canGoForward} |
174 | data-tip={intl.formatMessage(messages.forward)} | 176 | data-tip={intl.formatMessage(messages.forward)} |
177 | data-place="bottom" | ||
175 | > | 178 | > |
176 | <Icon | 179 | <Icon |
177 | icon={mdiArrowRight} | 180 | icon={mdiArrowRight} |
@@ -183,6 +186,7 @@ class WebControls extends Component { | |||
183 | type="button" | 186 | type="button" |
184 | className={classes.button} | 187 | className={classes.button} |
185 | data-tip={intl.formatMessage(messages.reload)} | 188 | data-tip={intl.formatMessage(messages.reload)} |
189 | data-place="bottom" | ||
186 | > | 190 | > |
187 | <Icon | 191 | <Icon |
188 | icon={mdiReload} | 192 | icon={mdiReload} |
@@ -196,6 +200,7 @@ class WebControls extends Component { | |||
196 | inputUrl: event.target.value, | 200 | inputUrl: event.target.value, |
197 | })} | 201 | })} |
198 | onFocus={(event) => { | 202 | onFocus={(event) => { |
203 | console.log('on focus event'); | ||
199 | event.target.select(); | 204 | event.target.select(); |
200 | this.setState({ | 205 | this.setState({ |
201 | editUrl: true, | 206 | editUrl: true, |
@@ -223,14 +228,13 @@ class WebControls extends Component { | |||
223 | type="button" | 228 | type="button" |
224 | className={classes.button} | 229 | className={classes.button} |
225 | data-tip={intl.formatMessage(messages.openInBrowser)} | 230 | data-tip={intl.formatMessage(messages.openInBrowser)} |
226 | data-place="left" | 231 | data-place="bottom" |
227 | > | 232 | > |
228 | <Icon | 233 | <Icon |
229 | icon={mdiEarth} | 234 | icon={mdiEarth} |
230 | className={classes.icon} | 235 | className={classes.icon} |
231 | /> | 236 | /> |
232 | </button> | 237 | </button> |
233 | {/* <ReactTooltip place="bottom" type="dark" effect="solid" /> */} | ||
234 | </div> | 238 | </div> |
235 | ); | 239 | ); |
236 | } | 240 | } |
diff --git a/src/features/webControls/constants.js b/src/features/webControls/constants.js new file mode 100644 index 000000000..270a3568e --- /dev/null +++ b/src/features/webControls/constants.js | |||
@@ -0,0 +1 @@ | |||
export const CUSTOM_WEBSITE_ID = 'franz-custom-website'; | |||
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js index b83fe335a..13227e033 100644 --- a/src/features/workspaces/store.js +++ b/src/features/workspaces/store.js | |||
@@ -146,16 +146,8 @@ export default class WorkspacesStore extends FeatureStore { | |||
146 | 146 | ||
147 | filterServicesByActiveWorkspace = (services) => { | 147 | filterServicesByActiveWorkspace = (services) => { |
148 | const { activeWorkspace, isFeatureActive } = this; | 148 | const { activeWorkspace, isFeatureActive } = this; |
149 | if (isFeatureActive) { | 149 | if (isFeatureActive && activeWorkspace) { |
150 | if (activeWorkspace) { | 150 | return this.getWorkspaceServices(activeWorkspace); |
151 | return this.getWorkspaceServices(activeWorkspace); | ||
152 | } | ||
153 | // There is no active workspace yet but we might be still loading them | ||
154 | if (!getUserWorkspacesRequest.wasExecuted || getUserWorkspacesRequest.isExecutingFirstTime) { | ||
155 | // If so, do not show any services to avoid loading all of them unfiltered | ||
156 | // and then having the filter flashing in (which is ugly and slow). | ||
157 | return []; | ||
158 | } | ||
159 | } | 151 | } |
160 | return services; | 152 | return services; |
161 | }; | 153 | }; |