From 2c31c2f15edca9000abc7daeff0f90a1977fac29 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Sep 2013 17:14:18 -0700 Subject: [PATCH 1/2] Use atom-api for requires --- lib/find-model.coffee | 9 +++------ lib/find-results-view.coffee | 5 +---- lib/find-view.coffee | 3 +-- lib/find.coffee | 2 +- lib/marker-view.coffee | 3 +-- lib/project-find-view.coffee | 5 +---- lib/project/path-view.coffee | 6 ++---- lib/project/preview-list.coffee | 4 +--- lib/project/search-result-view.coffee | 2 +- spec/find-view-spec.coffee | 9 +++------ spec/preview-list-spec.coffee | 2 +- spec/project-find-view-spec.coffee | 4 +--- 12 files changed, 17 insertions(+), 37 deletions(-) diff --git a/lib/find-model.coffee b/lib/find-model.coffee index 17789236..294ec201 100644 --- a/lib/find-model.coffee +++ b/lib/find-model.coffee @@ -1,7 +1,4 @@ -_ = require 'underscore' -EventEmitter = require 'event-emitter' -EditSession = require 'edit-session' -require 'underscore-extensions' +{_, EventEmitter} = require 'atom-api' module.exports = class FindModel @@ -23,9 +20,9 @@ class FindModel paneItem = rootView.getActivePaneItem() @destroyAllMarkers() - if paneItem instanceof EditSession + if paneItem?.getBuffer?()? @editSession = paneItem - @editSession?.getBuffer().on "contents-modified.find", (args) => + @editSession.getBuffer().on "contents-modified.find", (args) => @updateMarkers() unless @replacing serialize: -> diff --git a/lib/find-results-view.coffee b/lib/find-results-view.coffee index 8125c87b..d7de4ec1 100644 --- a/lib/find-results-view.coffee +++ b/lib/find-results-view.coffee @@ -1,7 +1,4 @@ -_ = require 'underscore' -{View} = require 'space-pen' -Editor = require 'editor' -Selection = require 'selection' +{_, Editor, View} = require 'atom-api' MarkerView = require './marker-view' module.exports = diff --git a/lib/find-view.coffee b/lib/find-view.coffee index d35c263d..3ea2eef1 100644 --- a/lib/find-view.coffee +++ b/lib/find-view.coffee @@ -1,6 +1,5 @@ shell = require 'shell' -{View} = require 'space-pen' -Editor = require 'editor' +{Editor, View} = require 'atom-api' FindModel = require './find-model' FindResultsView = require './find-results-view' History = require './history' diff --git a/lib/find.coffee b/lib/find.coffee index 6f793c14..a068b135 100644 --- a/lib/find.coffee +++ b/lib/find.coffee @@ -1,7 +1,7 @@ FindModel = require './find-model' FindView = require './find-view' ProjectFindView = require './project-find-view' -_ = require 'underscore' +{_} = require 'atom-api' module.exports = activate: ({viewState, projectViewState}={}) -> diff --git a/lib/marker-view.coffee b/lib/marker-view.coffee index aa881bbf..97a96bec 100644 --- a/lib/marker-view.coffee +++ b/lib/marker-view.coffee @@ -1,5 +1,4 @@ -_ = require 'underscore' -Subscriber = require 'subscriber' +{_, Subscriber} = require 'atom-api' module.exports = class MarkerView diff --git a/lib/project-find-view.coffee b/lib/project-find-view.coffee index 7ebbb2b0..797e3939 100644 --- a/lib/project-find-view.coffee +++ b/lib/project-find-view.coffee @@ -1,7 +1,4 @@ -_ = require 'underscore' -$ = require 'jquery' -{View} = require 'space-pen' -Editor = require 'editor' +{_, $, Editor, View} = require 'atom-api' History = require './history' PreviewList = require './project/preview-list' SearchResult = require './project/search-result' diff --git a/lib/project/path-view.coffee b/lib/project/path-view.coffee index bd812989..884f24c5 100644 --- a/lib/project/path-view.coffee +++ b/lib/project/path-view.coffee @@ -1,12 +1,10 @@ -{View} = require 'space-pen' -fsUtils = require 'fs-utils' +{$, fs, View} = require 'atom-api' SearchResultView = require './search-result-view' -$ = require 'jquery' module.exports = class PathView extends View @content: ({path, previewList} = {}) -> - iconClass = if fsUtils.isReadmePath(path) then 'icon-book' else 'icon-file-text' + iconClass = if fs.isReadmePath(path) then 'icon-book' else 'icon-file-text' @li class: 'path list-nested-item', => @div outlet: 'pathDetails', class: 'path-details list-item', => @span class: 'disclosure-arrow' diff --git a/lib/project/preview-list.coffee b/lib/project/preview-list.coffee index f1782ccf..219d746d 100644 --- a/lib/project/preview-list.coffee +++ b/lib/project/preview-list.coffee @@ -1,6 +1,4 @@ -$ = require 'jquery' -_ = require 'underscore' -ScrollView = require 'scroll-view' +{_, $, ScrollView} = require 'atom-api' PathView = require './path-view' module.exports = diff --git a/lib/project/search-result-view.coffee b/lib/project/search-result-view.coffee index 919f4bdf..5eaada92 100644 --- a/lib/project/search-result-view.coffee +++ b/lib/project/search-result-view.coffee @@ -1,4 +1,4 @@ -{View} = require 'space-pen' +{View} = require 'atom-api' module.exports = class SearchResultView extends View diff --git a/spec/find-view-spec.coffee b/spec/find-view-spec.coffee index fd96b49b..36863360 100644 --- a/spec/find-view-spec.coffee +++ b/spec/find-view-spec.coffee @@ -1,10 +1,7 @@ -$ = require 'jquery' -_ = require 'underscore' +{_, $, RootView} = require 'atom-api' shell = require 'shell' path = require 'path' -RootView = require 'root-view' -Project = require 'project' describe 'FindView', -> [editor, findView] = [] @@ -185,10 +182,10 @@ describe 'FindView', -> beforeEach -> anotherOpener = (pathToOpen, options) -> $('another') - Project.registerOpener(anotherOpener) + project.registerOpener(anotherOpener) afterEach -> - Project.unregisterOpener(anotherOpener) + project.unregisterOpener(anotherOpener) it "updates the result view", -> rootView.open "another" diff --git a/spec/preview-list-spec.coffee b/spec/preview-list-spec.coffee index 368f9de5..eb4eae12 100644 --- a/spec/preview-list-spec.coffee +++ b/spec/preview-list-spec.coffee @@ -1,4 +1,4 @@ -RootView = require 'root-view' +{RootView} = require 'atom-api' describe 'PreviewList', -> [projectFindView, previewList] = [] diff --git a/spec/project-find-view-spec.coffee b/spec/project-find-view-spec.coffee index 9f63b0f1..ce7ba437 100644 --- a/spec/project-find-view-spec.coffee +++ b/spec/project-find-view-spec.coffee @@ -1,7 +1,5 @@ path = require 'path' -$ = require 'jquery' -RootView = require 'root-view' -Project = require 'project' +{$, RootView} = require 'atom-api' describe 'ProjectFindView', -> [editor, projectFindView, searchPromise] = [] From 26763ddef76fcc7e430411a6146b6dced9e64e1d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 19 Sep 2013 12:04:38 -0700 Subject: [PATCH 2/2] Rename require from atom-api to atom --- lib/find-model.coffee | 2 +- lib/find-results-view.coffee | 2 +- lib/find-view.coffee | 2 +- lib/find.coffee | 2 +- lib/marker-view.coffee | 2 +- lib/project-find-view.coffee | 2 +- lib/project/path-view.coffee | 2 +- lib/project/preview-list.coffee | 2 +- lib/project/search-result-view.coffee | 2 +- spec/find-view-spec.coffee | 2 +- spec/preview-list-spec.coffee | 2 +- spec/project-find-view-spec.coffee | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/find-model.coffee b/lib/find-model.coffee index 294ec201..66b652a2 100644 --- a/lib/find-model.coffee +++ b/lib/find-model.coffee @@ -1,4 +1,4 @@ -{_, EventEmitter} = require 'atom-api' +{_, EventEmitter} = require 'atom' module.exports = class FindModel diff --git a/lib/find-results-view.coffee b/lib/find-results-view.coffee index d7de4ec1..cf7f52d3 100644 --- a/lib/find-results-view.coffee +++ b/lib/find-results-view.coffee @@ -1,4 +1,4 @@ -{_, Editor, View} = require 'atom-api' +{_, Editor, View} = require 'atom' MarkerView = require './marker-view' module.exports = diff --git a/lib/find-view.coffee b/lib/find-view.coffee index 3ea2eef1..43fc5653 100644 --- a/lib/find-view.coffee +++ b/lib/find-view.coffee @@ -1,5 +1,5 @@ shell = require 'shell' -{Editor, View} = require 'atom-api' +{Editor, View} = require 'atom' FindModel = require './find-model' FindResultsView = require './find-results-view' History = require './history' diff --git a/lib/find.coffee b/lib/find.coffee index a068b135..34de8b16 100644 --- a/lib/find.coffee +++ b/lib/find.coffee @@ -1,7 +1,7 @@ FindModel = require './find-model' FindView = require './find-view' ProjectFindView = require './project-find-view' -{_} = require 'atom-api' +{_} = require 'atom' module.exports = activate: ({viewState, projectViewState}={}) -> diff --git a/lib/marker-view.coffee b/lib/marker-view.coffee index 97a96bec..1a89180f 100644 --- a/lib/marker-view.coffee +++ b/lib/marker-view.coffee @@ -1,4 +1,4 @@ -{_, Subscriber} = require 'atom-api' +{_, Subscriber} = require 'atom' module.exports = class MarkerView diff --git a/lib/project-find-view.coffee b/lib/project-find-view.coffee index 797e3939..35de58a0 100644 --- a/lib/project-find-view.coffee +++ b/lib/project-find-view.coffee @@ -1,4 +1,4 @@ -{_, $, Editor, View} = require 'atom-api' +{_, $, Editor, View} = require 'atom' History = require './history' PreviewList = require './project/preview-list' SearchResult = require './project/search-result' diff --git a/lib/project/path-view.coffee b/lib/project/path-view.coffee index 884f24c5..6e9a5c2b 100644 --- a/lib/project/path-view.coffee +++ b/lib/project/path-view.coffee @@ -1,4 +1,4 @@ -{$, fs, View} = require 'atom-api' +{$, fs, View} = require 'atom' SearchResultView = require './search-result-view' module.exports = diff --git a/lib/project/preview-list.coffee b/lib/project/preview-list.coffee index 219d746d..e9d0facc 100644 --- a/lib/project/preview-list.coffee +++ b/lib/project/preview-list.coffee @@ -1,4 +1,4 @@ -{_, $, ScrollView} = require 'atom-api' +{_, $, ScrollView} = require 'atom' PathView = require './path-view' module.exports = diff --git a/lib/project/search-result-view.coffee b/lib/project/search-result-view.coffee index 5eaada92..122f15bf 100644 --- a/lib/project/search-result-view.coffee +++ b/lib/project/search-result-view.coffee @@ -1,4 +1,4 @@ -{View} = require 'atom-api' +{View} = require 'atom' module.exports = class SearchResultView extends View diff --git a/spec/find-view-spec.coffee b/spec/find-view-spec.coffee index 36863360..5cf1c8a2 100644 --- a/spec/find-view-spec.coffee +++ b/spec/find-view-spec.coffee @@ -1,4 +1,4 @@ -{_, $, RootView} = require 'atom-api' +{_, $, RootView} = require 'atom' shell = require 'shell' path = require 'path' diff --git a/spec/preview-list-spec.coffee b/spec/preview-list-spec.coffee index eb4eae12..7d001308 100644 --- a/spec/preview-list-spec.coffee +++ b/spec/preview-list-spec.coffee @@ -1,4 +1,4 @@ -{RootView} = require 'atom-api' +{RootView} = require 'atom' describe 'PreviewList', -> [projectFindView, previewList] = [] diff --git a/spec/project-find-view-spec.coffee b/spec/project-find-view-spec.coffee index ce7ba437..5a3a4fa2 100644 --- a/spec/project-find-view-spec.coffee +++ b/spec/project-find-view-spec.coffee @@ -1,5 +1,5 @@ path = require 'path' -{$, RootView} = require 'atom-api' +{$, RootView} = require 'atom' describe 'ProjectFindView', -> [editor, projectFindView, searchPromise] = []