ManuelW/OctoPrint-FanSpeedSlider
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

missing span on touchui button + less global

Browse Source 
hopefully nothing global "use strict" seems to not complain :D
This commit is contained in:
ntoff 2017-11-12 04:46:00 +10:00
parent a47ead4db3
commit 21e4627da2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
octoprint_fanspeedslider/static/js/fanslider.js
View File

@ -5,7 +5,7 @@
$(function() { $(function() {
function FanSliderPluginViewModel(parameters) { function FanSliderPluginViewModel(parameters) {
//'use strict'; 'use strict';
var self = this; var self = this;
self.settings = parameters[0]; self.settings = parameters[0];
@ -29,8 +29,8 @@ $(function() {
} }
}; };
//send gcode to set fan speed TODO: not be a global function //send gcode to set fan speed
sendFanSpeed = ko.pureComputed(function () { self.control.sendFanSpeed = ko.pureComputed(function () {
self.speed = self.control.fanSpeed() * 255 / 100 //don't forget to limit this to 2 decimal places at some point. self.speed = self.control.fanSpeed() * 255 / 100 //don't forget to limit this to 2 decimal places at some point.
if (self.control.fanSpeed() < self.control.minFanSpeed() && self.control.fanSpeed() != "0") { if (self.control.fanSpeed() < self.control.minFanSpeed() && self.control.fanSpeed() != "0") {
console.log("Fan Speed Control Plugin: " + self.control.fanSpeed() + "% is less than the minimum speed ("+self.control.minFanSpeed()+"%), increasing."); console.log("Fan Speed Control Plugin: " + self.control.fanSpeed() + "% is less than the minimum speed ("+self.control.minFanSpeed()+"%), increasing.");
@ -65,21 +65,21 @@ $(function() {
//add new fan controls //add new fan controls
$("#control-jog-general").find("button").eq(0).before("\ $("#control-jog-general").find("button").eq(0).before("\
<input type=\"number\" style=\"width: 90px\" data-bind=\"slider: {min: 00, max: 100, step: 1, value: fanSpeed, tooltip: 'hide'}\">\ <input type=\"number\" style=\"width: 90px\" data-bind=\"slider: {min: 00, max: 100, step: 1, value: fanSpeed, tooltip: 'hide'}\">\
<button class=\"btn btn-block control-box\" id=\"fan-on\" data-bind=\"enable: isOperational() && loginState.isUser(), click: function() { sendFanSpeed() }\">" + gettext("Fan") + ":<span data-bind=\"text: fanSpeed() + '%'\"></span></button>\ <button class=\"btn btn-block control-box\" id=\"fan-on\" data-bind=\"enable: isOperational() && loginState.isUser(), click: function() { $root.sendFanSpeed() }\">" + gettext("Fan speed") + ":<span data-bind=\"text: fanSpeed() + '%'\"></span></button>\
<button class=\"btn btn-block control-box\" id=\"fan-off\" data-bind=\"enable: isOperational() && loginState.isUser(), click: function() { $root.sendCustomCommand({ type: 'command', commands: ['M106 S0'] }) }\">" + gettext("Fan off") + "</button>\ <button class=\"btn btn-block control-box\" id=\"fan-off\" data-bind=\"enable: isOperational() && loginState.isUser(), click: function() { $root.sendCustomCommand({ type: 'command', commands: ['M106 S0'] }) }\">" + gettext("Fan off") + "</button>\
"); ");
} else { } else {
//replace touch UI's fan on button with one that sends whatever speed is set in this plugin //replace touch UI's fan on button with one that sends whatever speed is set in this plugin
$("#fan-on").remove(); $("#fan-on").remove();
$("#control-jog-general").find("button").eq(0).after("\ $("#control-jog-general").find("button").eq(0).after("\
<button class=\"btn btn-block control-box\" id=\"fan-on\" data-bind=\"enable: isOperational() && loginState.isUser(), click: function() { sendFanSpeed() }\">" + gettext("Fan on") + "</button>\ <button class=\"btn btn-block control-box\" id=\"fan-on\" data-bind=\"enable: isOperational() && loginState.isUser(), click: function() { $root.sendFanSpeed() }\">" + gettext("Fan on") + "</button>\
"); ");
//also add spin box + button below in its own section, button is redundant but convenient //also add spin box + button below in its own section, button is redundant but convenient
$("#control-jog-extrusion").after("\ $("#control-jog-extrusion").after("\
<div id=\"control-fan-slider\" class=\"jog-panel filament\" data-bind=\"visible: loginState.isUser\">\ <div id=\"control-fan-slider\" class=\"jog-panel filament\" data-bind=\"visible: loginState.isUser\">\
<div>\ <div>\
<input type=\"number\" style=\"width: 150px\" data-bind=\"slider: {min: 00, max: 255, step: 1, value: fanSpeed, tooltip: 'hide'}\">\ <input type=\"number\" style=\"width: 150px\" data-bind=\"slider: {min: 00, max: 255, step: 1, value: fanSpeed, tooltip: 'hide'}\">\
<button class=\"btn btn-block control-box\" data-bind=\"enable: isOperational() && loginState.isUser(), click: function() { sendFanSpeed() }\">" + gettext("Fan Speed(%)") + "</button>\ <button class=\"btn btn-block\" style=\"width: 169px\" data-bind=\"enable: isOperational() && loginState.isUser(), click: function() { $root.sendFanSpeed() }\">" + gettext("Fan speed:") + "<span data-bind=\"text: fanSpeed() + '%'\"></span></button>\
</div>\ </div>\
</div>\ </div>\
"); ");