hack

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

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 0041f6c..8472688 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -245,7 +245,7 @@ $.extend(Canvas.prototype, {
                         var parent = element.parent(),
                             grandParent = parent ? parent.parent() : null,
                             goto;
                         var parent = element.parent(),
                             grandParent = parent ? parent.parent() : null,
                             goto;

-                        if(parent.children().length === 1) {
+                        if(parent.children().length === 1 && parent.children()[0].sameNode(element)) {

                             if(grandParent && grandParent.children().length === 1) {
                                 goto = grandParent.append({text: ''});
                             } else {
                             if(grandParent && grandParent.children().length === 1) {
                                 goto = grandParent.append({text: ''});
                             } else {


@@ -604,7 +604,8 @@ $.extend(Canvas.prototype.list, {
         
         var toret;
         if(parent.is('list')) {
         
         var toret;
         if(parent.is('list')) {

-            listElement.wrapWithNodeElement({tag: 'div', klass: 'item'});
+            var item = listElement.wrapWithNodeElement({tag: 'div', klass: 'item'});
+            item.exec('toggleBullet', false);

             toret = listElement.parent();
         } else {
             toret = listElement;
             toret = listElement.parent();
         } else {
             toret = listElement;