Commit c444e304 authored by Dheeraj Joshi's avatar Dheeraj Joshi

Switch to v-safe-html in Status Modal

parent 9cbf90dd
...@@ -7,6 +7,7 @@ import { ...@@ -7,6 +7,7 @@ import {
GlFormCheckbox, GlFormCheckbox,
GlDropdown, GlDropdown,
GlDropdownItem, GlDropdownItem,
GlSafeHtmlDirective,
} from '@gitlab/ui'; } from '@gitlab/ui';
import $ from 'jquery'; import $ from 'jquery';
import Vue from 'vue'; import Vue from 'vue';
...@@ -48,6 +49,7 @@ export default { ...@@ -48,6 +49,7 @@ export default {
}, },
directives: { directives: {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
SafeHtml: GlSafeHtmlDirective,
}, },
mixins: [glFeatureFlagsMixin()], mixins: [glFeatureFlagsMixin()],
props: { props: {
...@@ -233,6 +235,7 @@ export default { ...@@ -233,6 +235,7 @@ export default {
}, },
}, },
statusTimeRanges, statusTimeRanges,
safeHtmlConfig: { ADD_TAGS: ['gl-emoji'] },
}; };
</script> </script>
...@@ -266,7 +269,7 @@ export default { ...@@ -266,7 +269,7 @@ export default {
@click="setEmoji" @click="setEmoji"
> >
<template #button-content> <template #button-content>
<span v-html="emojiTag /* eslint-disable-line vue/no-v-html */"></span> <span v-safe-html:[$options.safeHtmlConfig]="emojiTag"></span>
<span <span
v-show="noEmoji" v-show="noEmoji"
class="js-no-emoji-placeholder no-emoji-placeholder position-relative" class="js-no-emoji-placeholder no-emoji-placeholder position-relative"
...@@ -288,7 +291,7 @@ export default { ...@@ -288,7 +291,7 @@ export default {
class="js-toggle-emoji-menu emoji-menu-toggle-button btn" class="js-toggle-emoji-menu emoji-menu-toggle-button btn"
@click="showEmojiMenu" @click="showEmojiMenu"
> >
<span v-html="emojiTag /* eslint-disable-line vue/no-v-html */"></span> <span v-safe-html:[$options.safeHtmlConfig]="emojiTag"></span>
<span <span
v-show="noEmoji" v-show="noEmoji"
class="js-no-emoji-placeholder no-emoji-placeholder position-relative" class="js-no-emoji-placeholder no-emoji-placeholder position-relative"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment