Skip to content

Commit f4aeb65

Browse files
authored
Merge pull request #1006 from MTES-MCT/copy_btn_short_urls
Toujours raccourcir les urls des simulations (boutons « copier ce lien »)
2 parents 3772726 + aa306d2 commit f4aeb65

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

envergo/static/js/libs/shorten_url_for_copy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
e.stopImmediatePropagation();
55
e.preventDefault();
66
const button = e.currentTarget;
7-
const currentUrl = window.location.href;
7+
const currentUrl = button.getAttribute("data-clipboard-text") || window.location.href;
88
const mapping = new UrlMapping();
99
mapping.create(currentUrl).then((json) => {
1010
button.setAttribute("data-clipboard-text", json.short_url);

envergo/templates/haie/moulinette/result_plantation.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ <h3 class="fr-alert__title">Simulation alternative pour ce dossier</h3>
1717
<p>
1818
<button title="Copier le lien"
1919
data-clipboard-text="{{ current_url | safe }}"
20-
class="action fr-btn fr-btn--secondary fr-btn--icon-left btn--copy-to-clipboard fr-icon-link">
20+
class="action fr-btn fr-btn--secondary fr-btn--icon-left btn--copy-to-clipboard btn--shorten-url fr-icon-link">
2121
Copier le lien
2222
</button>
2323
</p>
@@ -29,7 +29,7 @@ <h3 class="fr-alert__title">Simulation alternative pour ce dossier</h3>
2929
<p>
3030
<button title="Copier le lien"
3131
data-clipboard-text="{{ current_url | safe }}"
32-
class="action fr-btn fr-btn--secondary fr-btn--icon-left btn--copy-to-clipboard fr-icon-link">
32+
class="action fr-btn fr-btn--secondary fr-btn--icon-left btn--copy-to-clipboard btn--shorten-url fr-icon-link">
3333
Copier le lien
3434
</button>
3535
</p>

envergo/templates/haie/petitions/_alternatives_table.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
<button title="Copier le lien vers cette simulation"
5252
data-clipboard-text="{{ base_url }}{{ simulation.form_url }}"
53-
class="action clipboard btn--copy-to-clipboard fr-icon-link"></button>
53+
class="action clipboard btn--copy-to-clipboard btn--shorten-url fr-icon-link"></button>
5454

5555
<a href="{{ simulation.result_url }}"
5656
class="action"

envergo/templates/haie/petitions/instructor_view_alternatives.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,4 +239,6 @@ <h3 class="fr-accordion__title">
239239
<script>window.COPY_DISABLED_MESSAGE = "";</script>
240240
<script>window.SUCCESSFUL_COPY_MESSAGE = "✓";</script>
241241
<script defer src="{% static 'js/libs/copy_buttons.js' %}"></script>
242+
<script defer src="{% static 'js/libs/urlmappings.js' %}"></script>
243+
<script defer src="{% static 'js/libs/shorten_url_for_copy.js' %}"></script>
242244
{% endblock %}

0 commit comments

Comments
 (0)