X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/d613d2e064ec2eb9d5ddf26337082f2904cbac89..9a7ea3b25b1989eeb004820bfa8c939426599c8a:/modules/documentCanvas/canvas/canvas.js

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index a8ff8d4..8ba871b 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) {
@@ -187,8 +188,8 @@ $.extend(Canvas.prototype, {
                                 direction = 'below';
                                 caretTo = 'start';
                             }
-                            var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, window.getSelection().focusNode))
-                            canvas.setCurrentElement(element, {caretTo: caretTo});
+                            var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, element.dom()[0]));
+                            canvas.setCurrentElement(el, {caretTo: caretTo});
                         } else {
                             var txt = element.dom().contents()[0].data;
                             if(e.which === KEYS.ARROW_LEFT && position.offset > 1 && txt.charAt(position.offset-2) === utils.unicode.ZWS) {
@@ -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('');
                     }
@@ -245,7 +250,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 +262,7 @@ $.extend(Canvas.prototype, {
                             element.detach();
                         }
                         canvas.setCurrentElement(goto, {caretTo: caretTo});
+                        canvas.publisher('contentChanged');
                     }
                     else if(cursorAtOperationEdge) {
                         // todo
@@ -266,26 +272,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
+                            }
 
-                        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);
+                            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));
+                                gotoOptions = {};
+                            } else {
+                                goto = elements.second;
+                                gotoOptions = {caretTo: 'start'};
+                            }
+
+                            canvas.setCurrentElement(goto, gotoOptions);
                         }
                     }
                 }
@@ -298,8 +319,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 +610,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;