3diy
/
OctoprintKlipperPlugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rc' into devel

This commit is contained in:
thelastWallE 2021-03-30 23:10:25 +02:00
parent b6f5424c5c cc90ca8862
commit 22c52ee376
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octoprint_klipper/static/css/klipper.css
View File

@ -97,7 +97,7 @@ ul#klipper-settings {
height: calc(100% - 35px); height: calc(100% - 35px);
} }
#settings_plugin_klipper form .tab-content .tap-pane#conf .control-group { div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group {
margin-bottom: 0px; margin-bottom: 0px;
height: 100%; height: 100%;
} }

5
octoprint_klipper/static/js/klipper_graph.js
View File

@ -35,7 +35,6 @@ function KlipperGraphViewModel(parameters) {
self.canvas; self.canvas;
self.canvasContext; self.canvasContext;
self.chart; self.chart;
self.chart.update;
self.spinnerDialog; self.spinnerDialog;
self.onStartup = function() { self.onStartup = function() {
@ -217,7 +216,9 @@ function KlipperGraphViewModel(parameters) {
for (i=0; i < self.datasets().length; i++) { for (i=0; i < self.datasets().length; i++) {
self.datasets()[i].fill = self.datasetFill(); self.datasets()[i].fill = self.datasetFill();
} }
self.chart.update(); if (self.chart) {
self.chart.update();
}
} }
return true return true
} }

2
setup.py
View File

@ -19,7 +19,7 @@ plugin_package = "octoprint_klipper"
plugin_name = "OctoKlipper" plugin_name = "OctoKlipper"
plugin_version = "0.3.4rc3" plugin_version = "0.3.4rc4"
plugin_description = """A plugin for OctoPrint to configure,control and monitor the Klipper 3D printer software.""" plugin_description = """A plugin for OctoPrint to configure,control and monitor the Klipper 3D printer software."""