Allow for wrapping current node element when there is no selection

[fnpeditor.git] / modules / documentCanvas / canvas / documentElement.js

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index 4c09b75..0558a3e 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -148,8 +148,10 @@ $.extend(DocumentNodeElement, {
         }
         element.data('other-attrs', params.others);
 
         }
         element.data('other-attrs', params.others);
 

-        if(params.rawChildren) {
+        if(params.rawChildren && params.rawChildren.length) {

             container.append(params.rawChildren);
             container.append(params.rawChildren);

+        } else if(params.prepopulateOnEmpty) {
+            element.append(DocumentTextElement.create({text: ''}));

         }
         return dom;
     },
         }
         return dom;
     },


@@ -528,8 +530,9 @@ $.extend(DocumentTextElement.prototype, {
                     prev.setText(prev.getText() + this.getText() + next.getText());
                     next.detach();
                 } else if (prev || next) {
                     prev.setText(prev.getText() + this.getText() + next.getText());
                     next.detach();
                 } else if (prev || next) {

-                    var target = prev ? prev : next;
-                    target.setText(target.getText() + this.getText());
+                    var target = prev ? prev : next,
+                        newText = prev ? target.getText() + this.getText() : this.getText() + target.getText();
+                    target.setText(newText);

                 } else {
                     parent.after(this);
                 }
                 } else {
                     parent.after(this);
                 }