From 4dae03fed5ec90a39dea2473a3e3f0188df90ffe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Tue, 6 May 2014 11:58:05 +0200 Subject: [PATCH] refactoring setting text on a node --- .../documentCanvas/canvas/documentElement.js | 14 +++++--------- .../modules/documentCanvas/canvas/wlxmlListener.js | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/editor/modules/documentCanvas/canvas/documentElement.js b/src/editor/modules/documentCanvas/canvas/documentElement.js index a08788b..3073e72 100644 --- a/src/editor/modules/documentCanvas/canvas/documentElement.js +++ b/src/editor/modules/documentCanvas/canvas/documentElement.js @@ -189,18 +189,14 @@ $.extend(DocumentTextElement.prototype, { this.canvas = null; return this; }, - handle: function(event) { - var toSet = event.meta.node.getText(); - if(toSet === '') { - toSet = utils.unicode.ZWS; + setText: function(text) { + if(text === '') { + text = utils.unicode.ZWS; } - if(toSet !== this.getText()) { - this.setText(toSet); + if(text !== this.getText()) { + this.dom.contents()[0].data = text; } }, - setText: function(text) { - this.dom.contents()[0].data = text; - }, getText: function(options) { options = _.extend({raw: false}, options || {}); var toret = this.dom.text(); diff --git a/src/editor/modules/documentCanvas/canvas/wlxmlListener.js b/src/editor/modules/documentCanvas/canvas/wlxmlListener.js index 54d6134..760208f 100644 --- a/src/editor/modules/documentCanvas/canvas/wlxmlListener.js +++ b/src/editor/modules/documentCanvas/canvas/wlxmlListener.js @@ -79,7 +79,7 @@ var handlers = { }, nodeTextChange: function(event) { var element = utils.getElementForNode(event.meta.node); - element.handle(event); + element.setText(event.meta.node.getText()); }, metadataChanged: _metadataEventHandler, -- 2.20.1