OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

some comments

pull/21833/head
Bruno Windels 2019-05-08 11:13:36 +02:00
parent ebdb9fcb9c
commit 0f38753dba
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/editor/model.js
View File

@ -45,6 +45,7 @@ export default class EditorModel {
} }
_diff(newValue, inputType, caret) { _diff(newValue, inputType, caret) {
// can't use caret position with drag and drop
if (inputType === "deleteByDrag") { if (inputType === "deleteByDrag") {
return diffDeletion(this._previousValue, newValue); return diffDeletion(this._previousValue, newValue);
} else { } else {

3
src/editor/parse-event.js
View File

@ -19,6 +19,9 @@ import { PlainPart, UserPillPart, RoomPillPart } from "./parts";
function parseHtmlMessage(html) { function parseHtmlMessage(html) {
const REGEX_MATRIXTO = new RegExp(MATRIXTO_URL_PATTERN); const REGEX_MATRIXTO = new RegExp(MATRIXTO_URL_PATTERN);
// no nodes from parsing here should be inserted in the document,
// as scripts in event handlers, etc would be executed then.
// we're only taking text, so that is fine
const nodes = Array.from(new DOMParser().parseFromString(html, "text/html").body.childNodes); const nodes = Array.from(new DOMParser().parseFromString(html, "text/html").body.childNodes);
const parts = nodes.map(n => { const parts = nodes.map(n => {
switch (n.nodeType) { switch (n.nodeType) {