From f6cda86e45d0b4dd9366757c43a8b308a41d46c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E9=92=A6=E4=BA=AE?= Date: Wed, 6 Mar 2019 11:21:32 +0800 Subject: [PATCH] Separating js and css in render_bundle (#3054) --- seahub/templates/draft.html | 6 +++++- seahub/templates/react_app.html | 7 ++++++- seahub/templates/shared_file_view_react.html | 20 ++++++++++++++++---- seahub/templates/view_file_markdown.html | 3 ++- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/seahub/templates/draft.html b/seahub/templates/draft.html index 18de941849..6a92530f5f 100644 --- a/seahub/templates/draft.html +++ b/seahub/templates/draft.html @@ -1,6 +1,10 @@ {% extends "base_for_react.html" %} {% load render_bundle from webpack_loader %} +{% block extra_style %} +{% render_bundle 'draft' 'css' %} +{% endblock %} + {% block extra_script %} -{% render_bundle 'draft' %} +{% render_bundle 'draft' 'js' %} {% endblock %} diff --git a/seahub/templates/react_app.html b/seahub/templates/react_app.html index 2cbf422fbb..4e1cd4dbb2 100644 --- a/seahub/templates/react_app.html +++ b/seahub/templates/react_app.html @@ -1,7 +1,12 @@ {% extends "base_for_react.html" %} {% load render_bundle from webpack_loader %} +{% block extra_style %} +{% render_bundle 'app' 'css' %} +{% endblock %} + + {% block extra_script %} -{% render_bundle 'app' %} +{% render_bundle 'app' 'js' %} {% endblock %} diff --git a/seahub/templates/shared_file_view_react.html b/seahub/templates/shared_file_view_react.html index 4bc76e39e9..9c653a30a7 100644 --- a/seahub/templates/shared_file_view_react.html +++ b/seahub/templates/shared_file_view_react.html @@ -2,6 +2,18 @@ {% load seahub_tags i18n %} {% load render_bundle from webpack_loader %} +{% block extra_style %} +{% if filetype == 'Markdown' %} + {% render_bundle 'sharedFileViewMarkdown' 'css' %} +{% elif filetype == 'Text' %} + {% render_bundle 'sharedFileViewText' 'css' %} +{% elif filetype == 'Image' %} + {% render_bundle 'sharedFileViewImage' 'css' %} +{% elif filetype == 'Video' %} + {% render_bundle 'sharedFileViewVideo' 'css' %} +{% endif %} +{% endblock %} + {% block extra_script %} {% if filetype == 'Markdown' %} - {% render_bundle 'sharedFileViewMarkdown' %} + {% render_bundle 'sharedFileViewMarkdown' 'js' %} {% elif filetype == 'Text' %} - {% render_bundle 'sharedFileViewText' %} + {% render_bundle 'sharedFileViewText' 'js' %} {% elif filetype == 'Image' %} - {% render_bundle 'sharedFileViewImage' %} + {% render_bundle 'sharedFileViewImage' 'js' %} {% elif filetype == 'Video' %} - {% render_bundle 'sharedFileViewVideo' %} + {% render_bundle 'sharedFileViewVideo' 'js' %} {% endif %} {% endblock %} diff --git a/seahub/templates/view_file_markdown.html b/seahub/templates/view_file_markdown.html index 98c266a4b7..44c8466f82 100644 --- a/seahub/templates/view_file_markdown.html +++ b/seahub/templates/view_file_markdown.html @@ -10,6 +10,7 @@ + {% render_bundle 'markdownEditor' 'css' %}
@@ -48,6 +49,6 @@ } - {% render_bundle 'markdownEditor' %} + {% render_bundle 'markdownEditor' 'js' %}