Fix: missing contentChanged event

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

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index a8ff8d4..228bf20 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;
-                        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 {
@@ -257,6 +257,7 @@ $.extend(Canvas.prototype, {
                             element.detach();
                         }
                         canvas.setCurrentElement(goto, {caretTo: caretTo});
+                        canvas.publisher('contentChanged');
                     }
                     else if(cursorAtOperationEdge) {
                         // todo
@@ -266,26 +267,41 @@ $.extend(Canvas.prototype, {
 
                 if(e.which === KEYS.ENTER) {
                     e.preventDefault();
-                    var cursor = canvas.getCursor();
+                    var cursor = canvas.getCursor(),
+                        position = cursor.getPosition(),
+                        element = position.element;
+
                     if(!cursor.isSelecting()) {
-                        var position = cursor.getPosition(),
-                            element = position.element;
+                        if(e.ctrlKey) {
+                            var added = element.after({tag: 'block'});
+                            added.append({text:''});
+                            canvas.setCurrentElement(added, {caretTo: 'start'});
 
-                        if(!(element.parent().parent())) {
-                            return false; // top level element is unsplittable
-                        }
+                        } else {
 
-                        var elements = position.element.split({offset: position.offset}),
-                            newEmpty,
-                            goto;
+                            if(!(element.parent().parent())) {
+                                return false; // top level element is unsplittable
+                            }
+
+                            var elements = position.element.split({offset: position.offset}),
+                                newEmpty,
+                                goto,
+                                gotoOptions;
 
-                        if(position.offsetAtBeginning)
-                            newEmpty = elements.first;
-                        else if(position.offsetAtEnd)
-                            newEmpty = elements.second;
-                        if(newEmpty) {
-                            goto = newEmpty.append(documentElement.DocumentTextElement.create({text: ''}, this));
-                            canvas.setCurrentElement(goto);
+                            if(position.offsetAtBeginning)
+                                newEmpty = elements.first;
+                            else if(position.offsetAtEnd)
+                                newEmpty = elements.second;
+                            
+                            if(newEmpty) {
+                                goto = newEmpty.append(documentElement.DocumentTextElement.create({text: ''}, this));
+                                gotoOptions = {};
+                            } else {
+                                goto = elements.second;
+                                gotoOptions = {caretTo: 'start'};
+                            }
+
+                            canvas.setCurrentElement(goto, gotoOptions);
                         }
                     }
                 }
@@ -298,8 +314,11 @@ $.extend(Canvas.prototype, {
 
             var observer = new MutationObserver(function(mutations) {
                 mutations.forEach(function(mutation) {
-                    if(documentElement.DocumentTextElement.isContentContainer(mutation.target) && mutation.target.data === '')
-                        mutation.target.data = utils.unicode.ZWS;
+                    if(documentElement.DocumentTextElement.isContentContainer(mutation.target)) {
+                        if(mutation.target.data === '')
+                            mutation.target.data = utils.unicode.ZWS;
+                        canvas.publisher('contentChanged');
+                    }
                 });
             });
             var config = { attributes: false, childList: false, characterData: true, subtree: true, characterDataOldValue: true};
@@ -586,7 +605,8 @@ $.extend(Canvas.prototype.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;