do not auto-update via firebase when in edit mode. fixes ondras#57

Author: ondras

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;

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;