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

make logging quiet

pull/21833/head
Bruno Windels 2019-05-13 17:45:54 +01:00
parent 4ff37ca046
commit a3b02cf0cc
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/elements/MessageEditor.js
View File

@ -57,7 +57,6 @@ export default class MessageEditor extends React.Component {
};
this._editorRef = null;
this._autocompleteRef = null;
// document.execCommand("insertBrOnReturn", undefined, true);
}
_updateEditorState = (caret) => {
@ -75,8 +74,9 @@ export default class MessageEditor extends React.Component {
}
_onInput = (event) => {
console.log("finding newValue", this._editorRef.innerHTML);
const {caret, text} = getCaretOffsetAndText(this._editorRef, document.getSelection());
const sel = document.getSelection();
// console.log("finding newValue", this._editorRef.innerHTML, sel);
const {caret, text} = getCaretOffsetAndText(this._editorRef, sel);
this.model.update(text, event.inputType, caret);
}

5
src/editor/model.js
View File

@ -80,8 +80,8 @@ export default class EditorModel {
update(newValue, inputType, caret) {
const diff = this._diff(newValue, inputType, caret);
const position = this._positionForOffset(diff.at, caret.atNodeEnd);
const valueWithCaret = newValue.slice(0, caret.offset) + "|" + newValue.slice(caret.offset);
console.log("update at", {diff, valueWithCaret});
// const valueWithCaret = newValue.slice(0, caret.offset) + "|" + newValue.slice(caret.offset);
// console.log("update at", {diff, valueWithCaret});
let removedOffsetDecrease = 0;
if (diff.removed) {
removedOffsetDecrease = this._removeText(position, diff.removed.length);
@ -93,6 +93,7 @@ export default class EditorModel {
this._mergeAdjacentParts();
const caretOffset = diff.at - removedOffsetDecrease + addedLen;
const newPosition = this._positionForOffset(caretOffset, true);
// console.log("caretOffset", {at: diff.at, removedOffsetDecrease, addedLen}, newPosition);
this._setActivePart(newPosition);
this._updateCallback(newPosition);
}

5
src/editor/render.js
View File

@ -74,12 +74,10 @@ export function renderModel(editor, model) {
--surplusElementCount;
}
} else {
// empty div needs to have a BR in it
// empty div needs to have a BR in it to give it height
let foundBR = false;
let partNode = lineContainer.firstChild;
console.log("partNode", partNode, editor.innerHTML);
while (partNode) {
console.log("partNode(in loop)", partNode);
if (!foundBR && partNode.tagName === "BR") {
foundBR = true;
} else {
@ -88,7 +86,6 @@ export function renderModel(editor, model) {
partNode = partNode.nextSibling;
}
if (!foundBR) {
console.log("adding a BR in an empty div because there was none already");
lineContainer.appendChild(document.createElement("br"));
}
}