Commit Graph

2829 Commits

Author SHA1 Message Date
Nathan Sobo
6428fa9733 Merge pull request #31 from github/global-find
Search in project
2012-07-25 13:32:33 -07:00
Nathan Sobo
1886b2a48e Merge branch 'master' of github.com:github/atom into global-find
Conflicts:
	spec/app/buffer-spec.coffee
	spec/extensions/command-panel-spec.coffee
	spec/extensions/tree-view-spec.coffee
	src/app/buffer.coffee
	src/extensions/command-panel/command-panel.coffee
	src/extensions/command-panel/keymap.coffee
2012-07-25 13:38:12 -06:00
Nathan Sobo
7270758a9e Focus the active editor after executing a previewed operation 2012-07-25 13:26:57 -06:00
Nathan Sobo
454557b502 Merge branch 'master' into global-find
Conflicts:
	spec/extensions/command-panel-spec.coffee
	src/app/buffer.coffee
	src/extensions/command-panel/command-panel.coffee
	src/extensions/command-panel/keymap.coffee
2012-07-24 17:59:49 -06:00
Nathan Sobo
09114b5a1d Command panel no longer overlays editors, but pushes them up w/ flexbox. YES! 2012-07-24 17:34:28 -06:00
Nathan Sobo
3dbb7c2426 Use legacy flexbox to implement vertical tool panels for consistency 2012-07-24 17:23:33 -06:00
Nathan Sobo
6e75567fee Enable status bar in the default .atom/atom.coffee file 2012-07-24 17:19:17 -06:00
Nathan Sobo
9798b2531e Merge branch 'master' of github.com:github/atom 2012-07-24 17:18:00 -06:00
Nathan Sobo
e49e1c58dd Fix editor's lack of cooperation as a flexbox item
Two main changes: First, use absolute position left/right/top/bottom of 0 as a hack to achieve 100% width and height of the flexbox that contains the gutter and scroll view when it is inside an editor that is itself a flexbox item. Now we don't rely on the editor having a definite height because of the absolute positioning. This seemed to confuse the newer flexbox implementation, so I fell back to the old one which seems to work better than last time I tried it for this purpose (it had rendering artifacts before)
2012-07-24 17:17:49 -06:00
Corey Johnson
dc50002681 does this fix the flexbox problem? 2012-07-24 16:11:17 -07:00
Nathan Sobo
98decaadef This is why, sadly, even the old flex box doesn't seem to work for us. 2012-07-24 16:53:36 -06:00
Corey Johnson
e0fe617c57 a version of flexbox using the old style 2012-07-24 15:24:52 -07:00
Corey Johnson
e491fe7bb7 Clean up after tests 2012-07-24 10:52:42 -07:00
Corey Johnson & Nathan Sobo
239fd2f9e6 buffer triggers a 'path-change' event when a file is moved or removed 2012-07-24 10:34:30 -07:00
Corey Johnson & Nathan Sobo
eafd007c39 Make error an optional argument to unwatchPath 2012-07-24 10:19:58 -07:00
Nathan Sobo
66f80c2dd8 Backfill coverage for handling of breaks in Project.scan subprocess output
If the stdout callback is fired with partial data, and it ends right after a path, we need to ensure we don't handle it as if there's an extra newline.
2012-07-24 10:07:07 -06:00
Nathan Sobo
5ebcabb813 Fix preview list cursor styling 2012-07-23 20:14:15 -06:00
Nathan Sobo
c493272be1 Fix click behavior when the event target is a child of the li instead of the li 2012-07-23 20:12:06 -06:00
Nathan Sobo
07cd01571e Apply some more styling, for better or worse :-) 2012-07-23 20:02:32 -06:00
Nathan Sobo
da7e1b0509 Meta-w on the preview list closes the command panel, not the entire window 2012-07-23 19:32:46 -06:00
Nathan Sobo
a2522f9b19 Clicking on previewed operations selects their buffer range in active editor 2012-07-23 19:25:29 -06:00
Nathan Sobo
94251a2fad Only store operations to preview on the PreviewList 2012-07-23 19:11:36 -06:00
Nathan Sobo
5659f9bab1 Destroy preview list's previous operations when populating new ones 2012-07-23 19:05:37 -06:00
Nathan Sobo
c3c4e07a3f Pressing 'enter' on a global search operation selects it in the active editor 2012-07-23 18:16:37 -06:00
Corey Johnson & Nathan Sobo
74032f2bdf For specs, build atom locally in ./atom-build (instead of in /tmp directory) 2012-07-23 16:49:23 -07:00
Corey Johnson & Nathan Sobo
4744c1cb34 The callback passed to Native.watch returns an event type string instead of an object. 2012-07-23 16:35:24 -07:00
Corey Johnson & Nathan Sobo
9658cf61ff Buffer.getPath() returns null when the buffer's file is deleted on disk 2012-07-23 16:35:24 -07:00
Corey Johnson & Nathan Sobo
8d82f3125f When a file is deleted, associated Files trigger the 'remove' event 2012-07-23 16:35:24 -07:00
Corey Johnson & Nathan Sobo
10e4c87728 Remove unused kqueue flags 2012-07-23 16:35:24 -07:00
Corey Johnson & Nathan Sobo
7962c8ff34 When a file is moved (via the fs) associated File objects update their path and trigger a 'move' event 2012-07-23 16:35:24 -07:00
Nathan Sobo
8f0c8633f8 Move-up / move-down on command panel change the selected operation 2012-07-23 15:01:03 -06:00
Nathan Sobo
c1c055319c Remove redundant describe block
This is now tested via pressing enter on the mini-editor
2012-07-23 13:17:42 -06:00
Nathan Sobo
9d938d84ad Test the 'command-panel:focus-preview' event directly
This is more tidy, breaking out all the cases into a describe hierarchy. The previous test was kinda tacked on in an odd spot.
2012-07-23 12:59:06 -06:00
Nathan Sobo
318ddd8148 Ctrl-2 & ctrl-0 mediate visibility focus of command-panel and the preview list
If the command panel is toggled with ctrl-2, then the preview list will show and become focused. If it's toggled with ctrl-0, the preview list won't be shown. But if it's already showing, focus will just switch to the editor, leaving it visible. It's kind of hard to explain but feels intuitive to me to use.
2012-07-23 12:19:54 -06:00
Nathan Sobo
a0e3ce5f1c Merge branch 'master' into global-find
Conflicts:
	spec/extensions/command-panel-spec.coffee
2012-07-23 11:33:26 -06:00
Nathan Sobo
ab47df1987 Make command-panel sticky like tree view is (fit into the "tool panel" scheme)
Esc on the command panel just moves focus back to the editor. Ctrl-0 will move focus back to the panel if it is open but not focused.
2012-07-23 11:29:52 -06:00
Nathan Sobo
7f5c588723 Statically link the silver searcher binary against PCRE so it isn't required 2012-07-21 17:21:49 -06:00
Nathan Sobo
4f401b2ada 💄 2012-07-20 19:11:40 -06:00
Nathan Sobo
1f5416f5dd Merge branch 'master' into global-find
Conflicts:
	spec/extensions/command-panel-spec.coffee
2012-07-20 19:09:28 -06:00
Nathan Sobo
091b47a5d3 Merge branch 'global-find' of github.com:github/atom into global-find 2012-07-20 19:07:46 -06:00
Nathan Sobo
dbfc9d20f7 Fix broken specs due to keybindings change 2012-07-20 19:07:00 -06:00
Nathan Sobo
89e3f729f5 Un-F 💩 2012-07-20 19:06:48 -06:00
Nathan Sobo
c05fa7dc6f Merge branch 'master' into global-find
Conflicts:
	src/app/buffer.coffee
2012-07-20 19:01:38 -06:00
Nathan Sobo
830935cdb8 Kill old TreeView bindings. Ctrl-1 is king. 2012-07-20 18:59:44 -06:00
Nathan Sobo
fe9a82b5b8 Merge branch 'master' of github.com:github/atom 2012-07-20 17:56:47 -06:00
Nathan Sobo
e8a892ee3e Start implementing "tool-panel" keymap scheme
Tool panels will be mapped to ctrl-# bindings. If the panel is focused, the # binding closes it. Otherwise the # binding shows it (if needed) and focuses it. The esc key unfocuses the panel, but does not necessarily close it. Meta-w always closes the panel.

This is the scheme. Right now we only have 2 panels:

Command Panel: Ctrl-0, esc still hides it
Tree View: Ctrl-1, esc just unfocuses it
2012-07-20 17:56:36 -06:00
Corey Johnson & Nathan Sobo
cc292b604d Select preview item when preview list is shown 2012-07-20 14:19:19 -07:00
Corey Johnson & Nathan Sobo
713b5a9620 Better $native.exec errors 2012-07-20 14:19:19 -07:00
Nathan Sobo
d16328c533 Meta-shift-f opens the command panel pre-populated with Xx/ to find in project 2012-07-20 13:57:33 -06:00
Nathan Sobo
73654a5e3f Improve command panel meta-f spec 2012-07-20 13:56:55 -06:00