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

Only fetch showFahrenheit flag from settings if they are available

Browse source
This commit is contained in:
Gina Häußge 2016-07-04 11:08:53 +02:00
parent b07c352b48
commit 20ca50f0b5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/octoprint/static/js/app/viewmodels/temperature.js
View file

@ -251,7 +251,9 @@ $(function() {
targets = self.temperatures[type].target;
}
var showFahrenheit = self.settingsViewModel.settings.appearance.showFahrenheitAlso();
var showFahrenheit = (self.settingsViewModel.settings !== undefined )
? self.settingsViewModel.settings.appearance.showFahrenheitAlso()
: false;
var actualTemp = actuals && actuals.length ? formatTemperature(actuals[actuals.length - 1][1], showFahrenheit) : "-";
var targetTemp = targets && targets.length ? formatTemperature(targets[targets.length - 1][1], showFahrenheit) : "-";
@ -288,7 +290,7 @@ $(function() {
}
});
return maxTemp;
}
};
self.setTarget = function(item) {
var value = item.newTarget();