Skip to content

Commit caa80ce

Browse files
pdanpdanrstoenescu
authored andcommitted
QEditor: fix link editor ENTER and ESC behavior (quasarframework#2606)
- start with empty URL if selected text is not a link - if it wasn't a link then ESC removes link - ENTER does not remove the selection close quasarframework#2602, close quasarframework#2603
1 parent 2eecd29 commit caa80ce

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/components/editor/editor-caret.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ export class Caret {
206206
if (!url.length) {
207207
return
208208
}
209-
this.vm.editLinkUrl = urlRegex.test(url) ? url : `https://${url}`
210-
document.execCommand('createLink', false, this.vm.editLinkUrl)
209+
this.vm.editLinkUrl = urlRegex.test(url) ? url : ''
210+
document.execCommand('createLink', false, this.vm.editLinkUrl === '' ? ' ' : this.vm.editLinkUrl)
211211
}
212212
else {
213213
this.vm.editLinkUrl = link

src/components/editor/editor-utils.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,11 @@ export function getLinkEditor (h, vm) {
237237
keydown: event => {
238238
switch (getEventKey(event)) {
239239
case 13: // ENTER key
240+
event.preventDefault()
240241
return updateLink()
241242
case 27: // ESCAPE key
242243
vm.caret.restore()
244+
!vm.editLinkUrl && document.execCommand('unlink')
243245
vm.editLinkUrl = null
244246
break
245247
}

0 commit comments

Comments
 (0)