Merge branch 'master' into batch-updates

This commit is contained in:
Antonio Scandurra
2015-02-28 10:21:48 +01:00
4 changed files with 25 additions and 12 deletions

View File

@@ -122,10 +122,10 @@ class GutterComponent
oldLineNumberState.top = newLineNumberState.top
oldLineNumberState.screenRow = newLineNumberState.screenRow
buildLineNumberClassName: ({bufferRow, foldable, decorationClasses}) ->
buildLineNumberClassName: ({bufferRow, foldable, decorationClasses, softWrapped}) ->
className = "line-number line-number-#{bufferRow}"
className += " " + decorationClasses.join(' ') if decorationClasses?
className += " foldable" if foldable
className += " foldable" if foldable and not softWrapped
className
lineNumberNodeForScreenRow: (screenRow) ->