Skip to content

Commit 749ea4e

Browse files
committed
Merge branch 'develop'
2 parents 53b60ba + 707d895 commit 749ea4e

File tree

5 files changed

+4
-356
lines changed

5 files changed

+4
-356
lines changed

octoprint_gcodethumbs/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def on_after_startup(self):
1111

1212
def get_assets(self):
1313
return dict(
14-
js=["js/gcode-parser.js", "js/gcode-preview.js", "js/gcode-preview-viewmodel.js"]
14+
js=["js/gcode-preview.js", "js/gcode-preview-viewmodel.js"]
1515
)
1616

1717
__plugin_implementation__ = GCodeThumbsPlugin()

octoprint_gcodethumbs/static/js/gcode-parser.js

Lines changed: 0 additions & 108 deletions
This file was deleted.

octoprint_gcodethumbs/static/js/gcode-preview-viewmodel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ $(function() {
7272
const canvas = document.createElement('canvas');
7373

7474
// instantiate preview
75-
const preview = new GCodePreview({
75+
const preview = new GCodePreview.Preview({
7676
canvas : canvas,
7777
});
7878

octoprint_gcodethumbs/static/js/gcode-preview.js

Lines changed: 1 addition & 245 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
plugin_name = "GCode Thumbs"
1515

1616
# The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
17-
plugin_version = "0.2.1"
17+
plugin_version = "0.2.2"
1818

1919
# The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
2020
# module

0 commit comments

Comments
 (0)