Merge branch 'master' of github.com:vector-im/vector-web into leave_room_button

2015-07-22 13:30:34 +01:00
parent 6bfc566d9a d4147c1315
commit b9fd174f72
2 changed files with 21 additions and 2 deletions
@@ -153,7 +153,12 @@ module.exports = {

    onKeyDown: function (ev) {
        if (ev.keyCode === KeyCode.ENTER) {
-            this.sentHistory.push(this.refs.textarea.getDOMNode().value);
+            var input = this.refs.textarea.getDOMNode().value;
+            if (input.length === 0) {
+                ev.preventDefault();
+                return;
+            }
+            this.sentHistory.push(input);
            this.onEnter(ev);
        }
        else if (ev.keyCode === KeyCode.TAB) {