Skip to content

Commit

Permalink
Remove the need of id
Browse files Browse the repository at this point in the history
  • Loading branch information
fabienheureux committed Dec 11, 2024
1 parent 10d5b20 commit 70b810c
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 22 deletions.
2 changes: 1 addition & 1 deletion jinja2/tests/iframe.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h3>LE FORMULAIRE</h3>
<hr>

<h2>ASSISTANT</h2>
<script src="http://localhost:8000/script.js" id="quefairedemesdechets"></script>
<script src="http://localhost:8000/script.js"></script>

<div>
Proin ut a fames amet mi a feugiat mus quam risus iaculis egestas dignissim maecenas scelerisque tristique a leo a diam a cursus consectetur sem ac litora aliquam a. Felis vestibulum vestibulum vitae a vestibulum aliquam id egestas a proin posuere aliquam bibendum facilisis adipiscing tempor aptent nibh feugiat felis rutrum integer condimentum tincidunt. Ipsum purus nulla habitant condimentum tempor vestibulum elementum scelerisque dui at condimentum gravida a scelerisque scelerisque a adipiscing parturient ornare enim sodales vestibulum. Nec egestas est habitant tempus tristique parturient conubia consectetur parturient vestibulum quam nam platea senectus suspendisse a varius accumsan auctor vehicula velit vel. Ullamcorper a et nulla et inceptos himenaeos in hac consectetur facilisis scelerisque condimentum pharetra facilisi porttitor ut feugiat suspendisse lectus quisque fermentum nibh platea.
Expand Down
6 changes: 3 additions & 3 deletions qfdmd/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@

def generate_iframe_script(request) -> str:
logger.info(f"{request.resolver_match.view_name=}")
script_parts = ['<script id="quefairedemesdechets" ']
script_parts = ["<script"]
if request.resolver_match.view_name == "qfdmd:synonyme-detail":
slug = request.resolver_match.kwargs["slug"]
script_parts.append(f'data-objet="{slug}"')

script_parts.extend([f'src="{settings.BASE_URL}/iframe.js">', "</script>"])
return "".join(script_parts)
script_parts.append(f'src="{settings.BASE_URL}/script.js"></script>')
return " ".join(script_parts)


SEARCH_VIEW_TEMPLATE_NAME = "components/search/view.html"
Expand Down
34 changes: 16 additions & 18 deletions static/to_compile/entrypoints/assistant/script-to-iframe.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
import { iframeResize } from "iframe-resizer";

window.addEventListener("DOMContentLoaded", () => {
const script = document.getElementById("quefairedemesdechets");
const slug = script?.dataset?.objet;
const origin = new URL(script?.getAttribute("src")).origin
const src = `${origin}/dechet/${slug || ''}?iframe`;
const iframe = document.createElement("iframe");
const script = document.currentScript as HTMLScriptElement
const slug = script?.dataset?.objet;
const origin = new URL(script?.getAttribute("src")).origin
const src = `${origin}/dechet/${slug || ''}?iframe`;
const iframe = document.createElement("iframe");

const iframeAttributes = {
src,
style: "border: none; width: 100%; display: block; margin: 0 auto;",
allowfullscreen: true,
allow: "geolocation; clipboard-write",
};
const iframeAttributes = {
src,
style: "border: none; width: 100%; display: block; margin: 0 auto;",
allowfullscreen: true,
allow: "geolocation; clipboard-write",
};

for (var key in iframeAttributes) {
iframe.setAttribute(key, iframeAttributes[key]);
}
for (var key in iframeAttributes) {
iframe.setAttribute(key, iframeAttributes[key]);
}

iframeResize({}, iframe);
iframeResize({}, iframe);

script.parentNode.insertBefore(iframe, script);
})
script.parentNode.insertBefore(iframe, script);

0 comments on commit 70b810c

Please sign in to comment.