github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 22:38:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

🎨

Browse Source
This commit is contained in:
Antonio Scandurra
2015-09-09 14:26:47 +02:00
parent fe039a0f3c
commit 246476f759
2 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/line-numbers-tile-component.coffee
View File

@@ -77,32 +77,33 @@ class LineNumbersTileComponent
@lineNumberIdsByScreenRow[lineNumberState.screenRow] = id
@oldTileState.lineNumbers[id] = _.clone(lineNumberState)
if newLineNumberIds?
WrapperDiv.innerHTML = newLineNumbersHTML
newLineNumberNodes = _.toArray(WrapperDiv.children)
newLineNumberNodes = _.sortBy(newLineNumberNodes, @screenRowForNode)
while newNode = newLineNumberNodes.shift()
oldLineNumberNodes = _.toArray(@domNode.children)
while oldNode = oldLineNumberNodes.shift()
break if @screenRowForNode(newNode) < @screenRowForNode(oldNode)
return unless newLineNumberIds?
id = @lineNumberIdsByScreenRow[newNode.dataset.screenRow]
@lineNumberNodesById[id] = newNode
if oldNode?
@domNode.insertBefore(newNode, oldNode)
else
@domNode.appendChild(newNode)
WrapperDiv.innerHTML = newLineNumbersHTML
newLineNumberNodes = _.toArray(WrapperDiv.children)
@insertNodes(newLineNumberNodes)
insertNodes: (lineNumberNodes) ->
lineNumberNodes = _.sortBy(lineNumberNodes, @screenRowForNode)
while newNode = lineNumberNodes.shift()
id = @lineNumberIdsByScreenRow[newNode.dataset.screenRow]
domNodes = _.toArray(@domNode.children)
while nextNode = domNodes.shift()
break if @screenRowForNode(newNode) < @screenRowForNode(nextNode)
if nextNode?
@domNode.insertBefore(newNode, nextNode)
else
@domNode.appendChild(newNode)
@lineNumberNodesById[id] = newNode
return
screenRowForNode: (node) -> parseInt(node.dataset.screenRow)
buildLineNumberHTML: (lineNumberState) ->
{screenRow, bufferRow, softWrapped, top, decorationClasses, zIndex} = lineNumberState
if screenRow?
style = "position: absolute; top: #{top}px; z-index: #{zIndex};"
else
style = "visibility: hidden;"
className = @buildLineNumberClassName(lineNumberState)
innerHTML = @buildLineNumberInnerHTML(bufferRow, softWrapped)

23
src/lines-tile-component.coffee
View File

@@ -106,20 +106,23 @@ class LinesTileComponent
WrapperDiv.innerHTML = newLinesHTML
newLineNodes = _.toArray(WrapperDiv.children)
newLineNodes = _.sortBy(newLineNodes, @screenRowForNode)
@insertLineNodes(newLineNodes)
while newLineNode = newLineNodes.shift()
oldLineNodes = _.rest(@domNode.children) # skips highlights node
while oldLineNode = oldLineNodes.shift()
break if @screenRowForNode(newLineNode) < @screenRowForNode(oldLineNode)
insertLineNodes: (lineNodes) ->
lineNodes = _.sortBy(lineNodes, @screenRowForNode)
while newNode = lineNodes.shift()
id = @lineIdsByScreenRow[newNode.dataset.screenRow]
id = @lineIdsByScreenRow[newLineNode.dataset.screenRow]
@lineNodesByLineId[id] = newLineNode
if oldLineNode?
@domNode.insertBefore(newLineNode, oldLineNode)
domNodes = _.rest(@domNode.children) # skips highlights node
while nextNode = domNodes.shift()
break if @screenRowForNode(newNode) < @screenRowForNode(nextNode)
if nextNode?
@domNode.insertBefore(newNode, nextNode)
else
@domNode.appendChild(newLineNode)
@domNode.appendChild(newNode)
@lineNodesByLineId[id] = newNode
return
screenRowForNode: (node) -> parseInt(node.dataset.screenRow)