Comparar commits

...

3 Commits

Autor SHA1 Mensagem Data
Kevin Sawicki 6e8e4a56cf Use String::indexOf instead of String::startsWith
String::startsWith isn't available in the browser process yet.
2014-11-07 13:20:37 -08:00
Kevin Sawicki e53c38f09d Guard against no atom globals 2014-11-07 13:11:00 -08:00
Kevin Sawicki 587b73e3b9 Pass in resourcePath and devMode to Package.loadMetadata 2014-11-07 13:07:21 -08:00
2 arquivos alterados com 12 adições e 9 exclusões
+2 -2
Ver Arquivo
@@ -228,7 +228,7 @@ class PackageManager
packages = []
for packagePath in @getAvailablePackagePaths()
name = path.basename(packagePath)
metadata = @getLoadedPackage(name)?.metadata ? Package.loadMetadata(packagePath, true)
metadata = @getLoadedPackage(name)?.metadata ? Package.loadMetadata(packagePath, {ignoreErrors: true, @resourcePath, @devMode})
packages.push(metadata)
packages
@@ -252,7 +252,7 @@ class PackageManager
@packageDependencies
hasAtomEngine: (packagePath) ->
metadata = Package.loadMetadata(packagePath, true)
metadata = Package.loadMetadata(packagePath, ignoreErrors: true)
metadata?.engines?.atom?
unobserveDisabledPackages: ->
+10 -7
Ver Arquivo
@@ -26,16 +26,19 @@ class Package
@stylesheetsDir: 'stylesheets'
@isBundledPackagePath: (packagePath) ->
if atom.packages.devMode
return false unless atom.packages.resourcePath.startsWith("#{process.resourcesPath}#{path.sep}")
@isBundledPackagePath: (packagePath, resourcePath, devMode) ->
resourcePath ?= atom?.packages.resourcePath
devMode ?= atom?.packages.devMode
@resourcePathWithTrailingSlash ?= "#{atom.packages.resourcePath}#{path.sep}"
packagePath?.startsWith(@resourcePathWithTrailingSlash)
if devMode
return false unless resourcePath.indexOf("#{process.resourcesPath}#{path.sep}") is 0
@loadMetadata: (packagePath, ignoreErrors=false) ->
@resourcePathWithTrailingSlash ?= "#{resourcePath}#{path.sep}"
packagePath?.indexOf(@resourcePathWithTrailingSlash) is 0
@loadMetadata: (packagePath, {ignoreErrors, devMode, resourcePath}={}) ->
packageName = path.basename(packagePath)
if @isBundledPackagePath(packagePath)
if @isBundledPackagePath(packagePath, resourcePath, devMode)
metadata = packagesCache[packageName]?.metadata
unless metadata?
if metadataPath = CSON.resolve(path.join(packagePath, 'package'))