pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not read no return value as "False" return value for onServerDisconnect

Browse source
This commit is contained in:
Gina Häußge 2016-01-25 13:51:46 +01:00
parent 814355e281
commit 7fbfaadc21
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/octoprint/static/js/app/dataupdater.js
View file

@ -48,7 +48,8 @@ function DataUpdater(allViewModels) {
}
if (viewModel.hasOwnProperty("onServerDisconnect")) {
if (!viewModel.onServerDisconnect()) {
var result = viewModel.onServerDisconnect();
if (result !== undefined && !result) {
handled = true;
}
}
@ -83,7 +84,8 @@ function DataUpdater(allViewModels) {
}
if (viewModel.hasOwnProperty("onServerDisconnect")) {
if (!viewModel.onServerDisconnect()) {
var result = viewModel.onServerDisconnect();
if (result !== undefined && !result) {
handled = true;
}
}
@ -128,7 +130,9 @@ function DataUpdater(allViewModels) {
if ($("#offline_overlay").is(":visible")) {
hideOfflineOverlay();
_.each(self.allViewModels, function(viewModel) {
if (viewModel.hasOwnProperty("onDataUpdaterReconnect")) {
if (viewModel.hasOwnProperty("onServerReconnect")) {
viewModel.onServerReconnect();
} else if (viewModel.hasOwnProperty("onDataUpdaterReconnect")) {
viewModel.onDataUpdaterReconnect();
}
});
@ -136,6 +140,12 @@ function DataUpdater(allViewModels) {
if ($('#tabs li[class="active"] a').attr("href") == "#control") {
$("#webcam_image").attr("src", CONFIG_WEBCAM_STREAM + "?" + new Date().getTime());
}
} else {
_.each(self.allViewModels, function(viewModel) {
if (viewModel.hasOwnProperty("onServerConnect")) {
viewModel.onServerConnect();
}
});
}
if (oldVersion != VERSION || (oldPluginHash != undefined && oldPluginHash != self._pluginHash)) {