From 90dda10ca07a7277d65dbda71475002be98a7a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 24 Feb 2015 19:46:24 +0100 Subject: [PATCH] Proper default values for timelapse settings when no settings available from server --- .../static/js/app/viewmodels/timelapse.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/octoprint/static/js/app/viewmodels/timelapse.js b/src/octoprint/static/js/app/viewmodels/timelapse.js index 5af31fe0..f3f8abcc 100644 --- a/src/octoprint/static/js/app/viewmodels/timelapse.js +++ b/src/octoprint/static/js/app/viewmodels/timelapse.js @@ -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);