X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/2c0f5a6242a51bab12bd383b0097cba6027020dd..5b8c5ec57dcfd98cf14f98b54f84e6bb55dec23d:/src/editor/modules/documentCanvas/canvas/utils.js diff --git a/src/editor/modules/documentCanvas/canvas/utils.js b/src/editor/modules/documentCanvas/canvas/utils.js index 9f5ee46..ae20a09 100644 --- a/src/editor/modules/documentCanvas/canvas/utils.js +++ b/src/editor/modules/documentCanvas/canvas/utils.js @@ -3,7 +3,7 @@ define([ ], function($) { 'use strict'; - +/* globals Node */ var nearestInDocumentOrder = function(selector, direction, element) { var parents = $(element).parents(), @@ -35,13 +35,21 @@ var findCanvasElement = function(node) { * and it lost reference to its parent (but we may still have it on canvas). */ var findCanvasElementInParent = function(wlxmlChildNode, wlxmlParentNode) { - var parentElement = findCanvasElement(wlxmlParentNode), - toret; - parentElement.children().forEach(function(child) { - if(child.data('wlxmlNode').sameNode(wlxmlChildNode)) { - toret = child; + var parentElement, toret; + + if(wlxmlParentNode === null) { + toret = wlxmlChildNode.getData('canvasElement'); + if(toret.parent()) { + throw new Error('This should never happen: root canvas element doesn\'t render root document node!'); } - }); + } else { + parentElement = findCanvasElement(wlxmlParentNode); + parentElement.children().forEach(function(child) { + if(child.data('wlxmlNode').sameNode(wlxmlChildNode)) { // czemu tu, przy drugim undo child nie mial data? + toret = child; + } + }); + } return toret; };