Version 1.17+1

Bug fix: When a filament directory had no valid "date created" timestamp, the web interface disconnected with an AJAX error Bug fix: Deleting filaments didn't work Bug fix: Heater temperature inputs were not updated if the new "tools" and "states" fields were present
Duet3D · Jul 18, 2017 · 10fd888 · 10fd888
1 parent bc3fde8
commit 10fd888
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/DuetWebControl-1.17.zip → DuetWebControl-1.17+1.zip b/DuetWebControl-1.17.zip → DuetWebControl-1.17+1.zip
diff --git a/core/js/files.js b/core/js/files.js
@@ -1093,7 +1093,8 @@ function addFilament(name, dateCreated) {
 	$("#page_filaments h1").addClass("hidden");
 	$("#table_filaments").removeClass("hidden");
 
-	var row =	'<tr data-filament="' + name + '" data-date-created="' + dateCreated.getTime() + '">';
+	var dateCreatedValue = (dateCreated == undefined) ? 0 : dateCreated.getTime();
+	var row =	'<tr data-filament="' + name + '" data-date-created="' + dateCreatedValue + '">';
 	row +=		'<td><input type="checkbox"></td>';
 	row +=		'<td><a href="#" class="a-filament"><span class="glyphicon glyphicon-cd"></span> ' + name + '</a></td>';
 	row +=		'<td>' + ((dateCreated == undefined) ? T("unknown") : dateCreated.toLocaleString()) + '</td>';
@@ -1747,7 +1748,6 @@ function deleteFilament(filament, elementToRemove) {
 		action: "delete",
 		elementToRemove: elementToRemove,
 		filament: filament,
-		path: directory,
 		type: "filament"
 	});
 	doFileTask();
@@ -1788,7 +1788,7 @@ function doFileTask() {
 									dataType: "json",
 									success: function(response) {
 										if (response.err == 0) {
-											elementToRemove.remove();
+											task.elementToRemove.remove();
 											updateFilesConditionally();
 										}
 									}

diff --git a/core/js/interface.js b/core/js/interface.js
@@ -1791,6 +1791,9 @@ function setTemperatureInput(heater, value, active, setToolHeaters) {
 }
 
 function setToolTemperatureInput(tool, heater, value, active) {
+	// Update Heaters panel as well
+	setTemperatureInput(heater, value, active, false);
+
 	var tempInput = undefined;
 	if (heater == "bed") {
 		tempInput = $("#table_tools tr[data-heater='bed'] input");

diff --git a/core/reprap.htm b/core/reprap.htm
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!--	Duet Web Control v1.17
+<!--	Duet Web Control v1.17+1
 
 	written by Christian Hammacher
 
@@ -1747,7 +1747,7 @@ <h1 class="text-center text-muted">Connect to your Duet to display Filaments</h1
 													</tr>
 													<tr>
 														<th>Web Interface Version:</th>
-														<td>1.17</td>
+														<td>1.17+1</td>
 													</tr>
 												</table>
 												<span id="span_copyright">Web Interface by Christian Hammacher<br/>Licensed under the terms of the <a href="https://www.gnu.org/licenses/gpl-3.0" target="blank">GPL v3</a></span>