q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set default instance name to empty string

master
Gina Häußge 2013-03-03 16:57:35 +01:00
parent c1f2866a94
commit 9b3fc0c65e
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octoprint/settings.py
View File

@ -49,7 +49,7 @@ old_default_settings = {
default_settings = old_default_settings.copy()
default_settings.update({
"appearance": {
"name": "OctoPrint",
"name": "",
"color": "white"
},
"controls": [],

16
octoprint/static/js/ui.js
View File

@ -309,10 +309,8 @@ function TemperatureViewModel(settingsViewModel) {
if (val == undefined || val == 0)
return ""; // we don't want to display the minutes since the epoch if not connected yet ;)
// calculate current time in milliseconds in UTC
var now = new Date();
var timezoneOffset = now.getTimezoneOffset() * 60 * 1000;
var timestampUtc = now.getTime() + timezoneOffset;
// current time in milliseconds in UTC
var timestampUtc = Date.now();
// calculate difference in milliseconds
var diff = timestampUtc - val;
@ -804,10 +802,11 @@ function GcodeFilesViewModel() {
}
self.changeSorting = function(sorting) {
if (sorting != "name" && sorting != "upload")
if (sorting != "name" && sorting != "upload" && sorting != "size")
return;
self.currentSorting(sorting);
self.changePage(0);
self._updateFiles();
}
@ -854,6 +853,13 @@ function GcodeFilesViewModel() {
if (a["date"] < b["date"]) return 1;
return 0;
}
} else if (self.currentSorting() == "size") {
comparator = function(a, b) {
// sorts descending
if (a["bytes"] > b["bytes"]) return -1;
if (a["bytes"] < b["bytes"]) return 1;
return 0;
}
}
// work on all files