From 7dd937f65ffd6278d02561647dc5f5553debf3e6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Mon, 15 Jul 2013 22:33:49 +0200 Subject: [PATCH] Improving text node selecting algorithm after selectig node element Now we let browser to chose if it choses node with the right parent --- modules/documentCanvas/canvas/canvas.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js index 76eddb1..50ca6c0 100644 --- a/modules/documentCanvas/canvas/canvas.js +++ b/modules/documentCanvas/canvas/canvas.js @@ -179,14 +179,17 @@ $.extend(Canvas.prototype, { setCurrentElement: function(element, params) { params = _.extend({caretTo: 'end'}, params); - var findFirstDirectTextChild = function(e) { + var findFirstDirectTextChild = function(e, nodeToLand) { + var byBrowser = this.getCursor().getPosition().element; + if(byBrowser.parent().sameNode(nodeToLand)) + return byBrowser; var children = e.children(); for(var i = 0; i < children.length; i++) { if(children[i] instanceof documentElement.DocumentTextElement) return children[i]; } return null; - }; + }.bind(this); var _markAsCurrent = function(element) { if(element instanceof documentElement.DocumentTextElement) { this.wrapper.find('.current-text-element').removeClass('current-text-element'); @@ -200,8 +203,8 @@ $.extend(Canvas.prototype, { var isTextElement = element instanceof documentElement.DocumentTextElement, - textElementToLand = isTextElement ? element : findFirstDirectTextChild(element), nodeElementToLand = isTextElement ? element.parent() : element, + textElementToLand = isTextElement ? element : findFirstDirectTextChild(element, nodeElementToLand), currentTextElement = this.getCurrentTextElement(), currentNodeElement = this.getCurrentNodeElement(); -- 2.20.1