From 8660670ae3bd16c02e4f465df17d900bb8475045 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 21 Feb 2013 18:01:02 -0800 Subject: [PATCH] Replace RootView.getActiveEditor() with getActiveView() --- .../autocomplete/spec/autocomplete-spec.coffee | 4 ++-- src/packages/autoflow/spec/autoflow-spec.coffee | 2 +- .../spec/bracket-matcher-spec.coffee | 2 +- .../command-logger/spec/command-logger-spec.coffee | 2 +- src/packages/gists/lib/gists.coffee | 2 +- src/packages/gists/spec/gists-spec.coffee | 2 +- src/packages/go-to-line/lib/go-to-line-view.coffee | 4 ++-- .../go-to-line/spec/go-to-line-spec.coffee | 2 +- .../lib/markdown-preview-view.coffee | 4 ++-- .../spec/markdown-preview-spec.coffee | 14 +++++++------- .../spec/strip-trailing-whitespace-spec.coffee | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/packages/autocomplete/spec/autocomplete-spec.coffee b/src/packages/autocomplete/spec/autocomplete-spec.coffee index 6912fd5b4..d85b8b507 100644 --- a/src/packages/autocomplete/spec/autocomplete-spec.coffee +++ b/src/packages/autocomplete/spec/autocomplete-spec.coffee @@ -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() diff --git a/src/packages/autoflow/spec/autoflow-spec.coffee b/src/packages/autoflow/spec/autoflow-spec.coffee index d717bcf85..190ac238c 100644 --- a/src/packages/autoflow/spec/autoflow-spec.coffee +++ b/src/packages/autoflow/spec/autoflow-spec.coffee @@ -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", -> diff --git a/src/packages/bracket-matcher/spec/bracket-matcher-spec.coffee b/src/packages/bracket-matcher/spec/bracket-matcher-spec.coffee index ff56fec57..099be0926 100644 --- a/src/packages/bracket-matcher/spec/bracket-matcher-spec.coffee +++ b/src/packages/bracket-matcher/spec/bracket-matcher-spec.coffee @@ -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 diff --git a/src/packages/command-logger/spec/command-logger-spec.coffee b/src/packages/command-logger/spec/command-logger-spec.coffee index 7210c171f..4305f9ada 100644 --- a/src/packages/command-logger/spec/command-logger-spec.coffee +++ b/src/packages/command-logger/spec/command-logger-spec.coffee @@ -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", -> diff --git a/src/packages/gists/lib/gists.coffee b/src/packages/gists/lib/gists.coffee index 4cc241fcd..6df96a01d 100644 --- a/src/packages/gists/lib/gists.coffee +++ b/src/packages/gists/lib/gists.coffee @@ -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: {} } diff --git a/src/packages/gists/spec/gists-spec.coffee b/src/packages/gists/spec/gists-spec.coffee index 430b727ad..3091f8ed6 100644 --- a/src/packages/gists/spec/gists-spec.coffee +++ b/src/packages/gists/spec/gists-spec.coffee @@ -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", -> diff --git a/src/packages/go-to-line/lib/go-to-line-view.coffee b/src/packages/go-to-line/lib/go-to-line-view.coffee index 1f24afd39..d1da9b764 100644 --- a/src/packages/go-to-line/lib/go-to-line-view.coffee +++ b/src/packages/go-to-line/lib/go-to-line-view.coffee @@ -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() diff --git a/src/packages/go-to-line/spec/go-to-line-spec.coffee b/src/packages/go-to-line/spec/go-to-line-spec.coffee index fe0c8b7df..bddef9426 100644 --- a/src/packages/go-to-line/spec/go-to-line-spec.coffee +++ b/src/packages/go-to-line/spec/go-to-line-spec.coffee @@ -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]) diff --git a/src/packages/markdown-preview/lib/markdown-preview-view.coffee b/src/packages/markdown-preview/lib/markdown-preview-view.coffee index 0560030a0..b78827a83 100644 --- a/src/packages/markdown-preview/lib/markdown-preview-view.coffee +++ b/src/packages/markdown-preview/lib/markdown-preview-view.coffee @@ -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)) diff --git a/src/packages/markdown-preview/spec/markdown-preview-spec.coffee b/src/packages/markdown-preview/spec/markdown-preview-spec.coffee index a195f907d..6e5ca6f0e 100644 --- a/src/packages/markdown-preview/spec/markdown-preview-spec.coffee +++ b/src/packages/markdown-preview/spec/markdown-preview-spec.coffee @@ -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() diff --git a/src/packages/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee b/src/packages/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee index f76f5b38d..e1fc838de 100644 --- a/src/packages/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee +++ b/src/packages/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee @@ -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)