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

Split assets up a bit to allow better debugging of issues with webassets

Browse source
This commit is contained in:
Gina Häußge 2015-06-17 18:43:38 +02:00
parent 608be52b9a
commit cbc6f20fa6
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -756,10 +756,9 @@ class Server():
js_libs_bundle = Bundle(*js_libs, output="webassets/packed_libs.js")
if settings().getBoolean(["devel", "webassets", "minify"]):
js_app_bundle = Bundle(*js_app, output="webassets/package_app.js", filters="rjsmin")
js_app_bundle = Bundle(*js_app, output="webassets/packed_app.js", filters="rjsmin")
else:
js_app_bundle = Bundle(*js_app, output="webassets/package_app.js")
all_js_bundle = Bundle(js_libs_bundle, js_app_bundle, output="webassets/packed.js")
js_app_bundle = Bundle(*js_app, output="webassets/packed_app.js")
css_libs_bundle = Bundle(*css_libs, output="webassets/packed_libs.css")
css_app_bundle = Bundle(*css_app, output="webassets/packed_app.css")
@ -785,11 +784,12 @@ class Server():
register_filter(LessImportRewrite)
all_css_bundle = Bundle(css_libs_bundle, css_app_bundle, output="webassets/packed.css")
all_less_bundle = Bundle(*less_app, output="webassets/packed.less", filters="less_importrewrite")
all_less_bundle = Bundle(*less_app, output="webassets/packed_app.less", filters="less_importrewrite")
assets.register("all_js", all_js_bundle)
assets.register("all_css", all_css_bundle)
assets.register("js_libs", js_libs_bundle)
assets.register("js_app", js_app_bundle)
assets.register("css_libs", css_libs_bundle)
assets.register("css_app", css_app_bundle)
assets.register("less_app", all_less_bundle)

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

@ -1,4 +1,8 @@
{% assets "all_js" %}
{% assets "js_libs" %}
<script type="text/javascript" src="{{ ASSET_URL }}"></script>
{% endassets %}
{% assets "js_app" %}
<script type="text/javascript" src="{{ ASSET_URL }}"></script>
{% endassets %}

6
src/octoprint/templates/stylesheets.jinja2
View file

@ -1,4 +1,8 @@
{% assets "all_css" %}
{% assets "css_libs" %}
<link href="{{ ASSET_URL }}" rel="stylesheet" media="screen">
{% endassets %}
{% assets "css_app" %}
<link href="{{ ASSET_URL }}" rel="stylesheet" media="screen">
{% endassets %}