X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/c62820ef529ff40e46d30aedff2ba870e8e18395..7c7abb572061965f2d3a1f1d29a212a3c6318e34:/modules/documentCanvas/canvas/canvas.js?ds=sidebyside

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 228bf20..1b39183 100644
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -42,7 +42,8 @@ $.extend(Canvas.prototype, {
                     klass: currentTag.attr('class'),
                     meta: meta,
                     others: others,
-                    rawChildren: currentTag.contents()
+                    rawChildren: currentTag.contents(),
+                    prepopulateOnEmpty: true
                 }, canvas);
 
                 ['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) {
@@ -71,7 +72,7 @@ $.extend(Canvas.prototype, {
                         hasSpanBefore = el.prev().length > 0  && getNode($(el.prev()[0])).attr('wlxml-tag') === 'span',
                         hasSpanAfter = el.next().length > 0 && getNode($(el.next()[0])).attr('wlxml-tag') === 'span';
 
-                    if(el.parent().hasClass('canvas-widget'))
+                    if(el.parent().hasClass('canvas-widget') || elParent.attr('document-text-element') !== undefined)
                         return true; // continue
 
                     var addInfo = function(toAdd, where) {
@@ -226,7 +227,11 @@ $.extend(Canvas.prototype, {
                         cursorAtOperationEdge = position.offsetAtEnd;
                     }
 
-                    if(element.getText().length === 1 || selectsWholeTextElement()) {
+                    var willDeleteWholeText = function() {
+                        return element.getText().length === 1 || selectsWholeTextElement();
+                    }
+
+                    if(willDeleteWholeText()) {
                         e.preventDefault();
                         element.setText('');
                     }