mirror of
https://github.com/atom/atom.git
synced 2026-04-28 03:01:47 -04:00
Rename AtomPackage.packageMain to .mainModule
This commit is contained in:
@@ -6,7 +6,7 @@ $ = require 'jquery'
|
||||
module.exports =
|
||||
class AtomPackage extends Package
|
||||
metadata: null
|
||||
packageMain: null
|
||||
mainModule: null
|
||||
deferActivation: false
|
||||
|
||||
load: ->
|
||||
@@ -48,17 +48,17 @@ class AtomPackage extends Package
|
||||
else
|
||||
try
|
||||
if @requirePackageMain()
|
||||
config.setDefaults(@name, @packageMain.configDefaults)
|
||||
config.setDefaults(@name, @mainModule.configDefaults)
|
||||
atom.activateAtomPackage(this)
|
||||
catch e
|
||||
console.warn "Failed to activate package named '#{@name}'", e.stack
|
||||
|
||||
requirePackageMain: ->
|
||||
return @packageMain if @packageMain
|
||||
return @mainModule if @mainModule
|
||||
mainPath = @path
|
||||
mainPath = fs.join(mainPath, @metadata.main) if @metadata.main
|
||||
mainPath = require.resolve(mainPath)
|
||||
@packageMain = require(mainPath) if fs.isFile(mainPath)
|
||||
@mainModule = require(mainPath) if fs.isFile(mainPath)
|
||||
|
||||
registerDeferredDeserializers: ->
|
||||
for deserializerName in @metadata.deferredDeserializers ? []
|
||||
|
||||
@@ -24,10 +24,10 @@ _.extend atom,
|
||||
|
||||
activateAtomPackage: (pack) ->
|
||||
@activatedAtomPackages.push(pack)
|
||||
pack.packageMain.activate(@atomPackageStates[pack.name] ? {})
|
||||
pack.mainModule.activate(@atomPackageStates[pack.name] ? {})
|
||||
|
||||
deactivateAtomPackages: ->
|
||||
pack.packageMain.deactivate?() for pack in @activatedAtomPackages
|
||||
pack.mainModule.deactivate?() for pack in @activatedAtomPackages
|
||||
@activatedAtomPackages = []
|
||||
|
||||
serializeAtomPackages: ->
|
||||
@@ -35,7 +35,7 @@ _.extend atom,
|
||||
for pack in @loadedPackages
|
||||
if pack in @activatedAtomPackages
|
||||
try
|
||||
packageStates[pack.name] = pack.packageMain.serialize?()
|
||||
packageStates[pack.name] = pack.mainModule.serialize?()
|
||||
catch e
|
||||
console?.error("Exception serializing '#{pack.name}' package's module\n", e.stack)
|
||||
else
|
||||
|
||||
@@ -7,7 +7,7 @@ describe "CommandLogger", ->
|
||||
beforeEach ->
|
||||
window.rootView = new RootView
|
||||
rootView.open('sample.js')
|
||||
commandLogger = window.loadPackage('command-logger').packageMain
|
||||
commandLogger = window.loadPackage('command-logger').mainModule
|
||||
commandLogger.eventLog = {}
|
||||
editor = rootView.getActiveView()
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ describe "CommandPanel", ->
|
||||
rootView.enableKeymap()
|
||||
editSession = rootView.getActivePaneItem()
|
||||
buffer = editSession.buffer
|
||||
commandPanelMain = window.loadPackage('command-panel', activateImmediately: true).packageMain
|
||||
commandPanelMain = window.loadPackage('command-panel', activateImmediately: true).mainModule
|
||||
commandPanel = commandPanelMain.commandPanelView
|
||||
commandPanel.history = []
|
||||
commandPanel.historyIndex = 0
|
||||
|
||||
@@ -17,7 +17,7 @@ describe "EditorStats", ->
|
||||
beforeEach ->
|
||||
window.rootView = new RootView
|
||||
rootView.open('sample.js')
|
||||
editorStats = window.loadPackage('editor-stats').packageMain.stats
|
||||
editorStats = window.loadPackage('editor-stats').mainModule.stats
|
||||
|
||||
describe "when a keyup event is triggered", ->
|
||||
beforeEach ->
|
||||
|
||||
@@ -13,7 +13,7 @@ describe 'FuzzyFinder', ->
|
||||
window.rootView = new RootView
|
||||
rootView.open('sample.js')
|
||||
rootView.enableKeymap()
|
||||
finderView = window.loadPackage("fuzzy-finder").packageMain.createView()
|
||||
finderView = window.loadPackage("fuzzy-finder").mainModule.createView()
|
||||
|
||||
describe "file-finder behavior", ->
|
||||
describe "toggling", ->
|
||||
|
||||
@@ -50,7 +50,7 @@ describe "TreeView", ->
|
||||
rootView.deactivate()
|
||||
window.rootView = new RootView()
|
||||
rootView.open()
|
||||
treeView = window.loadPackage("tree-view").packageMain.createView()
|
||||
treeView = window.loadPackage("tree-view").mainModule.createView()
|
||||
|
||||
it "does not attach to the root view or create a root node when initialized", ->
|
||||
expect(treeView.hasParent()).toBeFalsy()
|
||||
@@ -76,13 +76,13 @@ describe "TreeView", ->
|
||||
rootView.deactivate()
|
||||
window.rootView = new RootView
|
||||
rootView.open('tree-view.js')
|
||||
treeView = window.loadPackage("tree-view").packageMain.createView()
|
||||
treeView = window.loadPackage("tree-view").mainModule.createView()
|
||||
expect(treeView.hasParent()).toBeFalsy()
|
||||
expect(treeView.root).toExist()
|
||||
|
||||
describe "when the root view is opened to a directory", ->
|
||||
it "attaches to the root view", ->
|
||||
treeView = window.loadPackage("tree-view").packageMain.createView()
|
||||
treeView = window.loadPackage("tree-view").mainModule.createView()
|
||||
expect(treeView.hasParent()).toBeTruthy()
|
||||
expect(treeView.root).toExist()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user