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/dev' into sidebar

Browse Source
This commit is contained in:
Corey Johnson
2013-01-21 10:02:05 -08:00
parent fef9aae2f3 759fe2dd5b
commit 2db8dce4b6
30 changed files with 246 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/packages/command-logger/src/command-logger.coffee
View File

@@ -2,7 +2,6 @@
ScrollView = require 'scroll-view'
$ = require 'jquery'
_ = require 'underscore'
d3 = require 'd3.v3'
module.exports =
class CommandLogger extends ScrollView
@@ -121,6 +120,8 @@ class CommandLogger extends ScrollView
w = @treeMap.width()
h = @treeMap.height()
d3 = require 'd3.v3'
x = d3.scale.linear().range([0, w])
y = d3.scale.linear().range([0, h])
color = d3.scale.category20()

2
src/packages/command-panel/src/command-interpreter.coffee
View File

@@ -4,9 +4,9 @@ PEG = require 'pegjs'
module.exports =
class CommandInterpreter
constructor: (@project) ->
@parser = PEG.buildParser(fs.read(require.resolve 'command-panel/commands.pegjs'))
eval: (string, activeEditSession) ->
@parser ?= PEG.buildParser(fs.read(require.resolve 'command-panel/commands.pegjs'))
compositeCommand = @parser.parse(string)
@lastRelativeAddress = compositeCommand if compositeCommand.isRelativeAddress()
compositeCommand.execute(@project, activeEditSession)