scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-07 20:40:26 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix links in locked step texts elements [SCI-7224]

Browse source
This commit is contained in:
Anton 2022-09-20 15:44:52 +02:00
parent b36a91ef85
commit 07f0142789
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/steps/components/text.scss
View file

@ -10,6 +10,12 @@
flex: 0; flex: 0;
} }
.view-text-element {
a {
pointer-events: initial;
}
}
.empty-text-element { .empty-text-element {
color: $color-silver-chalice; color: $color-silver-chalice;
} }

2
app/javascript/vue/protocol/step_elements/text.vue
View file

@ -28,7 +28,7 @@
@editingDisabled="disableEditMode" @editingDisabled="disableEditMode"
@editingEnabled="enableEditMode" @editingEnabled="enableEditMode"
/> />
<div v-else-if="element.attributes.orderable.text_view" v-html="element.attributes.orderable.text_view"></div> <div class="view-text-element" v-else-if="element.attributes.orderable.text_view" v-html="element.attributes.orderable.text_view"></div>
<div v-else class="empty-text-element"> <div v-else class="empty-text-element">
{{ i18n.t("protocols.steps.text.empty_text") }} {{ i18n.t("protocols.steps.text.empty_text") }}
</div> </div>

1
app/javascript/vue/shared/tinymce.vue
View file

@ -120,6 +120,7 @@
let textArea = `#${this.objectType}_textarea_${this.objectId}`; let textArea = `#${this.objectType}_textarea_${this.objectId}`;
if (this.active) return if (this.active) return
if (e && $(e.target).prop("tagName") === 'A') return
if (e && $(e.target).hasClass('atwho-user-popover')) return if (e && $(e.target).hasClass('atwho-user-popover')) return
if (e && $(e.target).hasClass('record-info-link')) return if (e && $(e.target).hasClass('record-info-link')) return
if (e && $(e.target).parent().hasClass('atwho-inserted')) return if (e && $(e.target).parent().hasClass('atwho-inserted')) return