Skip to content

Commit 3d5a589

Browse files
committed
move appConnected to webSocket
1 parent d530224 commit 3d5a589

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

services/static-webserver/client/source/class/osparc/Application.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,10 +523,10 @@ qx.Class.define("osparc.Application", {
523523
this.__loadView(mainPage);
524524
}
525525

526-
if (osparc.WatchDog.getInstance().isAppConnected()) {
526+
if (osparc.wrapper.WebSocket.getInstance().isAppConnected()) {
527527
loadViewerPage();
528528
} else {
529-
osparc.WatchDog.getInstance().addListener("changeAppConnected", e => {
529+
osparc.wrapper.WebSocket.getInstance().addListener("changeAppConnected", e => {
530530
if (e.getData()) {
531531
loadViewerPage();
532532
}

services/static-webserver/client/source/class/osparc/WatchDog.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,6 @@ qx.Class.define("osparc.WatchDog", {
6666
nullable: true,
6767
apply: "__applyHeartbeatInterval"
6868
},
69-
70-
appConnected: {
71-
check: "Boolean",
72-
init: false,
73-
nullable: false,
74-
event: "changeAppConnected"
75-
},
7669
},
7770

7871
members: {
@@ -93,7 +86,6 @@ qx.Class.define("osparc.WatchDog", {
9386
}
9487

9588
this.__startPinging();
96-
this.setAppConnected(true);
9789
},
9890

9991
__startPinging: function() {

services/static-webserver/client/source/class/osparc/wrapper/WebSocket.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,13 @@ qx.Class.define("osparc.wrapper.WebSocket", {
126126
nullable: true,
127127
event: "heartbeatInterval"
128128
},
129+
130+
appConnected: {
131+
check: "Boolean",
132+
init: false,
133+
nullable: false,
134+
event: "changeAppConnected"
135+
},
129136
},
130137

131138
/** Constructor
@@ -214,6 +221,8 @@ qx.Class.define("osparc.wrapper.WebSocket", {
214221
if (interval) {
215222
const newInterval = parseInt(interval) * 1000;
216223
this.setHeartbeatInterval(newInterval);
224+
225+
this.setAppConnected(true);
217226
}
218227
}, this);
219228
}, this);

0 commit comments

Comments
 (0)