From 3c33401b48ed5d0fdf8204459cb465b22b45c503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 17 Feb 2015 13:51:34 +0100 Subject: [PATCH] GCODE viewer: Only try to instantiate sliders if their elements are available --- .../static/js/app/viewmodels/gcode.js | 54 +++++++++++-------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/src/octoprint/static/js/app/viewmodels/gcode.js b/src/octoprint/static/js/app/viewmodels/gcode.js index 97d5c802..4cc87579 100644 --- a/src/octoprint/static/js/app/viewmodels/gcode.js +++ b/src/octoprint/static/js/app/viewmodels/gcode.js @@ -244,31 +244,37 @@ function GcodeViewModel(loginStateViewModel, settingsViewModel) { }; self._configureLayerSlider = function() { - self.layerSlider = $("#gcode_slider_layers").slider({ - id: "gcode_layer_slider", - reversed: true, - selection: "after", - orientation: "vertical", - min: 0, - max: 1, - step: 1, - value: 0, - enabled: false, - formatter: function(value) { return "Layer #" + (value + 1); } - }).on("slide", self.changeLayer); + var layerSliderElement = $("#gcode_slider_layers"); + if (layerSliderElement) { + self.layerSlider = layerSliderElement.slider({ + id: "gcode_layer_slider", + reversed: true, + selection: "after", + orientation: "vertical", + min: 0, + max: 1, + step: 1, + value: 0, + enabled: false, + formatter: function(value) { return "Layer #" + (value + 1); } + }).on("slide", self.changeLayer); + } }; self._configureLayerCommandSlider = function() { - self.layerCommandSlider = $("#gcode_slider_commands").slider({ - id: "gcode_command_slider", - orientation: "horizontal", - min: 0, - max: 1, - step: 1, - value: [0, 1], - enabled: false, - tooltip: "hide" - }).on("slide", self.changeCommandRange); + var commandSliderElement = $("#gcode_slider_commands"); + if (commandSliderElement) { + self.layerCommandSlider = commandSliderElement.slider({ + id: "gcode_command_slider", + orientation: "horizontal", + min: 0, + max: 1, + step: 1, + value: [0, 1], + enabled: false, + tooltip: "hide" + }).on("slide", self.changeCommandRange); + } }; self.loadFile = function(filename, date){ @@ -469,6 +475,10 @@ function GcodeViewModel(loginStateViewModel, settingsViewModel) { self.onDataUpdaterReconnect = function() { self.reset(); + }; + + self.onBeforeBinding = function() { + self.initialize(); } }