From ac549770eee9551f3ba67d3968fa45e7c2168345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Thu, 22 Jan 2015 16:56:42 +0100
Subject: [PATCH] Move onStartup call to before any bindings getting applied

---
 src/octoprint/static/js/app/main.js | 42 +++++++++++++++--------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/octoprint/static/js/app/main.js b/src/octoprint/static/js/app/main.js
index 8a84919f..ae976fe5 100644
--- a/src/octoprint/static/js/app/main.js
+++ b/src/octoprint/static/js/app/main.js
@@ -415,6 +415,28 @@ $(function() {
             }
         };
 
+        //~~ startup commands
+
+        _.each(allViewModels, function(viewModel) {
+            if (viewModel.hasOwnProperty("onStartup")) {
+                viewModel.onStartup();
+            }
+        });
+
+        loginStateViewModel.subscribe(function(change, data) {
+            if ("login" == change) {
+                $("#gcode_upload").fileupload("enable");
+
+                if (data.admin) {
+                    usersViewModel.requestData();
+                }
+            } else {
+                $("#gcode_upload").fileupload("disable");
+            }
+        });
+
+        //~~ view model binding
+
         settingsViewModel.requestData(function() {
             ko.applyBindings(settingsViewModel, document.getElementById("settings_dialog"));
 
@@ -473,26 +495,6 @@ $(function() {
             });
         });
 
-        //~~ startup commands
-
-        _.each(allViewModels, function(viewModel) {
-            if (viewModel.hasOwnProperty("onStartup")) {
-                viewModel.onStartup();
-            }
-        });
-
-        loginStateViewModel.subscribe(function(change, data) {
-            if ("login" == change) {
-                $("#gcode_upload").fileupload("enable");
-
-                if (data.admin) {
-                    usersViewModel.requestData();
-                }
-            } else {
-                $("#gcode_upload").fileupload("disable");
-            }
-        });
-
         //~~ UI stuff
 
         var webcamDisableTimeout;