X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/7fbd869e69b05b5d9c9050aaf636b6660b6ace7c..10d593c6eecc49a8fe222ed2048c3f10e390b687:/src/editor/modules/documentCanvas/canvas/utils.js?ds=inline diff --git a/src/editor/modules/documentCanvas/canvas/utils.js b/src/editor/modules/documentCanvas/canvas/utils.js index 41a2a0a..ae20a09 100644 --- a/src/editor/modules/documentCanvas/canvas/utils.js +++ b/src/editor/modules/documentCanvas/canvas/utils.js @@ -3,13 +3,14 @@ define([ ], function($) { 'use strict'; - +/* globals Node */ var nearestInDocumentOrder = function(selector, direction, element) { var parents = $(element).parents(), 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,19 +35,28 @@ 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; -} +}; return { nearestInDocumentOrder: nearestInDocumentOrder, findCanvasElement: findCanvasElement, - findTextElementInParent: findTextElementInParent, + findCanvasElementInParent: findCanvasElementInParent, unicode: { ZWS: '\u200B' }