X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/bec14a088e45d21ac12f9c5e852dd0b7e559d680..45c6e40d4312a3bc53fb0c64574d9e5b1f298193:/src/editor/plugins/core/core.js

diff --git a/src/editor/plugins/core/core.js b/src/editor/plugins/core/core.js
index 4c2f4c0..ed0cf28 100644
--- a/src/editor/plugins/core/core.js
+++ b/src/editor/plugins/core/core.js
@@ -31,15 +31,37 @@ plugin.documentExtension.textNode.transformations = {
         }
     },
     mergeContentUp: function() {
-        var myPrev = this.prev(),
+        /* globals Node */
+        var myPrev = this,
+            base = this,
             ret;
 
-        if(myPrev) {
-            ret = myPrev.append(this);
+        if(myPrev.nodeType === Node.TEXT_NODE) {
+            if(myPrev.getIndex() > 0) {
+                return;
+            }
+            myPrev = base = myPrev.parent();
+        }
+
+        myPrev = myPrev && myPrev.prev();
+
+        if(myPrev && myPrev.nodeType === Node.ELEMENT_NODE)  {
+            var ptr = this,
+                next;
+            while(ptr) {
+                next = ptr.next();
+                if(!ret) {
+                    ret = myPrev.append(ptr);
+                } else {
+                    myPrev.append(ptr);
+                }
+                
+                ptr = next;
+            }
+            if(base !== this) {
+                base.detach();
+            }
             return {node: ret, offset: ret.sameNode(this) ? null : ret.getText().length - this.getText().length};
-        } else {
-            var range = this.parent().unwrapContent();
-            return {node: range.element1, offset: 0};
         }
     }
 };
@@ -136,7 +158,7 @@ var commentAction = {
                         params.fragment instanceof params.fragment.NodeFragment && !params.fragment.node.isRoot()
         };
         if(state.allowed) {
-            state.description = gettext('Insert comment after current node');
+            state.description = gettext('Insert comment');
         }
         return state;
     }
@@ -172,13 +194,21 @@ var createWrapTextAction = function(createParams) {
                 description: createParams.description,
                 execute: function(callback, params) {
                     params.fragment.document.transaction(function() {
-                        var parent = params.fragment.startNode.parent();
-                        return parent.wrapText({
+                        var parent = params.fragment.startNode.parent(),
+                            doc = params.fragment.document,
+                            wrapper, lastTextNode;
+                        
+                        wrapper = parent.wrapText({
                             _with: {tagName: 'span', attrs: {'class': createParams.klass}},
                             offsetStart: params.fragment.startOffset,
                             offsetEnd: params.fragment.endOffset,
                             textNodeIdx: [params.fragment.startNode.getIndex(), params.fragment.endNode.getIndex()]
                         });
+                            
+                        lastTextNode = wrapper.getLastTextNode();
+                        if(lastTextNode) {
+                            return doc.createFragment(doc.CaretFragment, {node: lastTextNode, offset: lastTextNode.getText().length});
+                        }
                     }, {
                         metadata: {
                             description: createParams.description
@@ -206,15 +236,16 @@ var createLinkFromSelection = function(callback, params) {
     
     dialog.on('execute', function(event) {
         doc.transaction(function() {
-            var span =  params.fragment.startNode.parent().wrapText({
+            var span =  action.params.fragment.startNode.parent().wrapText({
                 _with: {tagName: 'span', attrs: {'class': 'link'}},
                 offsetStart: params.fragment.startOffset,
                 offsetEnd: params.fragment.endOffset,
                 textNodeIdx: [params.fragment.startNode.getIndex(), params.fragment.endNode.getIndex()]
-            });
+            }),
+                doc = params.fragment.document;
             span.setAttr('href', event.formData.href);
             event.success();
-            return span;
+            return doc.createFragment(doc.CaretFragment, {node: span.contents()[0], offset:0});
         }, {
             metadata: {
                 description: action.getState().description
@@ -242,6 +273,7 @@ var editLink = function(callback, params) {
         doc.transaction(function() {
             link.setAttr('href', event.formData.href);
             event.success();
+            return params.fragment;
         }, {
             metadata: {
                 description: action.getState().description
@@ -278,7 +310,12 @@ var linkAction = {
 
         if(params.fragment instanceof params.fragment.CaretFragment) {
             if(params.fragment.node.isInside('link')) {
-                return {allowed: true, toggled: true, execute: editLink};
+                return {
+                    allowed: true,
+                    toggled: true,
+                    description: gettext('Edit link'),
+                    execute: editLink
+                };
             }
         }
         return {allowed: false};