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

Proper default values for timelapse settings when no settings available from server

Browse source
This commit is contained in:
Gina Häußge 2015-02-24 19:46:24 +01:00
parent 2250fea68a
commit 90dda10ca0
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/octoprint/static/js/app/viewmodels/timelapse.js
View file

@ -4,10 +4,14 @@ $(function() {
self.loginState = parameters[0];
self.defaultFps = 25;
self.defaultPostRoll = 0;
self.defaultInterval = 10;
self.timelapseType = ko.observable(undefined);
self.timelapseTimedInterval = ko.observable(undefined);
self.timelapsePostRoll = ko.observable(undefined);
self.timelapseFps = ko.observable(undefined);
self.timelapseTimedInterval = ko.observable(self.defaultInterval);
self.timelapsePostRoll = ko.observable(self.defaultPostRoll);
self.timelapseFps = ko.observable(self.defaultFps);
self.persist = ko.observable(false);
self.isDirty = ko.observable(false);
@ -99,19 +103,19 @@ $(function() {
self.timelapseTimedInterval(config.interval);
}
} else {
self.timelapseTimedInterval(undefined);
self.timelapseTimedInterval(self.defaultInterval);
}
if (config.postRoll != undefined && config.postRoll >= 0) {
self.timelapsePostRoll(config.postRoll);
} else {
self.timelapsePostRoll(undefined);
self.timelapsePostRoll(self.defaultPostRoll);
}
if (config.fps != undefined && config.fps > 0) {
self.timelapseFps(config.fps);
} else {
self.timelapseFps(undefined);
self.timelapseFps(self.defaultFps);
}
self.persist(false);