Merge remote-tracking branch 'origin/dev' into md-preview-redux

Conflicts:
	src/packages/markdown-preview/stylesheets/markdown-preview.css
	static/atom.css
	static/command-panel.css
This commit is contained in:
Corey Johnson
2013-03-11 17:02:36 -07:00
63 changed files with 6172 additions and 842 deletions

View File

@@ -1,3 +1,4 @@
require 'underscore-extensions'
_ = require 'underscore'
module.exports =

View File

@@ -63,11 +63,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
@traverseTree(rootPath, onPath, onPath)
paths
@@ -75,7 +75,7 @@ module.exports =
listTree: (rootPath) ->
paths = []
onPath = (path) =>
paths.push(@join(rootPath, path))
paths.push(path)
true
@traverseTree(rootPath, onPath, onPath)
paths

View File

@@ -66,6 +66,13 @@ exts =
evaluated = exts.js(file, compiled)
$native.write(cacheFilePath, compiled) if writeToCache
evaluated
less: (file) ->
output = ""
(new less.Parser).parse __read(file), (e, tree) ->
throw new Error(e.message, file, e.line) if e
output = tree.toCSS()
output
getPath = (path) ->
path = resolve(path)