fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleaning documentElement/genericElement interfaces
[fnpeditor.git]
/
src
/
editor
/
modules
/
documentCanvas
/
canvas
/
canvas.js
diff --git
a/src/editor/modules/documentCanvas/canvas/canvas.js
b/src/editor/modules/documentCanvas/canvas/canvas.js
index
bcfc954
..
a467bee
100644
(file)
--- a/
src/editor/modules/documentCanvas/canvas/canvas.js
+++ b/
src/editor/modules/documentCanvas/canvas/canvas.js
@@
-247,7
+247,7
@@
$.extend(Canvas.prototype, Backbone.Events, {
},
toggleElementHighlight: function(node, toggle) {
},
toggleElementHighlight: function(node, toggle) {
- var element = utils.
findCanvasElement
(node);
+ var element = utils.
getElementForNode
(node);
element.toggleHighlight(toggle);
},
element.toggleHighlight(toggle);
},
@@
-303,7
+303,7
@@
$.extend(Canvas.prototype, Backbone.Events, {
}
if(!(element instanceof documentElement.DocumentElement)) {
}
if(!(element instanceof documentElement.DocumentElement)) {
- element = utils.
findCanvasElement
(element);
+ element = utils.
getElementForNode
(element);
}
if(!element || !this.contains(element)) {
}
if(!element || !this.contains(element)) {
@@
-317,13
+317,7
@@
$.extend(Canvas.prototype, Backbone.Events, {
if(byBrowser && byBrowser.parent().sameNode(nodeToLand)) {
return byBrowser;
}
if(byBrowser && byBrowser.parent().sameNode(nodeToLand)) {
return byBrowser;
}
- var children = e.children();
- for(var i = 0; i < children.length; i++) {
- if(children[i] instanceof documentElement.DocumentTextElement) {
- return children[i];
- }
- }
- return null;
+ return e.getVerticallyFirstTextElement();
}.bind(this);
var _markAsCurrent = function(element) {
if(element instanceof documentElement.DocumentTextElement) {
}.bind(this);
var _markAsCurrent = function(element) {
if(element instanceof documentElement.DocumentTextElement) {
@@
-391,10
+385,6
@@
$.extend(Canvas.prototype, Backbone.Events, {
}
},
}
},
- findCanvasElement: function(node) {
- return utils.findCanvasElement(node);
- },
-
toggleGrid: function() {
this.wrapper.toggleClass('grid-on');
this.trigger('changed');
toggleGrid: function() {
this.wrapper.toggleClass('grid-on');
this.trigger('changed');
@@
-572,7
+562,7
@@
$.extend(Cursor.prototype, {
if(selection.anchorNode === selection.focusNode) {
anchorFirst = selection.anchorOffset <= selection.focusOffset;
} else {
if(selection.anchorNode === selection.focusNode) {
anchorFirst = selection.anchorOffset <= selection.focusOffset;
} else {
- anchorFirst =
parent.childIndex(anchorElement) < parent.childIndex(focus
Element);
+ anchorFirst =
(parent.getFirst(anchorElement, focusElement) === anchor
Element);
}
placeData = getPlaceData(anchorFirst);
} else {
}
placeData = getPlaceData(anchorFirst);
} else {