Merge pull request #8042 from wallabag/fix-toast

Fix toast since Materialize upgrade
This commit is contained in:
Yassine Guedidi 2025-03-01 17:41:13 +01:00 committed by GitHub
commit b4b563f15d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 12 deletions

View file

@ -2,7 +2,7 @@ import $ from 'jquery';
/* Materialize imports */
import '@materializecss/materialize/dist/css/materialize.css';
import '@materializecss/materialize/dist/js/materialize';
import M from '@materializecss/materialize/dist/js/materialize';
/* Annotations */
import annotator from 'annotator';
@ -382,4 +382,10 @@ $(document).ready(() => {
qrcode.setAttribute('src', src);
});
document.querySelectorAll('.material-toast').forEach((toast) => {
M.toast({
text: toast.innerText,
});
});
});

View file

@ -1,13 +1,9 @@
{% if nbRedisMessages is defined and nbRedisMessages > 0 %}
<script>
Materialize.toast('Messages in queue: {{ nbRedisMessages }}', 4000);
</script>
<p class="material-toast hidden">Messages in queue: {{ nbRedisMessages }}</p>
{% endif %}
{% if nbRabbitMessages is defined and nbRabbitMessages > 0 %}
<script>
Materialize.toast('Messages in queue: {{ nbRabbitMessages }}', 4000);
</script>
<p class="material-toast hidden">Messages in queue: {{ nbRabbitMessages }}</p>
{% endif %}
{% if redisNotInstalled is defined and redisNotInstalled %}

View file

@ -5,11 +5,11 @@
<div class="card-content">
{% if error %}
<script>Materialize.toast('{{ error.messageKey|trans(error.messageData, 'security') }}', 4000)</script>
<p class="material-toast hidden">{{ error.messageKey|trans(error.messageData, 'security') }}</p>
{% endif %}
{% for flash_message in app.session.flashbag.get('notice') %}
<script>Materialize.toast('{{ flash_message }}')</script>
<p class="material-toast hidden">{{ flash_message }}</p>
{% endfor %}
<div class="row">

View file

@ -17,9 +17,7 @@
{% block messages %}
{% for flash_message in app.session.flashbag.get('notice') %}
<script>
Materialize.toast('{{ flash_message|trans }}', 4000);
</script>
<p class="material-toast hidden">{{ flash_message|trans }}</p>
{% endfor %}
{% endblock %}