X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/de9d1ec272d6133634321d9005824dd9c4000331..4638325970a04404505f5ce87838eee6395b8f83:/src/editor/plugins/core/core.js

diff --git a/src/editor/plugins/core/core.js b/src/editor/plugins/core/core.js
index 425b161..e300232 100644
--- a/src/editor/plugins/core/core.js
+++ b/src/editor/plugins/core/core.js
@@ -8,7 +8,7 @@ var _ = require('libs/underscore'),
     footnote = require('plugins/core/footnote'),
     switchTo = require('plugins/core/switch'),
     lists = require('plugins/core/lists'),
-    plugin = {name: 'core', actions: [], canvas: {}, documentExtension: {textNode: {}, elementNode: {}}},
+    plugin = {name: 'core', actions: [], canvas: {}, documentExtension: {textNode: {}, documentNode: {}}},
     Dialog = require('views/dialog/dialog'),
     canvasElements = require('plugins/core/canvasElements'),
     metadataEditor = require('plugins/core/metadataEditor/metadataEditor');
@@ -124,7 +124,7 @@ plugin.documentExtension.textNode.transformations = {
     }
 };
 
-plugin.documentExtension.elementNode.transformations = {
+plugin.documentExtension.documentNode.transformations = {
     moveUp: function() {
         var toMerge = this,
             prev = toMerge.prev();
@@ -138,11 +138,16 @@ plugin.documentExtension.elementNode.transformations = {
                 }
                 ret = to.append(node);
                 
-                if(idx === 0) {
+                if(idx === 0 && ret.nodeType === Node.TEXT_NODE) {
                     toret = {
                         node: ret,
                         offset: ret.getText().length - len
                     };
+                } else if(!toret) {
+                    toret = {
+                        node: ret.getFirstTextNode(),
+                        offset: 0
+                    };
                 }
             });
             from.detach();
@@ -152,7 +157,32 @@ plugin.documentExtension.elementNode.transformations = {
         var strategies = [
             {
                 applies: function() {
-                    return toMerge.is('p');
+                    return toMerge.nodeType === Node.TEXT_NODE && prev.is({tagName: 'span'});
+                },
+                run: function() {
+                    var textNode = prev.getLastTextNode(),
+                        txt, prevText, prevTextLen;
+                    if(textNode) {
+                        txt = textNode.getText();
+                        if(txt.length > 1) {
+                            textNode.setText(txt.substr(0, txt.length-1));
+                            return {node: toMerge, offset: 0};
+                        } else {
+                            if((prevText = prev.prev()) && prevText.nodeType === Node.TEXT_NODE) {
+                                prevTextLen = prevText.getText().length;
+                            }
+                            prev.detach();
+                            return {
+                                node: prevText ? prevText : toMerge,
+                                offset : prevText ? prevTextLen : 0
+                            };
+                        }
+                    }
+                }
+            },
+            {
+                applies: function() {
+                    return toMerge.is({tagName: 'div', 'klass': 'p'}) || (toMerge.is({tagName: 'div'}) && toMerge.getClass() === '');
                 },
                 run: function() {
                     if(prev && prev.is('p') || prev.is({tagName: 'header'})) {
@@ -164,6 +194,43 @@ plugin.documentExtension.elementNode.transformations = {
                     }
                 }
             },
+            {
+                applies: function() {
+                    return toMerge.is({tagName: 'span'});
+                },
+                run: function() {
+                    /* globals Node */
+                    var toret = {node: toMerge.contents()[0] , offset: 0},
+                        txt, txtNode, parent;
+                    if(!prev) {
+                        toMerge.parents().some(function(p) {
+                            if(p.is({tagName: 'span'})) {
+                                parent = prev = p;
+                            } else {
+                                if(!parent) {
+                                    parent = p;
+                                }
+                                prev = prev && prev.prev();
+                                return true;
+                            }
+                        });
+                    }
+                    if(!prev) {
+                        return parent.moveUp();
+                    }
+                    else if(prev.nodeType === Node.TEXT_NODE && (txt = prev.getText())) {
+                        prev.setText(txt.substr(0, txt.length-1));
+                        return toret;
+                    } else if(prev.is({tagName: 'span'})) {
+                        if((txtNode = prev.getLastTextNode())) {
+                            txt = txtNode.getText();
+                            txtNode.setText(txt.substr(0, txt.length-1));
+                            return toret;
+                        }
+                    }
+
+                }
+            },
             {
                 applies: function() {
                     return toMerge.is({tagName: 'header'});