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

Merge branch 'master' into atom-shell

Browse Source 
Conflicts:
	.gitmodules
This commit is contained in:
Kevin Sawicki
2013-05-28 10:47:46 -07:00
parent 54de539b8b ea7ff135ee
commit 2bd95a2b57
32 changed files with 44 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/atom.coffee
View File

@@ -92,8 +92,16 @@ window.atom =
resolvePackagePath: (name) ->
return name if fsUtils.isDirectory(name)
path = fsUtils.resolve(config.packageDirPaths..., name)
path if fsUtils.isDirectory(path)
return path if fsUtils.isDirectory(path)
packagePath = fsUtils.join(window.resourcePath, 'node_modules', name)
return packagePath if @isInternalPackage(packagePath)
isInternalPackage: (packagePath) ->
{engines} = Package.loadMetadata(packagePath, true)
engines?.atom?
getLoadedPackage: (name) ->
@loadedPackages[name]
@@ -109,9 +117,14 @@ window.atom =
getAvailablePackagePaths: ->
packagePaths = []
for packageDirPath in config.packageDirPaths
for packagePath in fsUtils.list(packageDirPath)
packagePaths.push(packagePath) if fsUtils.isDirectory(packagePath)
for packagePath in fsUtils.list(fsUtils.join(window.resourcePath, 'node_modules'))
packagePaths.push(packagePath) if @isInternalPackage(packagePath)
_.uniq(packagePaths)
getAvailablePackageNames: ->