Pass morpher settings into Component.init.

adamghill · Oct 2, 2023 · c32f5c3 · c32f5c3
1 parent d3f618d
commit c32f5c3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 27 deletions.
diff --git a/django_unicorn/static/unicorn/js/unicorn.js b/django_unicorn/static/unicorn/js/unicorn.js
@@ -1,6 +1,7 @@
 import { Component } from "./component.js";
 import { isEmpty, hasValue } from "./utils.js";
 import { components, lifecycleEvents } from "./store.js";
+import { getMorpher } from "./morpher.js";
 
 let messageUrl = "";
 let csrfTokenHeaderName = "X-CSRFToken";
@@ -12,10 +13,15 @@ let morpher;
  *
  * @typedef
  */
-export function init(_messageUrl, _csrfTokenHeaderName, _csrfTokenCookieName, _morpher) {
-  window.morpher = _morpher;
+export function init(
+  _messageUrl,
+  _csrfTokenHeaderName,
+  _csrfTokenCookieName,
+  _morpherSettings
+) {
   messageUrl = _messageUrl;
-  morpher = _morpher;
+
+  morpher = getMorpher(_morpherSettings);
 
   if (hasValue(_csrfTokenHeaderName)) {
     csrfTokenHeaderName = _csrfTokenHeaderName;
@@ -24,6 +30,7 @@ export function init(_messageUrl, _csrfTokenHeaderName, _csrfTokenCookieName, _m
   if (hasValue(_csrfTokenCookieName)) {
     csrfTokenCookieName = _csrfTokenCookieName;
   }
+
   return {
     messageUrl,
     csrfTokenHeaderName,

diff --git a/django_unicorn/templates/unicorn/scripts.html b/django_unicorn/templates/unicorn/scripts.html
@@ -6,11 +6,9 @@
 <script src="{% static 'unicorn/js/unicorn.min.js' %}"></script>
 <script>
   const url = "{% url 'django_unicorn:message' %}";
-
   const morpherSettings = JSON.parse(document.getElementById("unicorn:settings:morpher").textContent);
-  const morpher = getMorpher(morpherSettings);
 
-  Unicorn.init(url, "{{ CSRF_HEADER_NAME }}", "{{ CSRF_COOKIE_NAME }}", morpher);
+  Unicorn.init(url, "{{ CSRF_HEADER_NAME }}", "{{ CSRF_COOKIE_NAME }}", morpherSettings);
 
 </script>
 {% else %}
@@ -22,10 +20,8 @@
   window.Unicorn = Unicorn;
 
   const url = "{% url 'django_unicorn:message' %}";
-
   const morpherSettings = JSON.parse(document.getElementById("unicorn:settings:morpher").textContent);
-  const morpher = getMorpher(morpherSettings);
 
-  Unicorn.init(url, "{{ CSRF_HEADER_NAME }}", "{{ CSRF_COOKIE_NAME }}", morpher);
+  Unicorn.init(url, "{{ CSRF_HEADER_NAME }}", "{{ CSRF_COOKIE_NAME }}", morpherSettings);
 </script>
 {% endif %}
diff --git a/example/www/templates/www/base.html b/example/www/templates/www/base.html
@@ -20,8 +20,11 @@
     #menu li:first-child {
       border-left: none !important;
     }
+
   </style>
 
+  <script defer src="https://unpkg.com/@alpinejs/[email protected]/dist/cdn.min.js"></script>
+  <script defer src="https://unpkg.com/[email protected]/dist/cdn.min.js"></script>
   {% unicorn_scripts %}
 </head>
 
@@ -50,4 +53,4 @@ <h1>django-unicorn</h1>
   </main>
 </body>
 
-</html>
+</html>
diff --git a/tests/js/unicorn/init.test.js b/tests/js/unicorn/init.test.js
@@ -2,23 +2,7 @@ import test from "ava";
 import { init } from "../../../django_unicorn/static/unicorn/js/unicorn.js";
 
 test("init unicorn", (t) => {
-  const actual = init("unicorn/", "X-Unicorn", "unicorn");
-
-  t.true(actual.messageUrl === "unicorn/");
-  t.true(actual.csrfTokenHeaderName === "X-Unicorn");
-  t.true(actual.csrfTokenCookieName === "unicorn");
-});
-
-test("init unicorn with no reload", (t) => {
-  const actual = init("unicorn/", "X-Unicorn", "unicorn", false);
-
-  t.true(actual.messageUrl === "unicorn/");
-  t.true(actual.csrfTokenHeaderName === "X-Unicorn");
-  t.true(actual.csrfTokenCookieName === "unicorn");
-});
-
-test("init unicorn with reload", (t) => {
-  const actual = init("unicorn/", "X-Unicorn", "unicorn", true);
+  const actual = init("unicorn/", "X-Unicorn", "unicorn", { NAME: "morphdom" });
 
   t.true(actual.messageUrl === "unicorn/");
   t.true(actual.csrfTokenHeaderName === "X-Unicorn");