fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
editor: bottom panel
[fnpeditor.git]
/
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
caa9af4
..
56093f6
100644
(file)
--- a/
src/editor/modules/documentCanvas/canvas/utils.js
+++ b/
src/editor/modules/documentCanvas/canvas/utils.js
@@
-3,7
+3,7
@@
define([
], function($) {
'use strict';
], function($) {
'use strict';
-
+/* globals Node */
var nearestInDocumentOrder = function(selector, direction, element) {
var parents = $(element).parents(),
var nearestInDocumentOrder = function(selector, direction, element) {
var parents = $(element).parents(),
@@
-20,12
+20,12
@@
var nearestInDocumentOrder = function(selector, direction, element) {
return null;
};
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) {
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());
}
};
}
};
@@
-45,7
+45,7
@@
var findCanvasElementInParent = function(wlxmlChildNode, wlxmlParentNode) {
} else {
parentElement = findCanvasElement(wlxmlParentNode);
parentElement.children().forEach(function(child) {
} else {
parentElement = findCanvasElement(wlxmlParentNode);
parentElement.children().forEach(function(child) {
- if(child.
data('wlxmlNode').sameNode(wlxmlChildNode)) {
+ if(child.
wlxmlNode.sameNode(wlxmlChildNode)) { // czemu tu, przy drugim undo child nie mial data?
toret = child;
}
});
toret = child;
}
});