Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/development' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
bkis committed Nov 14, 2024
2 parents 709dc32 + c10e00d commit e323d37
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions Tekst-Web/src/components/content/TextAnnotationContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,8 @@ function handleTokenContextMenuSelect(key: string | number) {
const token = tokenDetails.value?.token ? tokenDetails.value.token : '';
const annos = tokenDetails.value?.annotations
? tokenDetails.value.annotations
.map((a) => `${a.key}: ${a.value.join(props.resource.config.multiValueDelimiter)}`)
.join('; ')
.map((a) => `${a.key}: ${a.value.join(props.resource.config.multiValueDelimiter)}`)
.join('; ')
: [];
tokenCopyContent.value = token + (annos ? ` (${annos})` : '');
}
Expand Down Expand Up @@ -383,9 +383,8 @@ function toggleAnnoGroup(key: string) {
}"
:title="$t('resources.types.textAnnotation.copyHintTip')"
@click="handleTokenClick(token)"
@contextmenu.prevent.stop="
(e) => handleTokenRightClick(e, token, `${contentIndex}-${tokenIndex}`)
"
@contextmenu.prevent.stop="(e) => handleTokenRightClick(e, token, `${contentIndex}-${tokenIndex}`)
"
>
<div class="token b i" :style="fontFamilyStyle">
{{ token.token }}
Expand All @@ -405,8 +404,7 @@ function toggleAnnoGroup(key: string) {
"
:style="{
...anno.style,
backgroundColor:
colorAnnoLines && !!anno.group ? groupColors[anno.group] : undefined,
backgroundColor: colorAnnoLines && !!anno.group ? groupColors[anno.group] : undefined
}"
>{{ anno.content }}</span
>
Expand Down

0 comments on commit e323d37

Please sign in to comment.