aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2018-03-18 21:09:26 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2018-03-18 21:09:26 +0100
commit5f7c3c4c625f56d51abafd3417a2eac991ba85a5 (patch)
tree626f91b346f4d23b84e396937be3d6e1bf2d7c2c /src
parentMerge pull request #805 from meetfranz/chore/add-debugger (diff)
parentRemove reload code (diff)
downloadferdium-app-5f7c3c4c625f56d51abafd3417a2eac991ba85a5.tar.gz
ferdium-app-5f7c3c4c625f56d51abafd3417a2eac991ba85a5.tar.zst
ferdium-app-5f7c3c4c625f56d51abafd3417a2eac991ba85a5.zip
Merge branch 'fix/app-reload' into release/5.0.0-beta.17
Diffstat (limited to 'src')
-rw-r--r--src/stores/AppStore.js23
1 files changed, 0 insertions, 23 deletions
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 76c0222c9..4ac8325d4 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -128,19 +128,6 @@ export default class AppStore extends Store {
128 this.stores.router.push(data.url); 128 this.stores.router.push(data.url);
129 }); 129 });
130 130
131 // Reload all services after a healthy nap
132 // Alternative solution for powerMonitor as the resume event is not fired
133 // More information: https://github.com/electron/electron/issues/1615
134 const TIMEOUT = 5000;
135 let lastTime = (new Date()).getTime();
136 setInterval(() => {
137 const currentTime = (new Date()).getTime();
138 if (currentTime > (lastTime + TIMEOUT + 2000)) {
139 this._reactivateServices();
140 }
141 lastTime = currentTime;
142 }, TIMEOUT);
143
144 // Set active the next service 131 // Set active the next service
145 key( 132 key(
146 '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => { 133 '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => {
@@ -360,16 +347,6 @@ export default class AppStore extends Store {
360 return autoLauncher.isEnabled() || false; 347 return autoLauncher.isEnabled() || false;
361 } 348 }
362 349
363 _reactivateServices(retryCount = 0) {
364 if (!this.isOnline) {
365 console.debug('reactivateServices: computer is offline, trying again in 5s, retries:', retryCount);
366 setTimeout(() => this._reactivateServices(retryCount + 1), 5000);
367 } else {
368 console.debug('reactivateServices: reload Franz');
369 window.location.reload();
370 }
371 }
372
373 _systemDND() { 350 _systemDND() {
374 const dnd = getDoNotDisturb(); 351 const dnd = getDoNotDisturb();
375 if (dnd !== this.stores.settings.all.isAppMuted && !this.isSystemMuteOverridden) { 352 if (dnd !== this.stores.settings.all.isAppMuted && !this.isSystemMuteOverridden) {