X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/9370067a73c02def3b684b96f6adc69631b7f073..d18c7b69cbc94bec9a75a4c1e0671e65597b5b24:/src/editor/modules/documentCanvas/canvas/utils.js?ds=sidebyside diff --git a/src/editor/modules/documentCanvas/canvas/utils.js b/src/editor/modules/documentCanvas/canvas/utils.js index 327b0b0..caa9af4 100644 --- a/src/editor/modules/documentCanvas/canvas/utils.js +++ b/src/editor/modules/documentCanvas/canvas/utils.js @@ -10,6 +10,7 @@ var nearestInDocumentOrder = function(selector, direction, element) { parent = parents.length ? $(parents[parents.length-1]) : element; var adj = parent.find(selector).filter(function() { + /*jshint bitwise: false*/ return this.compareDocumentPosition(element) & (direction === 'above' ? Node.DOCUMENT_POSITION_FOLLOWING : Node.DOCUMENT_POSITION_PRECEDING); }); @@ -17,14 +18,14 @@ var nearestInDocumentOrder = function(selector, direction, element) { return adj[direction === 'above' ? adj.length-1 : 0]; } return null; -} +}; var findCanvasElement = function(node) { if(node.nodeType === Node.ELEMENT_NODE) { return node.getData('canvasElement'); } if(node.nodeType === Node.TEXT_NODE) { - return findCanvasElementInParent(node, node.parent()) + return findCanvasElementInParent(node, node.parent()); } }; @@ -34,14 +35,23 @@ 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)) { + toret = child; + } + }); + } return toret; -} +}; return { nearestInDocumentOrder: nearestInDocumentOrder,