github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-07 08:06:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: skip leading spaces in selection when adding a link.

Browse Source
This commit is contained in:
Vinoth Kannan
2019-11-30 20:14:22 +05:30
parent 57f108899a
commit 580b289861
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/components/d-editor.js.es6
View File

@ -99,6 +99,7 @@ class Toolbar {
id: "link", id: "link",
group: "insertions", group: "insertions",
shortcut: "K", shortcut: "K",
trimLeading: true,
sendAction: event => this.context.send("showLinkModal", event) sendAction: event => this.context.send("showLinkModal", event)
}); });
} }
@ -956,15 +957,14 @@ export default Component.extend({
} }
let linkText = ""; let linkText = "";
this._lastSel = this._getSelected(); this._lastSel = toolbarEvent.selected;
if (this._lastSel) { if (this._lastSel) {
linkText = this._lastSel.value.trim(); linkText = this._lastSel.value;
} }
showModal("insert-hyperlink").setProperties({ showModal("insert-hyperlink").setProperties({
linkText: linkText, linkText,
_lastSel: this._lastSel,
toolbarEvent toolbarEvent
}); });
}, },

2
app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
View File

@ -147,7 +147,7 @@ export default Controller.extend(ModalFunctionality, {
const origLink = this.linkUrl; const origLink = this.linkUrl;
const linkUrl = const linkUrl =
origLink.indexOf("://") === -1 ? `http://${origLink}` : origLink; origLink.indexOf("://") === -1 ? `http://${origLink}` : origLink;
const sel = this._lastSel; const sel = this.toolbarEvent.selected;
if (isEmpty(linkUrl)) { if (isEmpty(linkUrl)) {
return; return;