smartxml: attaching previous parent of a moved node to nodeMoved event

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

diff --git a/src/editor/modules/documentCanvas/canvas/canvas.js b/src/editor/modules/documentCanvas/canvas/canvas.js
index 60782c2..f8e9927 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/canvas.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.js
@@ -102,7 +102,7 @@ $.extend(Canvas.prototype, {
                 return; // TODO: alert
             }
 
-            var text = clipboardData.getData('text/plain'),
+            var text = clipboardData.getData('text/plain').replace(/\r?\n|\r/g, ' '),
                 cursor = canvas.getCursor(),
                 element = cursor.getPosition().element,
                 lhs, rhs;
@@ -357,16 +357,16 @@ $.extend(Cursor.prototype, {
             return {
                 element: anchorElement,
                 offset: selection.anchorOffset,
-                offsetAtBeginning: selection.anchorOffset === 0,
-                offsetAtEnd: selection.anchorNode.data.length === selection.anchorOffset
+                offsetAtBeginning: selection.anchorOffset === 0 || anchorElement.getText() === '',
+                offsetAtEnd: selection.anchorNode.data.length === selection.anchorOffset || anchorElement.getText() === ''
             };
         }
         if(which === 'focus') {
             return {
                 element: focusElement,
                 offset: selection.focusOffset,
-                offsetAtBeginning: selection.focusOffset === 0,
-                offsetAtEnd: selection.focusNode.data.length === selection.focusOffset
+                offsetAtBeginning: selection.focusOffset === 0 || focusElement.getText() === '',
+                offsetAtEnd: selection.focusNode.data.length === selection.focusOffset || focusElement.getText() === '',
             };
         }
         
@@ -414,8 +414,8 @@ $.extend(Cursor.prototype, {
         return {
             element: placeData.element,
             offset: placeData.offset,
-            offsetAtBeginning: placeData.offset === 0,
-            offsetAtEnd: nodeLen === placeData.offset
+            offsetAtBeginning: placeData.offset === 0 || focusElement.getText() === '',
+            offsetAtEnd: nodeLen === placeData.offset || focusElement.getText() === ''
         };
     }
 });