From 6cd6b98c2bf7ae13ee115bf68f804549c484d55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 13 Oct 2016 15:51:38 +0200 Subject: [PATCH 1/2] 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" %}{% endassets %} -{% assets "js_core" %}{% endassets %} {% assets "js_plugins" %}{% endassets %} +{% assets "js_core" %}{% endassets %} {% if g.locale %}{% endif %} From eabff453cd2bf5fa262e623ad51cc8c32c4bf1dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 13 Oct 2016 16:12:57 +0200 Subject: [PATCH 2/2] Preparing release of 1.2.17rc3 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3b9e21e..38ae44a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # OctoPrint Changelog +## 1.2.17rc3 (2016-10-13) + +### Bug fixes + + * Fixed a wrong order in loading JS files on the client introduced in 1.2.17rc2 to make the UI more resilient against broken plugin JS. + +([Commits](https://github.com/foosel/OctoPrint/compare/1.2.17rc2...1.2.17rc3)) + ## 1.2.17rc2 (2016-10-13) ### Improvements