From c2f44efe311622d535f316aaa8893232c7cb2db0 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 22 Sep 2014 14:29:36 -0700 Subject: [PATCH] editor-view -> text-editor-view --- exports/atom.coffee | 2 +- spec/editor-component-spec.coffee | 2 +- spec/spec-helper.coffee | 2 +- spec/workspace-view-spec.coffee | 2 +- src/atom.coffee | 2 +- src/editor.coffee | 2 +- src/select-list-view.coffee | 2 +- src/{editor-view.coffee => text-editor-view.coffee} | 0 src/workspace-view.coffee | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename src/{editor-view.coffee => text-editor-view.coffee} (100%) diff --git a/exports/atom.coffee b/exports/atom.coffee index 6b97846ac..e0f3adc96 100644 --- a/exports/atom.coffee +++ b/exports/atom.coffee @@ -20,7 +20,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE module.exports.$ = $ module.exports.$$ = $$ module.exports.$$$ = $$$ - module.exports.EditorView = require '../src/editor-view' + module.exports.EditorView = require '../src/text-editor-view' module.exports.ScrollView = require '../src/scroll-view' module.exports.SelectListView = require '../src/select-list-view' module.exports.Task = require '../src/task' diff --git a/spec/editor-component-spec.coffee b/spec/editor-component-spec.coffee index 37712cf01..7ebcb1b30 100644 --- a/spec/editor-component-spec.coffee +++ b/spec/editor-component-spec.coffee @@ -1,7 +1,7 @@ _ = require 'underscore-plus' {extend, flatten, toArray, last} = _ -EditorView = require '../src/editor-view' +EditorView = require '../src/text-editor-view' EditorComponent = require '../src/text-editor-component' nbsp = String.fromCharCode(160) diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee index feaefb793..b9575491e 100644 --- a/spec/spec-helper.coffee +++ b/spec/spec-helper.coffee @@ -13,7 +13,7 @@ Config = require '../src/config' {Point} = require 'text-buffer' Project = require '../src/project' Editor = require '../src/editor' -EditorView = require '../src/editor-view' +EditorView = require '../src/text-editor-view' TokenizedBuffer = require '../src/tokenized-buffer' EditorComponent = require '../src/text-editor-component' pathwatcher = require 'pathwatcher' diff --git a/spec/workspace-view-spec.coffee b/spec/workspace-view-spec.coffee index 16956870f..1efc240f1 100644 --- a/spec/workspace-view-spec.coffee +++ b/spec/workspace-view-spec.coffee @@ -2,7 +2,7 @@ Q = require 'q' path = require 'path' temp = require 'temp' -EditorView = require '../src/editor-view' +EditorView = require '../src/text-editor-view' PaneView = require '../src/pane-view' Workspace = require '../src/workspace' diff --git a/src/atom.coffee b/src/atom.coffee index b3c1fc17a..181406bfc 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -468,7 +468,7 @@ class Atom extends Model dimensions = @restoreWindowDimensions() @config.load() @config.setDefaults('core', require('./workspace-view').configDefaults) - @config.setDefaults('editor', require('./editor-view').configDefaults) + @config.setDefaults('editor', require('./text-editor-view').configDefaults) @keymaps.loadBundledKeymaps() @themes.loadBaseStylesheets() @packages.loadPackages() diff --git a/src/editor.coffee b/src/editor.coffee index eb18ccc43..f382244af 100644 --- a/src/editor.coffee +++ b/src/editor.coffee @@ -163,7 +163,7 @@ class Editor extends Model @subscribe @displayBuffer.onDidRemoveDecoration (decoration) => @emit 'decoration-removed', decoration getViewClass: -> - require './editor-view' + require './text-editor-view' destroyed: -> @unsubscribe() diff --git a/src/select-list-view.coffee b/src/select-list-view.coffee index b3cc4a1bc..51721785b 100644 --- a/src/select-list-view.coffee +++ b/src/select-list-view.coffee @@ -1,5 +1,5 @@ {$, View} = require './space-pen-extensions' -EditorView = require './editor-view' +EditorView = require './text-editor-view' fuzzyFilter = require('fuzzaldrin').filter # Essential: Provides a view that renders a list of items with an editor that diff --git a/src/editor-view.coffee b/src/text-editor-view.coffee similarity index 100% rename from src/editor-view.coffee rename to src/text-editor-view.coffee diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee index b679c4bea..eb54cbc3c 100644 --- a/src/workspace-view.coffee +++ b/src/workspace-view.coffee @@ -456,7 +456,7 @@ class WorkspaceView extends View deprecate('Use Workspace::onDidOpen instead') originalWorkspaceViewOn.apply(this, arguments) - EditorView = require './editor-view' + EditorView = require './text-editor-view' originalEditorViewOn = EditorView::on EditorView::on = (eventName) -> switch eventName