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

Merge branch 'master' into dont-require-assert

Browse Source
This commit is contained in:
joshaber
2016-04-28 09:48:52 -04:00
parent 46c97ee2b2 c4d4e0f636
commit 23023a7a3d
9 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/text-editor.coffee
View File

@@ -81,7 +81,6 @@ class TextEditor extends Model
state.clipboard = atomEnvironment.clipboard
state.grammarRegistry = atomEnvironment.grammars
state.assert = atomEnvironment.assert.bind(atomEnvironment)
state.applicationDelegate = atomEnvironment.applicationDelegate
editor = new this(state)
if state.registered
disposable = atomEnvironment.textEditors.add(editor)
@@ -95,7 +94,7 @@ class TextEditor extends Model
@softTabs, @firstVisibleScreenRow, @firstVisibleScreenColumn, initialLine, initialColumn, tabLength,
softWrapped, @displayBuffer, @selectionsMarkerLayer, buffer, suppressCursorCreation,
@mini, @placeholderText, lineNumberGutterVisible, largeFileMode, @config, @clipboard, @grammarRegistry,
@assert, @applicationDelegate, grammar, showInvisibles, @autoHeight, @scrollPastEnd
@assert, grammar, showInvisibles, @autoHeight, @scrollPastEnd
} = params
throw new Error("Must pass a config parameter when constructing TextEditors") unless @config?
@@ -510,7 +509,7 @@ class TextEditor extends Model
@buffer, displayBuffer, selectionsMarkerLayer, @tabLength, softTabs,
suppressCursorCreation: true, @config,
@firstVisibleScreenRow, @firstVisibleScreenColumn,
@clipboard, @grammarRegistry, @assert, @applicationDelegate
@clipboard, @grammarRegistry, @assert
})
newEditor