From c932e496fa461ac0a86d73842d728c7c3c7c0cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Thu, 8 Oct 2015 17:08:36 +0200
Subject: [PATCH 1/3] SWU: Show reload dialog after update

The notification and the (forced) dialog afterwards were way too
redundant.
---
 .../softwareupdate/static/js/softwareupdate.js   | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
index fd4ba14f..8b75047b 100644
--- a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
+++ b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
@@ -27,6 +27,8 @@ $(function() {
             {"key": "git_commit", "name": gettext("Commit")}
         ];
 
+        self.reloadOverlay = $("#reloadui_overlay");
+
         self.versions = new ItemListHelper(
             "plugin.softwareupdate.versions",
             {
@@ -329,18 +331,10 @@ $(function() {
         self.onDataUpdaterReconnect = function() {
             if (self.waitingForRestart) {
                 self.waitingForRestart = false;
-
-                var options = {
-                    title: gettext("Restart successful!"),
-                    text: gettext("The server was restarted successfully. The page will now reload automatically."),
-                    type: "success",
-                    hide: false
-                };
-                self._showPopup(options);
                 self.updateInProgress = false;
-
-                var delay = 5 + Math.floor(Math.random() * 5) + 1;
-                setTimeout(function() {location.reload(true);}, delay * 1000);
+                if (!self.reloadOverlay.is(":visible")) {
+                    self.reloadOverlay.show();
+                }
             }
         };
 

From 1bf46d655d92fe01e9c3c4066073ff3f86701e4f Mon Sep 17 00:00:00 2001
From: Salandora <Sunpack@web.de>
Date: Mon, 12 Oct 2015 10:20:32 +0200
Subject: [PATCH 2/3] Fix SD disabled error

---
 src/octoprint/static/js/app/viewmodels/files.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/octoprint/static/js/app/viewmodels/files.js b/src/octoprint/static/js/app/viewmodels/files.js
index 5b409007..d746c839 100644
--- a/src/octoprint/static/js/app/viewmodels/files.js
+++ b/src/octoprint/static/js/app/viewmodels/files.js
@@ -449,6 +449,9 @@ $(function() {
                 var drop = (dropzone == "local") ? localTarget : sdTarget;
                 var url = API_BASEURL + "files/" + dropzone;
 
+                if (button === undefined)
+                    return;
+
                 button.fileupload({
                     url: url,
                     dataType: "json",

From 20676926e6ad1fd064180e94041248331a81175f Mon Sep 17 00:00:00 2001
From: Salandora <Sunpack@web.de>
Date: Mon, 12 Oct 2015 13:54:52 +0200
Subject: [PATCH 3/3] Fix a typo that broke custom control parameters

---
 src/octoprint/static/js/app/viewmodels/control.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/octoprint/static/js/app/viewmodels/control.js b/src/octoprint/static/js/app/viewmodels/control.js
index a8680e87..70865873 100644
--- a/src/octoprint/static/js/app/viewmodels/control.js
+++ b/src/octoprint/static/js/app/viewmodels/control.js
@@ -293,7 +293,7 @@ $(function() {
             if (command.hasOwnProperty("command") || command.hasOwnProperty("commands")) {
                 var commands = command.commands || [command.command];
 
-                if (commands.hasOwnProperty("input")) {
+                if (command.hasOwnProperty("input")) {
                     var parameters = {};
                     _.each(command.input, function(input) {
                         if (!input.hasOwnProperty("parameter") || !input.hasOwnProperty("value")) {