diff options
author | Dominik Guzei <dominik.guzei@gmail.com> | 2019-02-22 17:15:22 +0100 |
---|---|---|
committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-02-22 17:15:22 +0100 |
commit | bba95118076e1185c05605bdf58fabac3de82f17 (patch) | |
tree | 190f88e47e91763bc5702b5bbc55a04744043358 /src/features | |
parent | pin gulp-sass-variables version to 1.1.1 (diff) | |
parent | remove code (diff) | |
download | ferdium-app-bba95118076e1185c05605bdf58fabac3de82f17.tar.gz ferdium-app-bba95118076e1185c05605bdf58fabac3de82f17.tar.zst ferdium-app-bba95118076e1185c05605bdf58fabac3de82f17.zip |
merge-in latest develop
Diffstat (limited to 'src/features')
-rw-r--r-- | src/features/basicAuth/index.js | 9 | ||||
-rw-r--r-- | src/features/delayApp/index.js | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/features/basicAuth/index.js b/src/features/basicAuth/index.js index 03269582c..00ad65ce6 100644 --- a/src/features/basicAuth/index.js +++ b/src/features/basicAuth/index.js | |||
@@ -31,15 +31,6 @@ export default function initialize() { | |||
31 | state.authInfo = data.authInfo; | 31 | state.authInfo = data.authInfo; |
32 | state.isModalVisible = true; | 32 | state.isModalVisible = true; |
33 | }); | 33 | }); |
34 | |||
35 | // autorun(() => { | ||
36 | // // if (state.serviceId) { | ||
37 | // // const service = stores.services.one(state.serviceId); | ||
38 | // // if (service) { | ||
39 | // // state.service = service; | ||
40 | // // } | ||
41 | // // } | ||
42 | // }); | ||
43 | } | 34 | } |
44 | 35 | ||
45 | export function mainIpcHandler(mainWindow, authInfo) { | 36 | export function mainIpcHandler(mainWindow, authInfo) { |
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js index 28aa50eb2..48aac34b6 100644 --- a/src/features/delayApp/index.js +++ b/src/features/delayApp/index.js | |||
@@ -3,7 +3,7 @@ import moment from 'moment'; | |||
3 | import DelayAppComponent from './Component'; | 3 | import DelayAppComponent from './Component'; |
4 | 4 | ||
5 | import { DEFAULT_FEATURES_CONFIG } from '../../config'; | 5 | import { DEFAULT_FEATURES_CONFIG } from '../../config'; |
6 | import { gaEvent } from '../../lib/analytics'; | 6 | import { gaEvent, gaPage } from '../../lib/analytics'; |
7 | 7 | ||
8 | const debug = require('debug')('Franz:feature:delayApp'); | 8 | const debug = require('debug')('Franz:feature:delayApp'); |
9 | 9 | ||
@@ -50,6 +50,7 @@ export default function init(stores) { | |||
50 | debug(`App will be delayed for ${config.delayDuration / 1000}s`); | 50 | debug(`App will be delayed for ${config.delayDuration / 1000}s`); |
51 | 51 | ||
52 | setVisibility(true); | 52 | setVisibility(true); |
53 | gaPage('/delayApp'); | ||
53 | gaEvent('delayApp', 'show', 'Delay App Feature'); | 54 | gaEvent('delayApp', 'show', 'Delay App Feature'); |
54 | 55 | ||
55 | timeLastDelay = moment(); | 56 | timeLastDelay = moment(); |