From 724c4850eb0d7e4001ad1461e027d66339b9e525 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Mon, 15 Jul 2013 17:06:28 +0200 Subject: [PATCH] Quick fix: Fixing node element selection Cursor now lands in a text element chosen to be selected by canvas algorithm. --- modules/documentCanvas/canvas/canvas.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js index 7a1d930..76eddb1 100644 --- a/modules/documentCanvas/canvas/canvas.js +++ b/modules/documentCanvas/canvas/canvas.js @@ -208,11 +208,12 @@ $.extend(Canvas.prototype, { if(currentTextElement && !(currentTextElement.sameNode(textElementToLand))) this.wrapper.find('.current-text-element').removeClass('current-text-element'); - if(textElementToLand && !(textElementToLand.sameNode(currentTextElement))) { + if(textElementToLand) { _markAsCurrent(textElementToLand); - if(params.caretTo) + if(params.caretTo || !textElementToLand.sameNode(this.getCursor().getPosition().element)) this._moveCaretToTextElement(textElementToLand, params.caretTo); // as method on element? - this.publisher('currentTextElementSet', element); + if(!(textElementToLand.sameNode(currentTextElement))) + this.publisher('currentTextElementSet', element); } if(!(currentNodeElement && currentNodeElement.sameNode(nodeElementToLand))) { -- 2.20.1