X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/2e14f0181735b7acd0da023eb4c9524b75a45b56..a77e53b783db30a8e6e7935ddabe158a67e4221f:/src/editor/modules/documentCanvas/canvas/documentElement.js

diff --git a/src/editor/modules/documentCanvas/canvas/documentElement.js b/src/editor/modules/documentCanvas/canvas/documentElement.js
index 99e97d0..45592ef 100644
--- a/src/editor/modules/documentCanvas/canvas/documentElement.js
+++ b/src/editor/modules/documentCanvas/canvas/documentElement.js
@@ -102,7 +102,7 @@ $.extend(DocumentNodeElement.prototype, {
             contentContainer = $('<div>')
                 .attr('document-element-content', '');
         
-        wrapper.append(widgetsContainer, contentContainer);
+        wrapper.append(contentContainer, widgetsContainer);
         widgetsContainer.find('*').add(widgetsContainer).attr('tabindex', -1);
         return wrapper;
     },
@@ -112,7 +112,6 @@ $.extend(DocumentNodeElement.prototype, {
     detach: function() {
         var parents = this.parents();
         this.dom.detach();
-        this.canvas = null;
         if(parents[0]) {
             parents[0].refreshPath();
         }
@@ -133,6 +132,8 @@ $.extend(DocumentNodeElement.prototype, {
         this.toggleHighlight(toggle);
     },
 
+    markAsCurrent: function() {},
+
     toggleHighlight: function(toggle) {
         this._container().toggleClass('highlighted-element', toggle);
     },
@@ -186,11 +187,15 @@ $.extend(DocumentTextElement.prototype, {
     },
     detach: function() {
         this.dom.detach();
-        this.canvas = null;
         return this;
     },
     setText: function(text) {
-        this.dom.contents()[0].data = text;
+        if(text === '') {
+            text = utils.unicode.ZWS;
+        }
+        if(text !== this.getText()) {
+            this.dom.contents()[0].data = text;
+        }
     },
     getText: function(options) {
         options = _.extend({raw: false}, options || {});