From 6cd6b98c2bf7ae13ee115bf68f804549c484d55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Thu, 13 Oct 2016 15:51:38 +0200
Subject: [PATCH] Core JS needs to go after plugin JS, or we might run into
 race conditions

---
 src/octoprint/server/__init__.py           | 2 +-
 src/octoprint/templates/javascripts.jinja2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
index 2711afa1..b1e4692d 100644
--- a/src/octoprint/server/__init__.py
+++ b/src/octoprint/server/__init__.py
@@ -1058,7 +1058,7 @@ class Server(object):
 		     "js/app/helpers.js",
 		     "js/app/main.js"]
 		js_plugins = dynamic_plugin_assets["external"]["js"]
-		js_app = js_core + js_plugins
+		js_app = js_plugins + js_core
 
 		css_libs = [
 			"css/bootstrap.min.css",
diff --git a/src/octoprint/templates/javascripts.jinja2 b/src/octoprint/templates/javascripts.jinja2
index edebf560..9fb0c4e9 100644
--- a/src/octoprint/templates/javascripts.jinja2
+++ b/src/octoprint/templates/javascripts.jinja2
@@ -1,4 +1,4 @@
 {% assets "js_libs" %}<script type="text/javascript" src="{{ ASSET_URL }}"></script>{% endassets %}
-{% assets "js_core" %}<script type="text/javascript" src="{{ ASSET_URL }}"></script>{% endassets %}
 {% assets "js_plugins" %}<script type="text/javascript" src="{{ ASSET_URL }}"></script>{% endassets %}
+{% assets "js_core" %}<script type="text/javascript" src="{{ ASSET_URL }}"></script>{% endassets %}
 {% if g.locale %}<script type="text/javascript" src="{{ url_for('localeJs', locale=g.locale, domain='messages') }}"></script>{% endif %}