From 99364df94e94ed9f666dc94caef9b4d601f33a17 Mon Sep 17 00:00:00 2001 From: ntoff Date: Mon, 6 Nov 2017 17:23:25 +1000 Subject: [PATCH] wrap it in a try catch Hopefully when something in my plugin breaks (that's when, not if) it won't take down all of octoprint's UI. --- .../static/js/fanslider.js | 63 ++++++++++--------- 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/octoprint_fanspeedslider/static/js/fanslider.js b/octoprint_fanspeedslider/static/js/fanslider.js index e4f610c..5ca6260 100644 --- a/octoprint_fanspeedslider/static/js/fanslider.js +++ b/octoprint_fanspeedslider/static/js/fanslider.js @@ -21,36 +21,41 @@ $(function() { //send gcode to set fan speed sendFanSpeed = function () { self.control.sendCustomCommand({ command: "M106 S" + self.fanPWM() }); - }; - //extra classes - $("#control > div.jog-panel").eq(0).addClass("controls"); - $("#control > div.jog-panel").eq(1).addClass("tools"); - $("#control > div.jog-panel").eq(2).addClass("general"); - //If !TouchUI then remove standard buttons + add slider + new buttons - if ($("#touch body").length ==0 ) { - //add ID to buttons - $("#control > div.general").find("button").eq(0).attr("id", "motors-off"); - $("#control > div.general").find("button").eq(1).attr("id", "fan-on"); - $("#control > div.general").find("button").eq(2).attr("id", "fan-off"); - //remove original fan on/off buttons - $("#fan-on").remove(); - $("#fan-off").remove(); - //add new fan controls - $("#control > div.jog-panel.general").find("button").eq(0).before("\ - \ - \ - \ - "); - } else { //if TouchUI is active we only add the speed input + fan on button in a new section. - console.log("Fan Speed Slider: NOTICE! TouchUI is active, adding simplified control."); - $("#control > div.jog-panel.general").after("\ -
\ -
\ - \ - \ + }; + try { + //extra classes + $("#control > div.jog-panel").eq(0).addClass("controls"); + $("#control > div.jog-panel").eq(1).addClass("tools"); + $("#control > div.jog-panel").eq(2).addClass("general"); + //If !TouchUI then remove standard buttons + add slider + new buttons + if ($("#touch body").length ==0 ) { + //add ID to buttons + $("#control > div.general").find("button").eq(0).attr("id", "motors-off"); + $("#control > div.general").find("button").eq(1).attr("id", "fan-on"); + $("#control > div.general").find("button").eq(2).attr("id", "fan-off"); + //remove original fan on/off buttons + $("#fan-on").remove(); + $("#fan-off").remove(); + //add new fan controls + $("#control > div.jog-panel.general").find("button").eq(0).before("\ + \ + \ + \ + "); + } else { //if TouchUI is active we only add the speed input + fan on button in a new section. + console.log("Fan Speed Slider: NOTICE! TouchUI is active, adding simplified control."); + $("#control > div.jog-panel.general").after("\ +
\ +
\ + \ + \ +
\
\ -
\ - "); + "); + } + } + catch(error) { + console.log(error); } //retrieve settings self.onBeforeBinding = function() {