mirror of
https://github.com/atom/atom.git
synced 2026-04-28 03:01:47 -04:00
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:
@@ -1,3 +1,4 @@
|
||||
require 'underscore-extensions'
|
||||
_ = require 'underscore'
|
||||
|
||||
module.exports =
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user