Skip to content
Extraits de code Groupes Projets
Valider 4fdefd7e rédigé par Brieuc Dubois's avatar Brieuc Dubois
Parcourir les fichiers

Fix #102

parent 36caa82b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import SpellCheck from '$lib/components/icons/spellCheck.svelte'; import SpellCheck from '$lib/components/icons/spellCheck.svelte';
import ChatBubble from '../icons/chatBubble.svelte'; import ChatBubble from '../icons/chatBubble.svelte';
import { get } from 'svelte/store';
import type Feedback from '$lib/types/feedback'; import type Feedback from '$lib/types/feedback';
import linkifyHtml from 'linkify-html'; import linkifyHtml from 'linkify-html';
import { sanitize } from '$lib/utils/sanitize'; import { sanitize } from '$lib/utils/sanitize';
...@@ -177,7 +176,7 @@ ...@@ -177,7 +176,7 @@
> >
<div contenteditable={isEdit} bind:this={contentDiv} class:bg-blue-900={isEdit}> <div contenteditable={isEdit} bind:this={contentDiv} class:bg-blue-900={isEdit}>
{#each parts as part} {#each parts as part}
{#if part.feedback} {#if part.feedback && !isEdit}
{#if part.feedback.content} {#if part.feedback.content}
<span class="tooltip tooltip-accent" data-tip={part.feedback.content} <span class="tooltip tooltip-accent" data-tip={part.feedback.content}
><!-- ><!--
......
...@@ -2,7 +2,7 @@ import Session from './session'; ...@@ -2,7 +2,7 @@ import Session from './session';
import User from './user'; import User from './user';
import { updateMessageAPI, createMessageFeedbackAPI } from '$lib/api/sessions'; import { updateMessageAPI, createMessageFeedbackAPI } from '$lib/api/sessions';
import { toastAlert } from '$lib/utils/toasts'; import { toastAlert } from '$lib/utils/toasts';
import { writable, type Writable } from 'svelte/store'; import { get, writable, type Writable } from 'svelte/store';
import Feedback from './feedback'; import Feedback from './feedback';
import { parseToLocalDate } from '$lib/utils/date'; import { parseToLocalDate } from '$lib/utils/date';
...@@ -77,12 +77,14 @@ export default class Message { ...@@ -77,12 +77,14 @@ export default class Message {
this._versions.update((v) => [...v, { content: content, date: new Date() }]); this._versions.update((v) => [...v, { content: content, date: new Date() }]);
this._content = content; this._content = content;
this._edited = true; this._edited = true;
this.feedbacks.set([]);
return true; return true;
} }
async localUpdate(content: string, force: boolean = false): Promise<boolean> { async localUpdate(content: string, force: boolean = false): Promise<boolean> {
this._content = content; this._content = content;
this.feedbacks.set([]);
if (!force) this._edited = true; if (!force) this._edited = true;
return true; return true;
...@@ -181,6 +183,7 @@ export default class Message { ...@@ -181,6 +183,7 @@ export default class Message {
prev._content = m.content; prev._content = m.content;
prev._id = m.id; prev._id = m.id;
prev._edited = true; prev._edited = true;
prev.feedbacks.set(get(m.feedbacks));
} }
} }
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter