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

fix NPE and make enter work again

pull/21833/head
Matthew Hodgson 2016-01-15 12:34:53 +00:00
parent e4671205d8
commit 8e9e33fa2a
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/elements/EditableText.js
View File

@ -154,6 +154,7 @@ module.exports = React.createClass({
//ev.target.setSelectionRange(0, ev.target.textContent.length); //ev.target.setSelectionRange(0, ev.target.textContent.length);
var node = ev.target.childNodes[0]; var node = ev.target.childNodes[0];
if (node) {
var range = document.createRange(); var range = document.createRange();
range.setStart(node, 0); range.setStart(node, 0);
range.setEnd(node, node.length); range.setEnd(node, node.length);
@ -161,14 +162,16 @@ module.exports = React.createClass({
var sel = window.getSelection(); var sel = window.getSelection();
sel.removeAllRanges(); sel.removeAllRanges();
sel.addRange(range); sel.addRange(range);
}
}, },
onFinish: function(ev) { onFinish: function(ev) {
var self = this; var self = this;
var submit = (ev.key === "Enter");
this.setState({ this.setState({
phase: this.Phases.Display, phase: this.Phases.Display,
}, function() { }, function() {
self.onValueChanged(ev.key === "Enter"); self.onValueChanged(submit);
}); });
}, },