From bcd7bb4d20e0ff48116d9f99c4f0fb5e691f3169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 25 Jan 2016 16:28:52 +0100 Subject: [PATCH] Don't enable Print button if no job is selected Fixes #1007 --- .../static/js/app/viewmodels/printerstate.js | 12 +++++++++++- src/octoprint/templates/sidebar/state.jinja2 | 6 +++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/octoprint/static/js/app/viewmodels/printerstate.js b/src/octoprint/static/js/app/viewmodels/printerstate.js index 00a7b67e..048578e1 100644 --- a/src/octoprint/static/js/app/viewmodels/printerstate.js +++ b/src/octoprint/static/js/app/viewmodels/printerstate.js @@ -14,6 +14,16 @@ $(function() { self.isLoading = ko.observable(undefined); self.isSdReady = ko.observable(undefined); + self.enablePrint = ko.computed(function() { + return self.isOperational() && self.isReady() && !self.isPrinting() && self.loginState.isUser() && self.filename() != undefined; + }); + self.enablePause = ko.computed(function() { + return self.isOperational() && (self.isPrinting() || self.isPaused()) && self.loginState.isUser(); + }); + self.enableCancel = ko.computed(function() { + return self.isOperational() && (self.isPrinting() || self.isPaused()) && self.loginState.isUser(); + }); + self.filename = ko.observable(undefined); self.progress = ko.observable(undefined); self.filesize = ko.observable(undefined); @@ -242,4 +252,4 @@ $(function() { ["loginStateViewModel"], ["#state_wrapper", "#drop_overlay"] ]); -}); \ No newline at end of file +}); diff --git a/src/octoprint/templates/sidebar/state.jinja2 b/src/octoprint/templates/sidebar/state.jinja2 index 7bcfdd25..972a2605 100644 --- a/src/octoprint/templates/sidebar/state.jinja2 +++ b/src/octoprint/templates/sidebar/state.jinja2 @@ -14,7 +14,7 @@