strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow links in comments

Browse source 
Change-Id: I033ab7fe09ece8da10bc61fc2102cce80c1e24b0
This commit is contained in:
Pranav Kant 2017-06-06 18:21:24 +05:30
parent 2d0ec13249
commit 5e9ed0c8cb
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
loleaflet/src/layer/marker/Annotation.js
View file

@ -286,8 +286,14 @@ L.Annotation = L.Layer.extend({
},
_updateContent: function () {
var linkedText = Autolinker.link(this._data.text);
$(this._contentText).text(linkedText);
// .text() method will escape the string, does not interpret the string as HTML
$(this._contentText).text(this._data.text);
// Get the escaped HTML out and find for possible, useful links
var linkedText = Autolinker.link($(this._contentText).html());
// Set the property of text field directly. This is insecure otherwise because it doesn't escape the input
// But we have already escaped the input before and only thing we are adding on top of that is Autolinker
// generated text.
this._contentText.innerHTML = linkedText;
// Original unlinked text
this._contentText.origText = this._data.text;
$(this._nodeModifyText).text(this._data.text);