Merge pull request #456 from BillyBlaze/maintenance

Maintenance
BillyBlaze · Nov 30, 2020 · 0e91142 · 0e91142
2 parents 10bec24 + b3cf6fb
commit 0e91142
Show file tree

Hide file tree

Showing 33 changed files with 6,497 additions and 4,895 deletions.
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -25,15 +25,5 @@ jobs:
           for your contributions.
         stale-issue-label: 'inactive'
         stale-pr-label: 'inactive'
-        exempt-issue-labels:
-          - help wanted
-          - up for grabs
-          - fixed
-          - confirmed
-          - pending
-        exempt-pr-labels:
-          - help wanted
-          - up for grabs
-          - fixed
-          - confirmed
-          - pending
+        exempt-issue-labels: 'help wanted,up for grabs,fixed,confirmed,pending'
+        exempt-pr-labels: 'help wanted,up for grabs,fixed,confirmed,pending'
diff --git a/octoprint_touchui/static/css/touchui.css b/octoprint_touchui/static/css/touchui.css
diff --git a/octoprint_touchui/static/fonts/fontawesome/FontAwesome.otf b/octoprint_touchui/static/fonts/fontawesome/FontAwesome.otf
diff --git a/octoprint_touchui/static/fonts/fontawesome/fontawesome-webfont.eot b/octoprint_touchui/static/fonts/fontawesome/fontawesome-webfont.eot
diff --git a/octoprint_touchui/static/fonts/fontawesome/fontawesome-webfont.svg b/octoprint_touchui/static/fonts/fontawesome/fontawesome-webfont.svg
diff --git a/octoprint_touchui/static/fonts/fontawesome/fontawesome-webfont.ttf b/octoprint_touchui/static/fonts/fontawesome/fontawesome-webfont.ttf
diff --git a/octoprint_touchui/static/fonts/fontawesome/fontawesome-webfont.woff b/octoprint_touchui/static/fonts/fontawesome/fontawesome-webfont.woff
diff --git a/octoprint_touchui/static/fonts/fontawesome/fontawesome-webfont.woff2 b/octoprint_touchui/static/fonts/fontawesome/fontawesome-webfont.woff2
diff --git a/octoprint_touchui/static/js/touchui.bundled.js b/octoprint_touchui/static/js/touchui.bundled.js
@@ -2103,38 +2103,22 @@ TouchUI.prototype.DOM.move.controls = {
 
 	init: function() {
 
-		// backward compatibility with <1.3.0
-		if($('#control-jog-feedrate').length === 0) {
-			var jogPanels = $('#control > .jog-panel');
-
-			$(jogPanels[0]).find(".jog-panel:nth-child(1)").attr("id", "control-jog-xy");
-			$(jogPanels[0]).find(".jog-panel:nth-child(2)").attr("id", "control-jog-z");
-			$(jogPanels[1]).attr("id", "control-jog-extrusion");
-			$(jogPanels[2]).attr("id", "control-jog-general");
-
-			$('<div class="jog-panel" id="control-jog-feedrate"></div>').insertAfter($(jogPanels[2]));
-			$(jogPanels[0]).find("> button:last-child").prependTo("#control-jog-feedrate");
-			$(jogPanels[0]).find("> input:last-child").prependTo("#control-jog-feedrate");
-			$(jogPanels[0]).find("> .slider:last-child").prependTo("#control-jog-feedrate");
-
-		}
-
 		if($('#control-jog-feedrate .input-append').length === 0) {
 			// <1.4.1
 			$("#control-jog-feedrate").insertBefore("#control-jog-extrusion");
 			$("#control-jog-extrusion button:last-child").prependTo("#control-jog-feedrate");
 			$("#control-jog-extrusion input:last-child").attr('data-bind', $("#control-jog-extrusion input:last-child").attr('data-bind').replace('slider: {', 'slider: {tools: tools(), ')).prependTo("#control-jog-feedrate");
 			$("#control-jog-extrusion .slider:last-child").prependTo("#control-jog-feedrate");
-		} else {
-			// >=1.4.1
-			$("#control-jog-feedrate").insertBefore("#control-jog-extrusion");
-			$("#control-jog-feedrate .input-append button").insertAfter("#control-jog-feedrate .input-append");
-
-			$("#control-jog-flowrate").removeClass("jog-panel");
-			$("#control-jog-flowrate .input-append button").insertAfter("#control-jog-flowrate .input-append");
 		}
 
-		$("#control div.distance").prependTo("#control-jog-feedrate");
+		// Move Z-panel
+		$("#control-jog-general").insertAfter("#control-jog-z");
+
+		// Create panel
+		var $jog = $('<div/>').attr('id', 'control-jog-rate').insertBefore('#control-jog-extrusion');
+		$("#control div.distance").appendTo($jog);
+		$("#control-jog-feedrate").appendTo($jog);
+		$("#control-jog-flowrate").appendTo($jog);
 	}
 
 }