wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-28 16:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Inside ve.ce.Document.getRelativeOffset fallback to 'character' mode if 'word' mode returns the same offset as was passed originally"

Browse source
This commit is contained in:
jenkins-bot 2013-04-16 22:54:27 +00:00 committed by Gerrit Code Review
parent cec856032a 9d5b9525d6
commit 1b072d2e0c
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/ve/ce/ve.ce.Document.js
View file

@ -74,9 +74,6 @@ ve.ce.Document.prototype.getSiblingWordBoundary = function ( offset, direction )
* This method is in CE instead of DM because it uses information about slugs about which model
* does not know at all.
*
* FIXME: In certain cases returned offset is the same as passed offset which prevents cursor from
* moving.
*
* @method
* @param {number} offset Offset to start from
* @param {number} [direction] Direction to prefer matching offset in, -1 for left and 1 for right
@ -84,9 +81,16 @@ ve.ce.Document.prototype.getSiblingWordBoundary = function ( offset, direction )
* @returns {number} Relative offset
*/
ve.ce.Document.prototype.getRelativeOffset = function ( offset, direction, unit ) {
var bias, relativeContentOffset, relativeStructuralOffset;
var bias, relativeContentOffset, relativeStructuralOffset, newOffset;
if ( unit === 'word' ) { // word
return this.getSiblingWordBoundary( offset, direction );
// Method getSiblingWordBoundary does not "move/jump" over element data. If passed offset is
// an element data offset then the same offset is returned - and in such case this method
// fallback to the other path (character) which does "move/jump" over element data.
newOffset = this.getSiblingWordBoundary( offset, direction );
if ( offset === newOffset ) {
newOffset = this.getRelativeOffset( offset, direction, 'character' );
}
return newOffset;
} else { // character
bias = direction > 0 ? 1 : -1;
relativeContentOffset = this.model.data.getRelativeContentOffset( offset, direction );