colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-05 16:42:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

more formatting

Browse Source
This commit is contained in:
daboe01 authored and Alexander Ljungberg committed 2014-02-12 21:57:44 +00:00
1 parent e4163c5da4
commit 3063d53a2b
1 file changed
+17 -14
Download Patch File Download Diff File Expand all files Collapse all files
Foundation/CPAttributedString.j
+17 -14
View File
@@ -526,16 +526,18 @@
if (!aString)
aString = @"";
var lastValidIndex= MAX(_rangeEntries.length-1, 0);
var startingIndex = [self _indexOfEntryWithIndex: aRange.location];
var lastValidIndex = MAX(_rangeEntries.length - 1, 0),
startingIndex = [self _indexOfEntryWithIndex: aRange.location];
if (startingIndex < 0) startingIndex = lastValidIndex;
if (startingIndex < 0)
startingIndex = lastValidIndex;
var endingIndex = [self _indexOfEntryWithIndex: CPMaxRange(aRange)];
if (endingIndex < 0) endingIndex = lastValidIndex;
if (endingIndex < 0)
endingIndex = lastValidIndex;
var additionalLength = aString.length - aRange.length;
var patchPosition = startingIndex;
var additionalLength = aString.length - aRange.length,
patchPosition = startingIndex;
_string = _string.substring(0, aRange.location) + aString + _string.substring(CPMaxRange(aRange));
var originalLength= _rangeEntries[patchPosition].range.length;
@@ -551,16 +553,16 @@
if (endingIndex > startingIndex)
{
var originalOffset= _rangeEntries[startingIndex].range.location;
var offsetFromSplicing = CPMaxRange(_rangeEntries[endingIndex].range)-originalOffset
var originalOffset= _rangeEntries[startingIndex].range.location,
offsetFromSplicing = CPMaxRange(_rangeEntries[endingIndex].range)-originalOffset;
_rangeEntries.splice(startingIndex, endingIndex - startingIndex);
_rangeEntries[startingIndex].range=CPMakeRange(originalOffset, offsetFromSplicing);
_rangeEntries[startingIndex].range = CPMakeRange(originalOffset, offsetFromSplicing);
}
if (patchPosition !== startingIndex)
{ var lhsOffset=aString.length -CPIntersectionRange(_rangeEntries[patchPosition].range, aRange).length;
_rangeEntries[patchPosition].range.length = originalLength+lhsOffset;
var rhsOffset=aString.length -CPIntersectionRange(_rangeEntries[startingIndex].range, aRange).length;
if (patchPosition !== startingIndex)
{ var lhsOffset = aString.length -CPIntersectionRange(_rangeEntries[patchPosition].range, aRange).length;
_rangeEntries[patchPosition].range.length = originalLength + lhsOffset;
var rhsOffset = aString.length -CPIntersectionRange(_rangeEntries[startingIndex].range, aRange).length;
_rangeEntries[startingIndex].range.location += lhsOffset;
_rangeEntries[startingIndex].range.length += rhsOffset;
patchPosition= startingIndex;
@@ -601,7 +603,8 @@
endingEntryIndex = [self _indexOfRangeEntryForIndex:CPMaxRange(aRange) splitOnMaxIndex:YES],
current = startingEntryIndex;
if (current < 0) current = MAX(_rangeEntries.length-1, 0);
if (current < 0)
current = MAX(_rangeEntries.length - 1, 0);
if (endingEntryIndex === CPNotFound)
endingEntryIndex = _rangeEntries.length;