From dbf6320223fbc0477edf2e5f5e43a31e6bf7ea8b Mon Sep 17 00:00:00 2001
From: "Antoine Vandevenne (anv)" <anv@odoo.com>
Date: Fri, 2 Apr 2021 17:25:04 +0200
Subject: [PATCH] split custom-js files with "," instead of ";"

---
 conf.py                                                       | 4 ++--
 .../finance/accounting/overview/main_concepts/memento.rst     | 2 +-
 .../management/reporting/valuation_methods_anglo_saxon.rst    | 2 +-
 .../management/reporting/valuation_methods_continental.rst    | 2 +-
 .../inventory/overview/concepts/double-entry.rst              | 2 +-
 extensions/odoo_theme/layout.html                             | 3 ++-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/conf.py b/conf.py
index 74a575f3d..682905bdc 100644
--- a/conf.py
+++ b/conf.py
@@ -163,9 +163,9 @@ html_favicon = os.path.join(html_theme_path[0], html_theme, 'static', 'img', 'fa
 html_static_path = ['static']
 html_add_permalinks = '¶'  # Sphinx < 3.5
 html_permalinks = True  # Sphinx >= 3.5
-# The page-specific js files that can be imported with the 'custom-js' metadata directive.
+# The page-specific js files that can be imported with the 'custom-js' metadata directive. TODO VFE does it act as a filter? Why are there already some imports not listed here?
 html_js_files = []
-# The page-specific css files that can be imported with the 'custom-css' metadata directive.
+# The page-specific css files that can be imported with the 'custom-css' metadata directive. TODO VFE does it act as a filter? Why are there already some imports not listed here?
 html_css_files = []
 
 # PHP lexer option to not require <?php
diff --git a/content/applications/finance/accounting/overview/main_concepts/memento.rst b/content/applications/finance/accounting/overview/main_concepts/memento.rst
index c9e19bc4c..9be0b6b23 100644
--- a/content/applications/finance/accounting/overview/main_concepts/memento.rst
+++ b/content/applications/finance/accounting/overview/main_concepts/memento.rst
@@ -1,6 +1,6 @@
 :code-column:
 :custom-css: accounting.css
-:custom-js: accounts.js;chart-of-accounts.js;entries.js;misc.js;reconciliation.js
+:custom-js: accounts.js,chart-of-accounts.js,entries.js,misc.js,reconciliation.js
 
 ==============================================
 Accounting Memento For Entrepreneurs (US GAAP)
diff --git a/content/applications/inventory_and_mrp/inventory/management/reporting/valuation_methods_anglo_saxon.rst b/content/applications/inventory_and_mrp/inventory/management/reporting/valuation_methods_anglo_saxon.rst
index dcbd5d3a1..2a2ab8f49 100644
--- a/content/applications/inventory_and_mrp/inventory/management/reporting/valuation_methods_anglo_saxon.rst
+++ b/content/applications/inventory_and_mrp/inventory/management/reporting/valuation_methods_anglo_saxon.rst
@@ -1,6 +1,6 @@
 :code-column:
 :custom-css: accounting.css
-:custom-js: coa-valuation-anglo-saxon.js;misc.js
+:custom-js: coa-valuation-anglo-saxon.js,misc.js
 
 ==========================================================
 How to do an inventory valuation? (Anglo-Saxon Accounting)
diff --git a/content/applications/inventory_and_mrp/inventory/management/reporting/valuation_methods_continental.rst b/content/applications/inventory_and_mrp/inventory/management/reporting/valuation_methods_continental.rst
index 51b991de5..9d507ff81 100644
--- a/content/applications/inventory_and_mrp/inventory/management/reporting/valuation_methods_continental.rst
+++ b/content/applications/inventory_and_mrp/inventory/management/reporting/valuation_methods_continental.rst
@@ -1,6 +1,6 @@
 :code-column:
 :custom-css: accounting.css
-:custom-js: coa-valuation-continental.js;misc.js
+:custom-js: coa-valuation-continental.js,misc.js
 
 ==========================================================
 How to do an inventory valuation? (Continental Accounting)
diff --git a/content/applications/inventory_and_mrp/inventory/overview/concepts/double-entry.rst b/content/applications/inventory_and_mrp/inventory/overview/concepts/double-entry.rst
index b46d39502..f95f4c376 100644
--- a/content/applications/inventory_and_mrp/inventory/overview/concepts/double-entry.rst
+++ b/content/applications/inventory_and_mrp/inventory/overview/concepts/double-entry.rst
@@ -1,6 +1,6 @@
 :code-column:
 :custom-css: accounting.css
-:custom-js: inventory.js;misc.js
+:custom-js: inventory.js,misc.js
 
 ====================================
 Introduction to Inventory Management
diff --git a/extensions/odoo_theme/layout.html b/extensions/odoo_theme/layout.html
index fc5da236d..610131580 100644
--- a/extensions/odoo_theme/layout.html
+++ b/extensions/odoo_theme/layout.html
@@ -5,6 +5,7 @@
     {{ super() }}
     {# Allow custom css style import for specific pages #}
     {% if 'custom-css' in meta %}
+        {# TODO VFE this should be wrapped in a loop as custom-css is a comma(, not ;)-separated list #}
         {% set link = '_static/css/' + meta['custom-css'] %}
         <link rel="stylesheet" href="{{ pathto(link, 1) }}" type="text/css"/>
     {% endif %}
@@ -20,7 +21,7 @@
             integrity="sha512-wsnDgOxfyn4lhblRMHPMuJh+9CnLcwcisda1zLRGNWKh6OiQynebYTyRZYgH+eWLEdNTKak0OD2GAd/S51UhTw=="
             crossorigin="anonymous"></script>
         <script src="{{ pathto('_static/js/atom.js', 1) }}"></script>
-        {% set js_files = meta['custom-js'].split(';') %}
+        {% set js_files = meta['custom-js'].split(',') %}
         {% for js_file in js_files %}
             {% set link = '_static/js/' + js_file %}
             <script src="{{ pathto(link, 1) }}"></script>