From 4ff93211ebf44be111ae2c00b7ee9c843ff6d7c9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Tue, 11 Feb 2014 12:02:34 +0100 Subject: [PATCH] editor: fixing nodeMoved event handling in Canvas Currently finding canvas element for a document node that was moved to a different place requires knowing its original parent. --- src/editor/modules/documentCanvas/canvas/utils.js | 4 ++-- src/editor/modules/documentCanvas/canvas/wlxmlListener.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/editor/modules/documentCanvas/canvas/utils.js b/src/editor/modules/documentCanvas/canvas/utils.js index ae20a09..337f4d3 100644 --- a/src/editor/modules/documentCanvas/canvas/utils.js +++ b/src/editor/modules/documentCanvas/canvas/utils.js @@ -20,12 +20,12 @@ var nearestInDocumentOrder = function(selector, direction, element) { return null; }; -var findCanvasElement = function(node) { +var findCanvasElement = function(node, childOf) { if(node.nodeType === Node.ELEMENT_NODE) { return node.getData('canvasElement'); } if(node.nodeType === Node.TEXT_NODE) { - return findCanvasElementInParent(node, node.parent()); + return findCanvasElementInParent(node, childOf || node.parent()); } }; diff --git a/src/editor/modules/documentCanvas/canvas/wlxmlListener.js b/src/editor/modules/documentCanvas/canvas/wlxmlListener.js index 0b23021..8275751 100644 --- a/src/editor/modules/documentCanvas/canvas/wlxmlListener.js +++ b/src/editor/modules/documentCanvas/canvas/wlxmlListener.js @@ -64,7 +64,7 @@ var handlers = { referenceAction = 'after'; } - actionArg = (checkForExistence && utils.findCanvasElement(event.meta.node)) || event.meta.node; + actionArg = (checkForExistence && utils.findCanvasElement(event.meta.node, event.meta.parent)) || event.meta.node; referenceElement[referenceAction](actionArg); }, nodeMoved: function(event) { -- 2.20.1