Simplifying toolbar list button

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

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 873b39e..0041f6c 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -284,16 +284,23 @@ $.extend(Canvas.prototype, {
 
                             var elements = position.element.split({offset: position.offset}),
                                 newEmpty,
 
                             var elements = position.element.split({offset: position.offset}),
                                 newEmpty,

-                                goto;
+                                goto,
+                                gotoOptions;

 
                             if(position.offsetAtBeginning)
                                 newEmpty = elements.first;
                             else if(position.offsetAtEnd)
                                 newEmpty = elements.second;
 
                             if(position.offsetAtBeginning)
                                 newEmpty = elements.first;
                             else if(position.offsetAtEnd)
                                 newEmpty = elements.second;

+                            

                             if(newEmpty) {
                                 goto = newEmpty.append(documentElement.DocumentTextElement.create({text: ''}, this));
                             if(newEmpty) {
                                 goto = newEmpty.append(documentElement.DocumentTextElement.create({text: ''}, this));

-                                canvas.setCurrentElement(goto);
+                                gotoOptions = {};
+                            } else {
+                                goto = elements.second;
+                                gotoOptions = {caretTo: 'start'};

                             }
                             }

+
+                            canvas.setCurrentElement(goto, gotoOptions);

                         }
                     }
                 }
                         }
                     }
                 }


@@ -306,8 +313,11 @@ $.extend(Canvas.prototype, {
 
             var observer = new MutationObserver(function(mutations) {
                 mutations.forEach(function(mutation) {
 
             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};
                 });
             });
             var config = { attributes: false, childList: false, characterData: true, subtree: true, characterDataOldValue: true};