github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-14 16:45:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ns-use-display-layers

Browse Source
This commit is contained in:
Antonio Scandurra
2016-03-22 12:01:07 +01:00
parent 8f2ebe8b79 64308bbacb
commit 227670a407
16 changed files with 423 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/text-editor.coffee
View File

@@ -88,8 +88,9 @@ class TextEditor extends Model
state.assert = atomEnvironment.assert.bind(atomEnvironment)
state.applicationDelegate = atomEnvironment.applicationDelegate
editor = new this(state)
disposable = atomEnvironment.textEditors.add(editor)
editor.onDidDestroy -> disposable.dispose()
if state.registered
disposable = atomEnvironment.textEditors.add(editor)
editor.onDidDestroy -> disposable.dispose()
editor
constructor: (params={}) ->
@@ -167,6 +168,7 @@ class TextEditor extends Model
firstVisibleScreenColumn: @getFirstVisibleScreenColumn()
displayBuffer: @displayBuffer.serialize()
selectionsMarkerLayerId: @selectionsMarkerLayer.id
registered: atom.textEditors.editors.has this
subscribeToBuffer: ->
@buffer.retain()