mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor
synced 2024-09-25 03:08:42 +00:00
Merge "Cleanup selection displaying related methods in ve.ce.Surface."
This commit is contained in:
commit
d00486a450
|
@ -1108,16 +1108,6 @@ ve.ce.Surface.prototype.adjustCursor = function ( adjustment ) {
|
|||
return false;
|
||||
};
|
||||
|
||||
/**
|
||||
* Show the cursor at an offset.
|
||||
*
|
||||
* @method
|
||||
* @param {number} offset Offset to show cursor at
|
||||
*/
|
||||
ve.ce.Surface.prototype.showCursor = function ( offset ) {
|
||||
this.showSelection( new ve.Range( offset ) );
|
||||
};
|
||||
|
||||
/**
|
||||
* Show selection on a range.
|
||||
*
|
||||
|
@ -1139,45 +1129,12 @@ ve.ce.Surface.prototype.showSelection = function ( range ) {
|
|||
if ( !range.isCollapsed() ) {
|
||||
start = this.getNodeAndOffset( range.start );
|
||||
end = this.getNodeAndOffset( range.end );
|
||||
|
||||
if ( false && $.browser.msie ) {
|
||||
if ( range.start === range.from ) {
|
||||
if (
|
||||
start.node === this.poll.rangySelection.anchorNode &&
|
||||
start.offset === this.poll.rangySelection.anchorOffset &&
|
||||
end.node === this.poll.rangySelection.focusNode &&
|
||||
end.offset === this.poll.rangySelection.focusOffset
|
||||
) {
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
if (
|
||||
end.node === this.poll.rangySelection.anchorNode &&
|
||||
end.offset === this.poll.rangySelection.anchorOffset &&
|
||||
start.node === this.poll.rangySelection.focusNode &&
|
||||
start.offset === this.poll.rangySelection.focusOffset
|
||||
) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
rangyRange.setStart( start.node, start.offset );
|
||||
rangyRange.setEnd( end.node, end.offset );
|
||||
rangySel.removeAllRanges();
|
||||
rangySel.addRange( rangyRange, range.start !== range.from );
|
||||
} else {
|
||||
start = end = this.getNodeAndOffset( range.start );
|
||||
|
||||
if ( false && $.browser.msie ) {
|
||||
if (
|
||||
start.node === this.poll.rangySelection.anchorNode &&
|
||||
start.offset === this.poll.rangySelection.anchorOffset
|
||||
) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
start = this.getNodeAndOffset( range.start );
|
||||
rangyRange.setStart( start.node, start.offset );
|
||||
rangySel.setSingleRange( rangyRange );
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue