From 738c699a6e868241ecc6ed4c1b5e652cc38afcaa Mon Sep 17 00:00:00 2001
From: Mark Walker <markwal@hotmail.com>
Date: Thu, 30 Jul 2015 10:43:10 +0200
Subject: [PATCH] Fix for #1001 connection tab not unfolding

Defer collapsing the connection element until the whole wrapper part is
visible (it's hidden for non-admins).
(cherry picked from commit af67d8b)
---
 .../static/js/app/viewmodels/connection.js    | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/octoprint/static/js/app/viewmodels/connection.js b/src/octoprint/static/js/app/viewmodels/connection.js
index 9c35936e..7f55d607 100644
--- a/src/octoprint/static/js/app/viewmodels/connection.js
+++ b/src/octoprint/static/js/app/viewmodels/connection.js
@@ -86,6 +86,15 @@ $(function() {
             self._processStateData(data.state);
         };
 
+        self.openOrCloseOnStateChange = function() {
+            var connectionTab = $("#connection");
+            if (self.isOperational() && connectionTab.hasClass("in")) {
+                connectionTab.collapse("hide");
+            } else if (!self.isOperational() && !connectionTab.hasClass("in")) {
+                connectionTab.collapse("show");
+            }
+        }
+
         self._processStateData = function(data) {
             self.previousIsOperational = self.isOperational();
 
@@ -97,15 +106,10 @@ $(function() {
             self.isReady(data.flags.ready);
             self.isLoading(data.flags.loading);
 
-            var connectionTab = $("#connection");
-            if (self.previousIsOperational != self.isOperational()) {
-                if (self.isOperational() && connectionTab.hasClass("in")) {
-                    // connection just got established, close connection tab for now
-                    connectionTab.collapse("hide");
-                } else if (!connectionTab.hasClass("in")) {
-                    // connection just dropped, make sure connection tab is open
-                    connectionTab.collapse("show");
-                }
+            if (self.loginState.isAdmin() && self.previousIsOperational != self.isOperational()) {
+                // only open or close if the panel is visible (for admins) and
+                // the state just changed to avoid thwarting manual open/close
+                self.openOrCloseOnStateChange();
             }
         };
 
@@ -147,6 +151,16 @@ $(function() {
 
         self.onStartup = function() {
             self.requestData();
+
+            // when isAdmin becomes true the first time, set the panel open or
+            // closed based on the connection state
+            var subscription = self.loginState.isAdmin.subscribe(function(newValue) {
+                if (newValue) {
+                    // wait until after the isAdmin state has run through all subscriptions
+                    setTimeout(self.openOrCloseOnStateChange, 0);
+                    subscription.dispose();
+                }
+            });
         };
     }