Merge pull request #51 from ondras/master

do not auto-update via firebase when in edit mode. fixes #57
ondras · Nov 4, 2014 · e17e672 · e17e672
2 parents 33e4a7d + 1bc753c
commit e17e672
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/my-mind.js b/my-mind.js
@@ -396,7 +396,8 @@ MM.Item.prototype.fromJSON = function(data) {
 
 MM.Item.prototype.mergeWith = function(data) {
 	var dirty = 0;
-	if (this.getText() != data.text) { this.setText(data.text); }
+
+	if (this.getText() != data.text && !this._dom.text.contentEditable) { this.setText(data.text); }
 
 	if (this._side != data.side) { 
 		this._side = data.side;

diff --git a/src/item.js b/src/item.js
@@ -107,7 +107,8 @@ MM.Item.prototype.fromJSON = function(data) {
 
 MM.Item.prototype.mergeWith = function(data) {
 	var dirty = 0;
-	if (this.getText() != data.text) { this.setText(data.text); }
+
+	if (this.getText() != data.text && !this._dom.text.contentEditable) { this.setText(data.text); }
 
 	if (this._side != data.side) { 
 		this._side = data.side;