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

Replace RootView.getActiveEditor() with getActiveView()

Browse Source
This commit is contained in:
Kevin Sawicki
2013-02-21 18:01:02 -08:00
committed by probablycorey
parent ff899e9c1b
commit 8660670ae3
11 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/packages/autocomplete/spec/autocomplete-spec.coffee
View File

@@ -17,8 +17,8 @@ describe "Autocomplete", ->
autocompletePackage = window.loadPackage("autocomplete")
expect(AutocompleteView.prototype.initialize).not.toHaveBeenCalled()
leftEditor = rootView.getActiveEditor()
rightEditor = rootView.getActiveEditor().splitRight()
leftEditor = rootView.getActiveView()
rightEditor = leftEditor.splitRight()
leftEditor.trigger 'autocomplete:attach'
expect(leftEditor.find('.autocomplete')).toExist()

2
src/packages/autoflow/spec/autoflow-spec.coffee
View File

@@ -7,7 +7,7 @@ describe "Autoflow package", ->
window.rootView = new RootView
rootView.open()
window.loadPackage 'autoflow'
editor = rootView.getActiveEditor()
editor = rootView.getActiveView()
config.set('editor.preferredLineLength', 30)
describe "autoflow:reflow-paragraph", ->

2
src/packages/bracket-matcher/spec/bracket-matcher-spec.coffee
View File

@@ -8,7 +8,7 @@ describe "bracket matching", ->
rootView.open('sample.js')
window.loadPackage('bracket-matcher')
rootView.attachToDom()
editor = rootView.getActiveEditor()
editor = rootView.getActiveView()
editSession = editor.activeEditSession
buffer = editSession.buffer

2
src/packages/command-logger/spec/command-logger-spec.coffee
View File

@@ -9,7 +9,7 @@ describe "CommandLogger", ->
rootView.open('sample.js')
commandLogger = window.loadPackage('command-logger').packageMain
commandLogger.eventLog = {}
editor = rootView.getActiveEditor()
editor = rootView.getActiveView()
describe "when a command is triggered", ->
it "records the number of times the command is triggered", ->

2
src/packages/gists/lib/gists.coffee
View File

@@ -9,7 +9,7 @@ class Gists
rootView.command 'gist:create', '.editor', => @createGist()
createGist: (editor) ->
editor = rootView.getActiveEditor()
editor = rootView.getActiveView()
return unless editor?
gist = { public: false, files: {} }

2
src/packages/gists/spec/gists-spec.coffee
View File

@@ -8,7 +8,7 @@ describe "Gists package", ->
window.rootView = new RootView
rootView.open('sample.js')
window.loadPackage('gists')
editor = rootView.getActiveEditor()
editor = rootView.getActiveView()
spyOn($, 'ajax')
describe "when gist:create is triggered on an editor", ->

4
src/packages/go-to-line/lib/go-to-line-view.coffee
View File

@@ -38,7 +38,7 @@ class GoToLineView extends View
confirm: ->
lineNumber = @miniEditor.getText()
editor = rootView.getActiveEditor()
editor = rootView.getActiveView()
@detach()
@@ -51,5 +51,5 @@ class GoToLineView extends View
attach: ->
@previouslyFocusedElement = $(':focus')
rootView.append(this)
@message.text("Enter a line number 1-#{rootView.getActiveEditor().getLineCount()}")
@message.text("Enter a line number 1-#{rootView.getActiveView().getLineCount()}")
@miniEditor.focus()

2
src/packages/go-to-line/spec/go-to-line-spec.coffee
View File

@@ -8,7 +8,7 @@ describe 'GoToLine', ->
window.rootView = new RootView
rootView.open('sample.js')
rootView.enableKeymap()
editor = rootView.getActiveEditor()
editor = rootView.getActiveView()
goToLine = GoToLineView.activate()
editor.setCursorBufferPosition([1,0])

4
src/packages/markdown-preview/lib/markdown-preview-view.coffee
View File

@@ -40,7 +40,7 @@ class MarkdownPreviewView extends ScrollView
@detaching = false
getActiveText: ->
rootView.getActiveEditor()?.getText()
rootView.getActiveView()?.getText()
getErrorHtml: (error) ->
$$$ ->
@@ -74,7 +74,7 @@ class MarkdownPreviewView extends ScrollView
@markdownBody.html(html) if @hasParent()
isMarkdownEditor: (path) ->
editor = rootView.getActiveEditor()
editor = rootView.getActiveView()
return unless editor?
return true if editor.getGrammar().scopeName is 'source.gfm'
path and fs.isMarkdownExtension(fs.extension(path))

14
src/packages/markdown-preview/spec/markdown-preview-spec.coffee
View File

@@ -13,7 +13,7 @@ describe "MarkdownPreview", ->
describe "markdown-preview:toggle event", ->
it "toggles on/off a preview for a .md file", ->
rootView.open('file.md')
editor = rootView.getActiveEditor()
editor = rootView.getActiveView()
expect(rootView.find('.markdown-preview')).not.toExist()
editor.trigger('markdown-preview:toggle')
@@ -25,7 +25,7 @@ describe "MarkdownPreview", ->
it "displays a preview for a .markdown file", ->
rootView.open('file.markdown')
editor = rootView.getActiveEditor()
editor = rootView.getActiveView()
expect(rootView.find('.markdown-preview')).not.toExist()
editor.trigger('markdown-preview:toggle')
expect(rootView.find('.markdown-preview')).toExist()
@@ -35,7 +35,7 @@ describe "MarkdownPreview", ->
it "displays a preview for a file with the source.gfm grammar scope", ->
gfmGrammar = _.find syntax.grammars, (grammar) -> grammar.scopeName is 'source.gfm'
rootView.open('file.js')
editor = rootView.getActiveEditor()
editor = rootView.getActiveView()
project.addGrammarOverrideForPath(editor.getPath(), gfmGrammar)
editor.reloadGrammar()
expect(rootView.find('.markdown-preview')).not.toExist()
@@ -46,7 +46,7 @@ describe "MarkdownPreview", ->
it "does not display a preview for non-markdown file", ->
rootView.open('file.js')
editor = rootView.getActiveEditor()
editor = rootView.getActiveView()
expect(rootView.find('.markdown-preview')).not.toExist()
editor.trigger('markdown-preview:toggle')
expect(rootView.find('.markdown-preview')).not.toExist()
@@ -55,7 +55,7 @@ describe "MarkdownPreview", ->
describe "core:cancel event", ->
it "removes markdown preview", ->
rootView.open('file.md')
editor = rootView.getActiveEditor()
editor = rootView.getActiveView()
expect(rootView.find('.markdown-preview')).not.toExist()
editor.trigger('markdown-preview:toggle')
@@ -68,7 +68,7 @@ describe "MarkdownPreview", ->
it "removes the markdown preview view", ->
rootView.attachToDom()
rootView.open('file.md')
editor = rootView.getActiveEditor()
editor = rootView.getActiveView()
expect(rootView.find('.markdown-preview')).not.toExist()
editor.trigger('markdown-preview:toggle')
@@ -79,6 +79,6 @@ describe "MarkdownPreview", ->
describe "when no editor is open", ->
it "does not attach", ->
expect(rootView.getActiveEditor()).toBeFalsy()
expect(rootView.getActiveView()).toBeFalsy()
rootView.trigger('markdown-preview:toggle')
expect(rootView.find('.markdown-preview')).not.toExist()

2
src/packages/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee
View File

@@ -12,7 +12,7 @@ describe "StripTrailingWhitespace", ->
window.loadPackage('strip-trailing-whitespace')
rootView.focus()
editor = rootView.getActiveEditor()
editor = rootView.getActiveView()
afterEach ->
fs.remove(path) if fs.exists(path)