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

Merge branch 'master' into atom-shell

Browse Source
This commit is contained in:
Kevin Sawicki
2013-06-03 09:38:47 -07:00
parent a6c37ff276 2b6a4365ac
commit 8c9aad9e34
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/config.coffee
View File

@@ -8,6 +8,7 @@ pathWatcher = require 'pathwatcher'
configDirPath = fsUtils.absolute("~/.atom")
bundledPackagesDirPath = fsUtils.join(resourcePath, "src/packages")
nodeModulesDirPath = fsUtils.join(resourcePath, "node_modules")
bundledThemesDirPath = fsUtils.join(resourcePath, "themes")
vendoredPackagesDirPath = fsUtils.join(resourcePath, "vendor/packages")
vendoredThemesDirPath = fsUtils.join(resourcePath, "vendor/themes")
@@ -23,7 +24,7 @@ module.exports =
class Config
configDirPath: configDirPath
themeDirPaths: [userThemesDirPath, bundledThemesDirPath, vendoredThemesDirPath]
bundledPackageDirPaths: [vendoredPackagesDirPath, bundledPackagesDirPath]
bundledPackageDirPaths: [vendoredPackagesDirPath, bundledPackagesDirPath, nodeModulesDirPath]
packageDirPaths: [userPackagesDirPath, vendoredPackagesDirPath, bundledPackagesDirPath]
userPackagesDirPath: userPackagesDirPath
userStoragePath: userStoragePath

1
src/app/package-config-view.coffee
View File

@@ -139,6 +139,7 @@ class PackageConfigView extends View
for packageDirPath in config.bundledPackageDirPaths
if packagePath.indexOf("#{packageDirPath}/") is 0
@bundled = true
break
version = loadedPackage?.metadata.version
unless version

2
vendor/apm vendored

Submodule vendor/apm updated: 831bf348c7...13385e0b36