pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Core JS needs to go after plugin JS, or we might run into race conditions

Browse source
This commit is contained in:
Gina Häußge 2016-10-13 15:51:38 +02:00
parent 91ef5480b1
commit 6cd6b98c2b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/octoprint/server/__init__.py
View file

@ -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",

2
src/octoprint/templates/javascripts.jinja2
View file

@ -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 %}