github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-06 20:55:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into as-cjk-soft-wrap

Browse Source 
# Conflicts:
#	spec/display-buffer-spec.coffee
This commit is contained in:
Antonio Scandurra
2015-10-16 10:23:44 +02:00
parent 4766c98bbe 4df007eb87
commit b03aa4bf40
116 changed files with 2585 additions and 2139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lines-component.coffee
View File

@@ -21,7 +21,7 @@ module.exports =
class LinesComponent extends TiledComponent
placeholderTextDiv: null
constructor: ({@presenter, @useShadowDOM, @domElementPool}) ->
constructor: ({@presenter, @useShadowDOM, @domElementPool, @assert, @grammars}) ->
@domNode = document.createElement('div')
@domNode.classList.add('lines')
@tilesNode = document.createElement("div")
@@ -72,7 +72,7 @@ class LinesComponent extends TiledComponent
@oldState.indentGuidesVisible = @newState.indentGuidesVisible
buildComponentForTile: (id) -> new LinesTileComponent({id, @presenter, @domElementPool})
buildComponentForTile: (id) -> new LinesTileComponent({id, @presenter, @domElementPool, @assert, @grammars})
buildEmptyState: ->
{tiles: {}}