betterplace-content 0.7.111 → 0.7.114

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 852a3dc718ff902ec2d407c08ea42eab020e4c8a567ffc4b795c7c3e5d569a92
-  data.tar.gz: 1023f93eab4d476a8a2f5f04ace23d4fcf70e084a325e72a85493acbf957559d
+  metadata.gz: cc9bce1e12fa89694ea584859fb3707b65ab87e19356722f728a181890792bd3
+  data.tar.gz: 5ce506be0ab8ef2d65d6b4b2c7587d555fd97da291e2769a25ab3a4b34172581
 SHA512:
-  metadata.gz: e486032d796fd41259b0e1a6a728aed0a39a4a061b7218522949008fa8dbc616ada779a7f1d77f40e868365128d8e792aa416bee22362bd64c5bd6bc49a65769
-  data.tar.gz: 3a50ec78cc3a8fc05637fcd4fb3cb68616592320978e99ff975cd222f11aeb01bfa32f0e0be026157e453e6485143ad4aaa6a8ebd8f57cdf8f16ee2e0bdf4e79
+  metadata.gz: 4c2ba79981bd461dc783f81b552cf7a83a03e6efe507ce31069521bb9f9a9656585b61f6c01e3dc127a64eddff60f1f77fea5d52c0bfd2d9b9a591e23d504e86
+  data.tar.gz: 3244a0c30e05c1452694bda19955fbdd3cc89ba26e4c0acab8d170a8558b31e334c0ca62063197282965999965d8fcd6da2bbb735b9da1f1e881e6c6661acbb7

data/_layouts/default.html

@@ -110,11 +110,7 @@ Update 2019-07-19: Another problem that came us is, that URLs endet in .html whi
 
 </div>
 
-<script src="{{ style_host }}/de/layouts/current_pack/application"></script>
-<script src="{{ style_host }}/de/layouts/current_pack/locale_{{ site.lang }}"></script>
-<script src="{{ style_host }}/de/layouts/current_pack/homepage"></script>
 <script>
-  // Make sure we can test the Rails-staging CSS on jekyll-staging.
   {% comment -%}
     //  For Staging: Simulate the environment by replacing the URLs.
     //  For Development: This does nothing, unless you force `JEKYLL_ENV=production`.
@@ -126,18 +122,40 @@ Update 2019-07-19: Another problem that came us is, that URLs endet in .html whi
     //   app.cloudcannon.com, proxy.cloudcannon.com: do nothing
     //   www.bp42.com: replace
   {% endcomment -%}
-  const prd  = window.location.hostname.indexOf('.org') !== -1
-  const dev  = window.location.hostname.indexOf('.dev') !== -1
-  const edit = window.location.hostname.indexOf('.cloud') !== -1
-  if (!prd && !dev && !edit) {
+
+  const replaceHost = () => {
+    if (!/\.(?:org|dev|cloud)/.test(window.location.hostname)) return
+
     document.querySelectorAll("[href]").forEach(element => {
       if (element.href.includes('www.betterplace.org')) {
         element.href = element.href.replace('www.betterplace.org', window.location.hostname)
         element.setAttribute('data-host-replaced', 'true')
       }
     })
+
+    {% comment -%}
+      // Some URLs in the header files are stored in data attributes for use in React.
+      // These cases can be found by searching for /data[^'"]*['"]http/ in this repo.
+      // The preceding semicolon is required in browser JS land ;)
+    {% endcomment -%}
+    ;['data-login-url', 'data-login-check-url', 'data-search-url'].forEach(dataAttr => {
+      document.querySelectorAll("[" + dataAttr + "]").forEach(element => {
+        const modifiedUrl = element.getAttribute(dataAttr).replace('www.betterplace.org', window.location.hostname)
+        element.setAttribute(dataAttr, modifiedUrl)
+        element.setAttribute('data-host-replaced', 'true')
+      })
+    })
   }
+
+  document.addEventListener('DOMContentLoaded', replaceHost)
 </script>
 
+{% comment -%}
+  // These scripts must be loaded AFTER the DOMContentLoaded listener above is defined.
+{% endcomment -%}
+<script src="{{ style_host }}/de/layouts/current_pack/application"></script>
+<script src="{{ style_host }}/de/layouts/current_pack/locale_{{ site.lang }}"></script>
+<script src="{{ style_host }}/de/layouts/current_pack/homepage"></script>
+
 </body>
 </html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betterplace-content
 version: !ruby/object:Gem::Version
-  version: 0.7.111
+  version: 0.7.114
 platform: ruby
 authors:
 - betterplace.org Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.30
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: betterplace.org's Jekyll Content Theme