pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A bit more error resilience for handling data received from the backend

Browse source 
See #339
This commit is contained in:
Gina Häußge 2014-01-06 18:00:14 +01:00
parent 3fc6b1e8cf
commit d0cb119bb0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/octoprint/static/js/app/viewmodels/files.js
View file

@ -194,7 +194,7 @@ function GcodeFilesViewModel(printerStateViewModel, loginStateViewModel) {
var output = "<p><strong>Uploaded:</strong> " + formatDate(data["date"]) + "</p>";
if (data["gcodeAnalysis"]) {
output += "<p>";
if (data["gcodeAnalysis"]["filament"]) {
if (data["gcodeAnalysis"]["filament"] && typeof(data["gcodeAnalysis"]["filament"]) == "object") {
var filament = data["gcodeAnalysis"]["filament"];
if (_.keys(filament).length == 1) {
output += "<strong>Filament:</strong> " + formatFilament(data["gcodeAnalysis"]["filament"]["tool" + 0]) + "<br>";

2
src/octoprint/static/js/app/viewmodels/printerstate.js
View file

@ -124,7 +124,7 @@ function PrinterStateViewModel(loginStateViewModel) {
self.estimatedPrintTime(data.estimatedPrintTime);
var result = [];
if (_.keys(data.filament).length > 0) {
if (data.filament && typeof(data.filament) == "object" && _.keys(data.filament).length > 0) {
var i = 0;
do {
var key = "tool" + i;