mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor
synced 2024-11-25 14:56:20 +00:00
353297e5b5
ve.Range * Rewrote truncate so that it works as expected, truncation should always reduce the length using the start/end values, not the from/to values ve.ui.Inspector * Added a comment about where the name argument to onBeforeInspectorOpen comes from, since it's a little bit confusing on first read (and I wrote it!) * Calling onInitialize, onOpen and onClose methods directly, since we need to control the before or after-ness of listeners getting in there and doing their stuff - plus it's more direct * Removed onRemove stub, which is never actually called * Added before/after versions of initialize, open and close events * Got rid of recursion guard since we don't need it anymore thanks to changes made in ve.dm.Surface (see below) ve.ui.Context * Updated event names to deal with new before/after naming of initialize, open and close events * Removed fade-in logic since fading in doesn't even work anymore - since now we now annotate first, then open the inspector, the menu will actually exist and be open when we open the inspector even though you don't see it because it's quickly obscured ve.ui.LinkInspector * Made fragments non-auto selecting, in the case of onInitialize we actually call select(), which is silly since we were using an auto-selecting fragment - it's clear that this was a mistake ve.dm.Surface * Moved locking (polling stop and start) to the far outside edges of the change method * I need a lot of eyes and testing on this change, it seems OK to me, but I'm suspicious that it may have side effects * What was happening is that selection changes were being applied and then the poll was picking them up, and then the selection was coming in again as a change, but it wasn't a change at all, it was just feedback - this change event was then closing the inspector the instant it was opened - the odd part was that this only occurred when you selected backwards, which seems to be caused by the range being normalized, so it looked like a new selection even though it wasn't ve.dm.Document * trimOuterSpace from Range didn't consider annotated spaces to be spaces, by using the [0] trick (first character of a plain text character string or first element in an annotated character's array both are the character's value - but elements don't have a property named '0' so it skips those safely as well) we can always get the right value for comparison Change-Id: I0873d906c058203b83b8d4bbe5a4b274f05a26fd
161 lines
3.7 KiB
JavaScript
161 lines
3.7 KiB
JavaScript
/**
|
|
* VisualEditor Range class.
|
|
*
|
|
* @copyright 2011-2012 VisualEditor Team and others; see AUTHORS.txt
|
|
* @license The MIT License (MIT); see LICENSE.txt
|
|
*/
|
|
|
|
/**
|
|
* Range of content.
|
|
*
|
|
* @class
|
|
* @constructor
|
|
* @param {Number} from Starting offset
|
|
* @param {Number} [to=from] Ending offset
|
|
* @property {Number} from Starting offset
|
|
* @property {Number} to Ending offset
|
|
* @property {Number} start Normalized starting offset
|
|
* @property {Number} end Normalized ending offset
|
|
*/
|
|
ve.Range = function VeRange( from, to ) {
|
|
this.from = from || 0;
|
|
this.to = typeof to === 'undefined' ? this.from : to;
|
|
this.normalize();
|
|
};
|
|
|
|
/* Static Methods */
|
|
|
|
/**
|
|
* Creates a new ve.Range object that's a translated version of another.
|
|
*
|
|
* @method
|
|
* @param {ve.Range} range Range to base new range on
|
|
* @param {Number} distance Distance to move range by
|
|
* @returns {ve.Range} New translated range
|
|
*/
|
|
ve.Range.newFromTranslatedRange = function ( range, distance ) {
|
|
return new ve.Range( range.from + distance, range.to + distance );
|
|
};
|
|
|
|
/**
|
|
* Creates a new ve.Range object that covers all of the given ranges
|
|
*
|
|
* @method
|
|
* @param {Array} ranges Array of ve.Range objects (at least one)
|
|
* @returns {ve.Range} Range that spans all of the given ranges
|
|
*/
|
|
ve.Range.newCoveringRange = function ( ranges ) {
|
|
var minStart, maxEnd, i;
|
|
if ( !ranges || ranges.length === 0 ) {
|
|
throw new Error( 'newCoveringRange() requires at least one range' );
|
|
}
|
|
minStart = ranges[0].start;
|
|
maxEnd = ranges[0].end;
|
|
for ( i = 1; i < ranges.length; i++ ) {
|
|
if ( ranges[i].start < minStart ) {
|
|
minStart = ranges[i].start;
|
|
}
|
|
if ( ranges[i].end > maxEnd ) {
|
|
maxEnd = ranges[i].end;
|
|
}
|
|
}
|
|
return new ve.Range( minStart, maxEnd );
|
|
};
|
|
|
|
/* Methods */
|
|
|
|
/**
|
|
* Gets a clone of this object.
|
|
*
|
|
* @method
|
|
* @returns {ve.Range} Clone of range
|
|
*/
|
|
ve.Range.prototype.clone = function () {
|
|
return new ve.Range( this.from, this.to );
|
|
};
|
|
|
|
/**
|
|
* Checks if an offset is within this range.
|
|
*
|
|
* @method
|
|
* @param {Number} offset Offset to check
|
|
* @returns {Boolean} If offset is within this range
|
|
*/
|
|
ve.Range.prototype.containsOffset = function ( offset ) {
|
|
this.normalize();
|
|
return offset >= this.start && offset < this.end;
|
|
};
|
|
|
|
/**
|
|
* Gets the length of the range.
|
|
*
|
|
* @method
|
|
* @returns {Number} Length of range
|
|
*/
|
|
ve.Range.prototype.getLength = function () {
|
|
return Math.abs( this.from - this.to );
|
|
};
|
|
|
|
/**
|
|
* Sets start and end properties, ensuring start is always before end.
|
|
*
|
|
* This should always be called before using the start or end properties. Do not call this unless
|
|
* you are about to use these properties.
|
|
*
|
|
* @method
|
|
*/
|
|
ve.Range.prototype.normalize = function () {
|
|
if ( this.from < this.to ) {
|
|
this.start = this.from;
|
|
this.end = this.to;
|
|
} else {
|
|
this.start = this.to;
|
|
this.end = this.from;
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Swaps from and to values, effectively changing the direction.
|
|
*
|
|
* The range will also be normalized when this is called.
|
|
*
|
|
* @method
|
|
*/
|
|
ve.Range.prototype.flip = function () {
|
|
return new ve.Range( this.to, this.from );
|
|
};
|
|
|
|
/**
|
|
* Determines if two Ranges are equal. Direction counts.
|
|
*
|
|
* @method
|
|
* @param {ve.Range}
|
|
* @returns {Boolean}
|
|
*/
|
|
ve.Range.prototype.equals = function ( other ) {
|
|
return this.from === other.from && this.to === other.to;
|
|
};
|
|
|
|
|
|
/**
|
|
* Creates a new ve.Range object.
|
|
*
|
|
* @method
|
|
* @param {Number} Length of the new range.
|
|
* @returns {ve.Range} A new range.
|
|
*/
|
|
ve.Range.prototype.truncate = function ( length ) {
|
|
this.normalize();
|
|
return new ve.Range(
|
|
this.start, Math.max( this.start, Math.min( this.start + length, this.end ) )
|
|
);
|
|
};
|
|
|
|
/**
|
|
* Determines if Range is collapsed or not.
|
|
* @method
|
|
* @returns {Boolean}
|
|
*/
|
|
ve.Range.prototype.isCollapsed = function () {
|
|
return this.from === this.to;
|
|
}; |