editor: fix - save local draft after source editor commits changes

[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..428cedc 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/canvas.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.js
@@ -91,7 +91,12 @@ $.extend(Canvas.prototype, {
 
         this.wrapper.on('click', '[document-node-element], [document-text-element]', function(e) {
             e.stopPropagation();
 
         this.wrapper.on('click', '[document-node-element], [document-text-element]', function(e) {
             e.stopPropagation();

-            canvas.setCurrentElement(canvas.getDocumentElement(e.currentTarget), {caretTo: false});
+            if(e.originalEvent.detail === 3) {
+                e.preventDefault();
+                canvas._moveCaretToTextElement(canvas.getDocumentElement(e.currentTarget), 'whole');
+            } else {
+                canvas.setCurrentElement(canvas.getDocumentElement(e.currentTarget), {caretTo: false});
+            }

         });
 
         this.wrapper.on('paste', function(e) {
         });
 
         this.wrapper.on('paste', function(e) {


@@ -102,7 +107,7 @@ $.extend(Canvas.prototype, {
                 return; // TODO: alert
             }
 
                 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;
                 cursor = canvas.getCursor(),
                 element = cursor.getPosition().element,
                 lhs, rhs;


@@ -289,12 +294,13 @@ $.extend(Canvas.prototype, {
             range.setStart(node, where);
         }
         
             range.setStart(node, where);
         }
         

-        var collapseArg = true;
-        if(where === 'end') {
-            collapseArg = false;
+        if(where !== 'whole') {
+            var collapseArg = true;
+            if(where === 'end') {
+                collapseArg = false;
+            }
+            range.collapse(collapseArg);

         }
         }

-        range.collapse(collapseArg);
-        

         var selection = document.getSelection();
 
         selection.removeAllRanges();
         var selection = document.getSelection();
 
         selection.removeAllRanges();


@@ -357,16 +363,16 @@ $.extend(Cursor.prototype, {
             return {
                 element: anchorElement,
                 offset: selection.anchorOffset,
             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,
             };
         }
         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 +420,8 @@ $.extend(Cursor.prototype, {
         return {
             element: placeData.element,
             offset: placeData.offset,
         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() === ''

         };
     }
 });
         };
     }
 });