Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing

2015-07-20 18:18:04 +01:00
parent 3a7ebf73eb 0a3cddbd89
commit 813cf0481e
11 changed files with 199 additions and 49 deletions
@@ -106,7 +106,7 @@ module.exports = {
                    // show the message
                    this.element.value = this.data[this.position];
                }
-                else if (this.originalText) {
+                else if (this.originalText !== undefined) {
                    // restore the original text the user was typing.
                    this.element.value = this.originalText;
                }