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

Merge branch 'master' into ns-mb-detangle-editor

Browse Source
This commit is contained in:
Max Brunsfeld
2016-08-09 13:36:46 -07:00
parent 2c506840a5 d2ed4712ab
commit 16a22b9f28
2 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/workspace.coffee
View File

@@ -166,6 +166,8 @@ class Workspace extends Model
if item instanceof TextEditor
@textEditorRegistry.maintainConfig(item)
@textEditorRegistry.maintainGrammar(item)
grammarSubscription = item.observeGrammar(@handleGrammarUsed.bind(this))
item.onDidDestroy -> grammarSubscription.dispose()
@emitter.emit 'did-add-text-editor', {textEditor: item, pane, index}
# Updates the application's title and proxy icon based on whichever file is
@@ -558,10 +560,7 @@ class Workspace extends Model
@project.bufferForPath(filePath, options).then (buffer) =>
editor = @buildTextEditor(Object.assign({buffer, largeFileMode}, options))
disposable = atom.textEditors.add(editor)
grammarSubscription = editor.observeGrammar(@handleGrammarUsed.bind(this))
editor.onDidDestroy ->
grammarSubscription.dispose()
disposable.dispose()
editor.onDidDestroy -> disposable.dispose()
editor
handleGrammarUsed: (grammar) ->