editor: remove unused code

[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 50c0ae4..d8090c8 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/canvas.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.js
@@ -377,7 +377,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
 
         if(textElementToLand) {
             _markAsCurrent(textElementToLand);
 
         if(textElementToLand) {
             _markAsCurrent(textElementToLand);

-            if(params.caretTo || !textElementToLand.sameNode(this.getCursor().getPosition().element)) {
+            if((params.caretTo || params.caretTo === 0) || !textElementToLand.sameNode(this.getCursor().getPosition().element)) {

                 this._moveCaretToTextElement(textElementToLand, params.caretTo); // as method on element?
             }
         } else {
                 this._moveCaretToTextElement(textElementToLand, params.caretTo); // as method on element?
             }
         } else {


@@ -457,6 +457,9 @@ $.extend(Selection.prototype, {
             return doc.createFragment(doc.CaretFragment, {node: anchorNode, offset: this.nativeSelection.anchorOffset});
         }
         if(this.type === 'textSelection') {
             return doc.createFragment(doc.CaretFragment, {node: anchorNode, offset: this.nativeSelection.anchorOffset});
         }
         if(this.type === 'textSelection') {

+            if(!anchorNode || !focusNode) {
+                return;
+            }

             if(anchorNode.isSiblingOf(focusNode)) {
                 return doc.createFragment(doc.TextRangeFragment, {
                     node1: anchorNode,
             if(anchorNode.isSiblingOf(focusNode)) {
                 return doc.createFragment(doc.TextRangeFragment, {
                     node1: anchorNode,