if(!element) {
// Chrome hack
var direction;
- if(e.which === (KEYS.ARROW_LEFT || KEYS.ARROW_DOWN)) {
+ if(e.which === KEYS.ARROW_LEFT || e.which === KEYS.ARROW_UP) {
direction = 'above';
caretTo = 'end';
} else {
direction = 'below';
caretTo = 'start';
}
- element = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, window.getSelection().focusNode));
+ element = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]:visible', direction, window.getSelection().focusNode));
}
canvas.setCurrentElement(element, {caretTo: caretTo});
}
getCurrentNodeElement: function() {
- return this.getDocumentElement(this.wrapper.find('.current-node-element')[0]);
+ return this.getDocumentElement(this.wrapper.find('.current-node-element').parent()[0]);
},
getCurrentTextElement: function() {
element.dom().addClass('current-text-element');
} else {
this.wrapper.find('.current-node-element').removeClass('current-node-element')
- element.dom().addClass('current-node-element');
+ element._container().addClass('current-node-element');
this.publisher('currentElementChanged', element);
}
}.bind(this);
anchorElement = this.canvas.getDocumentElement(selection.anchorNode),
focusElement = this.canvas.getDocumentElement(selection.focusNode);
- if(anchorElement instanceof documentElement.DocumentNodeElement || focusElement instanceof documentElement.DocumentNodeElement)
+ var getOffset = function(where) {
+ var toret, node;
+ if(where === 'anchor') {
+ node = selection.anchorNode;
+ toret = selection.anchorOffset;
+ } else {
+ node = selection.focusNode;
+ toret = selection.focusOffset;
+ }
+
+ if(toret === 1 && node.data.charAt(0) === utils.unicode.ZWS)
+ toret = 0;
+ else if((toret === node.data.length - 1) && (node.data.charAt(node.data.length - 1) === utils.unicode.ZWS))
+ toret++;
+ return toret;
+ }
+
+ if((!anchorElement) || (anchorElement instanceof documentElement.DocumentNodeElement) || (!focusElement) || focusElement instanceof documentElement.DocumentNodeElement)
return {};
if(which === 'anchor') {
return {
element: anchorElement,
- offset: selection.anchorOffset,
- offsetAtBeginning: selection.anchorOffset === 0,
- offsetAtEnd: anchorElement && anchorElement.getText().length === selection.anchorOffset
+ offset: getOffset('anchor'),
+ offsetAtBeginning: getOffset('anchor') === 0,
+ offsetAtEnd: selection.anchorNode.data.length === getOffset('anchor')
};
}
if(which === 'focus') {
return {
element: focusElement,
- offset: selection.focusOffset,
- offsetAtBeginning: selection.focusOffset === 0,
- offsetAtEnd: focusElement && focusElement.getText().length === selection.focusOffset
+ offset: getOffset('focus'),
+ offsetAtBeginning: getOffset('focus') === 0,
+ offsetAtEnd: selection.focusNode.data.length === getOffset('focus')
};
}
if(anchorFirst) {
if(which === 'start') {
element = anchorElement;
- offset = selection.anchorOffset;
+ offset = getOffset('anchor')
}
else if(which === 'end') {
element = focusElement,
- offset = selection.focusOffset;
+ offset = getOffset('focus')
}
} else {
if(which === 'start') {
element = focusElement,
- offset = selection.focusOffset
+ offset = getOffset('focus')
}
else if(which === 'end') {
element = anchorElement;
- offset = selection.anchorOffset;
+ offset = getOffset('anchor')
}
}
} else {
// TODO: Handle order via https://developer.mozilla.org/en-US/docs/Web/API/Node.compareDocumentPosition
if(which === 'start') {
element = anchorElement;
- offset = selection.anchorOffset
+ offset = getOffset('anchor')
} else {
element = focusElement;
- offset = selection.focusOffset
+ offset = getOffset('focus')
}
}
+ var nodeLen = (element.sameNode(focusElement) ? selection.focusNode : selection.anchorNode).length;
return {
element: element,
offset: offset,
offsetAtBeginning: offset === 0,
- offsetAtEnd: element.getText().length === offset
+ offsetAtEnd: nodeLen === offset
}
}
})