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

Merge remote-tracking branch 'origin/master' into cefode

Browse Source 
Conflicts:
	native/v8_extensions/native.mm
	spec/app/config-spec.coffee
	spec/app/window-spec.coffee
	spec/spec-helper.coffee
	spec/stdlib/fs-utils-spec.coffee
	src/app/atom-package.coffee
	src/app/config.coffee
	src/app/window.coffee
	src/packages/fuzzy-finder/lib/load-paths-handler.coffee
	src/packages/markdown-preview/lib/markdown-preview-view.coffee
	src/packages/tree-view/spec/tree-view-spec.coffee
	src/stdlib/require.coffee
This commit is contained in:
Kevin Sawicki & Nathan Sobo
2013-03-20 10:46:50 -06:00
parent aae705e82c 9c6978e913
commit 501dc9b76c
104 changed files with 6970 additions and 1164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/stdlib/fs-utils.coffee
View File

@@ -86,11 +86,11 @@ module.exports =
paths = []
if extensions
onPath = (path) =>
paths.push(@join(rootPath, path)) if _.contains(extensions, @extension(path))
paths.push(path) if _.contains(extensions, @extension(path))
false
else
onPath = (path) =>
paths.push(@join(rootPath, path))
paths.push(path)
false
@traverseTreeSync(rootPath, onPath, onPath)
paths
@@ -98,7 +98,7 @@ module.exports =
listTree: (rootPath) ->
paths = []
onPath = (path) =>
paths.push(@join(rootPath, path))
paths.push(path)
true
@traverseTreeSync(rootPath, onPath, onPath)
paths
@@ -162,9 +162,9 @@ module.exports =
absolutePath = @join(rootPath, file)
stats = fs.statSync(absolutePath)
if stats.isDirectory()
traverse(absolutePath, relativePath, onFile, onDirectory) if onDirectory(relativePath)
traverse(absolutePath, relativePath, onFile, onDirectory) if onDirectory(absolutePath)
else if stats.isFile()
onFile(relativePath)
onFile(absolutePath)
traverse(rootPath, '', onFile, onDirectory)