X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/7775c06d48eb6f310a8ba03d476fd9fcd36b3bc8..bb856bb163a586641fe9f6edf7723d3d905f2dfb:/src/editor/modules/documentCanvas/canvas/selection.js

diff --git a/src/editor/modules/documentCanvas/canvas/selection.js b/src/editor/modules/documentCanvas/canvas/selection.js
index fbae482..0d8c4ce 100644
--- a/src/editor/modules/documentCanvas/canvas/selection.js
+++ b/src/editor/modules/documentCanvas/canvas/selection.js
@@ -60,7 +60,8 @@ $.extend(TextSelection.prototype, {
     toDocumentFragment: function() {
         var doc = this.canvas.wlxmlDocument,
             anchorNode = this.anchorElement ? this.anchorElement.wlxmlNode : null,
-            focusNode = this.focusElement ? this.focusElement.wlxmlNode : null;
+            focusNode = this.focusElement ? this.focusElement.wlxmlNode : null,
+            node1, node2;
         
         if(!anchorNode || !focusNode) {
             return;
@@ -75,10 +76,17 @@ $.extend(TextSelection.prototype, {
             });
         }
         else {
-            var siblingParents = doc.getSiblingParents({node1: anchorNode, node2: focusNode});
+            if(anchorNode.hasSameContextRoot(focusNode)) {
+                var siblingParents = doc.getSiblingParents({node1: anchorNode, node2: focusNode});
+                node1 = siblingParents.node1;
+                node2 = siblingParents.node2;
+            } else {
+                node1 = focusNode;
+                node2 = anchorNode;
+            }
             return doc.createFragment(doc.RangeFragment, {
-                node1: siblingParents.node1,
-                node2: siblingParents.node2
+                node1: node1,
+                node2: node2
             });
         }
     },
@@ -121,21 +129,25 @@ return {
         /* globals window */
         var nativeSelection =  window.getSelection(),
             params = {},
-            element;
+            element, anchorElement, focusElement;
+            
         if(nativeSelection.focusNode) {
             if(nativeSelection.isCollapsed && isText(nativeSelection.focusNode)) {
+                element = canvas.getDocumentElement(nativeSelection.focusNode);
                 params = {
                     type: 'caret',
-                    element: canvas.getDocumentElement(nativeSelection.focusNode),
-                    offset: nativeSelection.focusOffset
+                    element: element,
+                    offset: element.isEmpty() ? 0 : nativeSelection.getRangeAt(0).startOffset
                 };
             } else if(isText(nativeSelection.focusNode) && isText(nativeSelection.anchorNode)) {
+                anchorElement = canvas.getDocumentElement(nativeSelection.anchorNode);
+                focusElement = canvas.getDocumentElement(nativeSelection.focusNode);
                 params = {
                     type: 'textSelection',
-                    anchorElement: canvas.getDocumentElement(nativeSelection.anchorNode),
-                    anchorOffset: nativeSelection.anchorOffset,
-                    focusElement: canvas.getDocumentElement(nativeSelection.focusNode),
-                    focusOffset: nativeSelection.focusOffset
+                    anchorElement: anchorElement,
+                    anchorOffset: anchorElement.isEmpty() ? 0 : nativeSelection.anchorOffset,
+                    focusElement: focusElement,
+                    focusOffset: focusElement.isEmpty() ? 0 : nativeSelection.focusOffset
                 };
             }
         } else if((element = canvas.getCurrentNodeElement())) {