1 Commits

Author SHA1 Message Date
dependabot[bot]
dadfab633c Bump elliptic from 6.5.3 to 6.5.4
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-01 19:09:59 +00:00
15 changed files with 100 additions and 17209 deletions

View File

@@ -58,7 +58,6 @@ As you can see, the component accepts some props:
| ---- | ---- | -------- | | ---- | ---- | -------- |
| value | String | The text to highlight (**v-model**). | | value | String | The text to highlight (**v-model**). |
| extractUrlsWithoutProtocol | Boolean | As the name says, when active, the compoponet will try to match URLs even when a protocol (http://, https://) is not found. **Defaults to true** | | extractUrlsWithoutProtocol | Boolean | As the name says, when active, the compoponet will try to match URLs even when a protocol (http://, https://) is not found. **Defaults to true** |
| mentionsWithDots | Boolean | Whether a mention can contain a dot. **Defaults to false** |
| caretColor | String | A valid HEX color (eg. #ccc, #ff4545). | | caretColor | String | A valid HEX color (eg. #ccc, #ff4545). |
| placeholder | String | A placeholder to show when no text is entered. | | placeholder | String | A placeholder to show when no text is entered. |
| usernameClass | String | The CSS class(es) that will be added to a @username match. | | usernameClass | String | The CSS class(es) that will be added to a @username match. |

View File

@@ -1083,7 +1083,7 @@ const endMentionMatch = _regexSupplant(/^(?:#{atSigns}|[#{latinAccentChars}]|:\/
const validMention = _regexSupplant( const validMention = _regexSupplant(
'(#{validMentionPrecedingChars})' + // $1: Preceding character '(#{validMentionPrecedingChars})' + // $1: Preceding character
'(#{atSigns})' + // $2: At mark '(#{atSigns})' + // $2: At mark
'([a-zA-Z0-9_\.]{1,20})', // $3: Screen name '([a-zA-Z0-9_]{1,20})', // $3: Screen name
// '(/[a-zA-Z][a-zA-Z0-9_-]{0,24})?', // $4: List (optional) // '(/[a-zA-Z][a-zA-Z0-9_-]{0,24})?', // $4: List (optional)
{ validMentionPrecedingChars, atSigns }, { validMentionPrecedingChars, atSigns },
'g' 'g'
@@ -1675,10 +1675,6 @@ function src_autoLink (text, options) {
type: Boolean, type: Boolean,
default: true default: true
}, },
mentionsWithDots: {
type: Boolean,
default: false
},
caretColor: { caretColor: {
type: String, type: String,
default: '#ccc' default: '#ccc'
@@ -1701,8 +1697,7 @@ function src_autoLink (text, options) {
}, },
computedBody () { computedBody () {
return highlight(this.body, { return highlight(this.body, {
extractUrlsWithoutProtocol: this.extractUrlsWithoutProtocol, extractUrlsWithoutProtocol: this.extractUrlsWithoutProtocol
mentionsWithDots: this.mentionsWithDots
}) })
} }
}, },

File diff suppressed because one or more lines are too long

View File

@@ -1092,7 +1092,7 @@ const endMentionMatch = _regexSupplant(/^(?:#{atSigns}|[#{latinAccentChars}]|:\/
const validMention = _regexSupplant( const validMention = _regexSupplant(
'(#{validMentionPrecedingChars})' + // $1: Preceding character '(#{validMentionPrecedingChars})' + // $1: Preceding character
'(#{atSigns})' + // $2: At mark '(#{atSigns})' + // $2: At mark
'([a-zA-Z0-9_\.]{1,20})', // $3: Screen name '([a-zA-Z0-9_]{1,20})', // $3: Screen name
// '(/[a-zA-Z][a-zA-Z0-9_-]{0,24})?', // $4: List (optional) // '(/[a-zA-Z][a-zA-Z0-9_-]{0,24})?', // $4: List (optional)
{ validMentionPrecedingChars, atSigns }, { validMentionPrecedingChars, atSigns },
'g' 'g'
@@ -1684,10 +1684,6 @@ function src_autoLink (text, options) {
type: Boolean, type: Boolean,
default: true default: true
}, },
mentionsWithDots: {
type: Boolean,
default: false
},
caretColor: { caretColor: {
type: String, type: String,
default: '#ccc' default: '#ccc'
@@ -1710,8 +1706,7 @@ function src_autoLink (text, options) {
}, },
computedBody () { computedBody () {
return highlight(this.body, { return highlight(this.body, {
extractUrlsWithoutProtocol: this.extractUrlsWithoutProtocol, extractUrlsWithoutProtocol: this.extractUrlsWithoutProtocol
mentionsWithDots: this.mentionsWithDots
}) })
} }
}, },

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -21,7 +21,6 @@
:placeholder="placeholder" :placeholder="placeholder"
:caretColor="caretColor" :caretColor="caretColor"
:extractUrlsWithoutProtocol="options.extractUrlsWithoutProtocol" :extractUrlsWithoutProtocol="options.extractUrlsWithoutProtocol"
:mentionsWithDots="options.mentionsWithDots"
/> />
</div> </div>
@@ -29,18 +28,14 @@
<div id="options" class="content-container"> <div id="options" class="content-container">
<h4>Options (props)</h4> <h4>Options (props)</h4>
<div class="flex center"> <div class="flex center">
<label for="ep" class="cursor-pointer"> <label for="ep" class="mr-lg cursor-pointer">
<input id="ep" type="checkbox" v-model="options.extractUrlsWithoutProtocol"> <input id="ep" type="checkbox" v-model="options.extractUrlsWithoutProtocol">
extractUrlsWithoutProtocol extractUrlsWithoutProtocol
</label> </label>
<label for="tb" class="mx-lg cursor-pointer"> <label for="tb" class="cursor-pointer">
<input id="tb" type="checkbox" v-model="options.targetBlank"> <input id="tb" type="checkbox" v-model="options.targetBlank">
targetBlank targetBlank
</label> </label>
<label for="md" class="cursor-pointer">
<input id="md" type="checkbox" v-model="options.mentionsWithDots">
mentionsWithDots
</label>
</div> </div>
<div class="flex center mt-sm text-left relative"> <div class="flex center mt-sm text-left relative">
@@ -135,7 +130,6 @@ export default {
options: { options: {
targetBlank: true, targetBlank: true,
extractUrlsWithoutProtocol: true, extractUrlsWithoutProtocol: true,
mentionsWithDots: false,
usernameClass: 'highlights username', usernameClass: 'highlights username',
usernameUrlBase: '#/', usernameUrlBase: '#/',
hashtagClass: 'highlights hashtag', hashtagClass: 'highlights hashtag',

17242
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -15,10 +15,6 @@ export default {
type: Boolean, type: Boolean,
default: true default: true
}, },
mentionsWithDots: {
type: Boolean,
default: false
},
caretColor: { caretColor: {
type: String, type: String,
default: '#ccc' default: '#ccc'
@@ -41,8 +37,7 @@ export default {
}, },
computedBody () { computedBody () {
return highlight(this.body, { return highlight(this.body, {
extractUrlsWithoutProtocol: this.extractUrlsWithoutProtocol, extractUrlsWithoutProtocol: this.extractUrlsWithoutProtocol
mentionsWithDots: this.mentionsWithDots
}) })
} }
}, },

View File

@@ -8,7 +8,7 @@ import removeOverlappingEntities from './removeOverlappingEntities'
export default function (text, options) { export default function (text, options) {
const entities = extractUrls(text, options) const entities = extractUrls(text, options)
.concat(extractMentions(text, options)) .concat(extractMentions(text))
.concat(extractHashtags(text)) .concat(extractHashtags(text))
if (entities.length === 0) { if (entities.length === 0) {

View File

@@ -17,8 +17,7 @@ const OPTIONS_NOT_ATTRIBUTES = {
invisibleTagAttrs: true, invisibleTagAttrs: true,
linkAttributeBlock: true, linkAttributeBlock: true,
htmlEscapeNonEntities: true, htmlEscapeNonEntities: true,
extractUrlsWithoutProtocol: true, extractUrlsWithoutProtocol: true
mentionsWithDots: true
} }
export default function (options) { export default function (options) {

View File

@@ -1,16 +1,15 @@
// Extracts mentions from text. // Extracts mentions from text.
import { atSigns, endMentionMatch, validMention, validDotMention } from './regex' import { atSigns, endMentionMatch, validMention } from './regex'
export default function (text, options) { export default function (text) {
if (!text || !text.match(atSigns)) { if (!text || !text.match(atSigns)) {
return [] return []
} }
const mentions = [] const mentions = []
const mentionRegex = options.mentionsWithDots ? validDotMention : validMention
text.replace(mentionRegex, function (match, before, atSign, mentionText, offset, chunk) { text.replace(validMention, function (match, before, atSign, mentionText, offset, chunk) {
const after = chunk.slice(offset + match.length) const after = chunk.slice(offset + match.length)
if (!after.match(endMentionMatch)) { if (!after.match(endMentionMatch)) {
const startPosition = offset + before.length const startPosition = offset + before.length

View File

@@ -4,8 +4,7 @@ import autoHighlight from './autoHighlight'
const defaultOptions = { const defaultOptions = {
targetBlank: true, targetBlank: true,
extractUrlsWithoutProtocol: true, extractUrlsWithoutProtocol: true
mentionsWithDots: false
} }
export function link (text, options = defaultOptions) { export function link (text, options = defaultOptions) {

View File

@@ -194,11 +194,3 @@ export const validMention = regexSupplant(
{ validMentionPrecedingChars, atSigns }, { validMentionPrecedingChars, atSigns },
'g' 'g'
) )
export const validDotMention = regexSupplant(
'(#{validMentionPrecedingChars})' + // $1: Preceding character
'(#{atSigns})' + // $2: At mark
'([a-zA-Z0-9_\.]{1,20})', // $3: Screen name
// '(/[a-zA-Z][a-zA-Z0-9_-]{0,24})?', // $4: List (optional)
{ validMentionPrecedingChars, atSigns },
'g'
)