From 260a378e8cb0603ebc34e4ce1a5394c3301124d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 6 Jan 2014 11:16:10 +0100 Subject: [PATCH] Don't disable gcode viewer upon reset of connection --- src/octoprint/static/js/app/dataupdater.js | 2 +- src/octoprint/static/js/app/viewmodels/gcode.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/octoprint/static/js/app/dataupdater.js b/src/octoprint/static/js/app/dataupdater.js index 3159c5e4..1df395fa 100644 --- a/src/octoprint/static/js/app/dataupdater.js +++ b/src/octoprint/static/js/app/dataupdater.js @@ -42,7 +42,7 @@ function DataUpdater(loginStateViewModel, connectionViewModel, printerStateViewM self.timelapseViewModel.requestData(); self.loginStateViewModel.requestData(); self.gcodeFilesViewModel.requestData(); - self.gcodeViewModel.reinitialize(); + self.gcodeViewModel.reset(); if ($('#tabs li[class="active"] a').attr("href") == "#control") { $("#webcam_image").attr("src", CONFIG_WEBCAM_STREAM + "?" + new Date().getTime()); diff --git a/src/octoprint/static/js/app/viewmodels/gcode.js b/src/octoprint/static/js/app/viewmodels/gcode.js index 7bc7e714..efba29c0 100644 --- a/src/octoprint/static/js/app/viewmodels/gcode.js +++ b/src/octoprint/static/js/app/viewmodels/gcode.js @@ -146,8 +146,7 @@ function GcodeViewModel(loginStateViewModel, settingsViewModel) { }); }; - self.reinitialize = function() { - self.enabled = false; + self.reset = function() { self.enableReload(false); self.loadedFilename = undefined; self.loadedFileDate = undefined;