Corey Johnson & Nathan Sobo
75f0438f6a
Rename fold/unfold to foldCurrentRow/unfoldCurrentRow
2012-07-30 09:58:15 -07:00
Corey Johnson
7ff31d1ad7
Remove toggleFold and replace with fold
2012-07-27 13:46:50 -07:00
Corey Johnson
76ffa5a2c5
change toggle-fold to fold
2012-07-27 13:45:13 -07:00
Corey Johnson
960bd1ea70
Show "buffer in conflict" alert after edit session is visible
2012-07-26 13:32:26 -07:00
Nathan Sobo
79893d96b6
Merge commit '0384f025dd6915d2d9771e37983dc839e49b28f7'
2012-07-26 14:11:29 -06:00
Nathan Sobo
334ba6ba82
Ctrl-meta-1 reveals the active file in the tree view
2012-07-26 14:10:02 -06:00
Corey Johnson
0384f025dd
Add Buffer.isInConflict()
2012-07-26 11:00:16 -07:00
Corey Johnson
42299c6a71
When the active edit session is modified, and its file is then modified by the file system, it displays an alert.
2012-07-26 10:59:58 -07:00
Nathan Sobo
8b743b90a2
Bugfix: Don't clear selections after running an x command w/ no matches
...
Operations now return a range to select rather than actually performing a selection in `execute`. This allows the composite command to aggregate all ranges to select and only change the selection if it's non empty. Before we had to clear the selections ahead of time and then rely on each operation to imperatively add its selection. This is easier to control. It also ensures that when we execute a previewed operation, we don't add a selection but instead change the selection.
2012-07-26 11:53:03 -06:00
Nathan Sobo
dcc1193b49
Preserve focus state of command panel's mini-editor on refresh
2012-07-26 11:26:38 -06:00
Nathan Sobo
252a1a4d5f
💄
2012-07-26 10:29:42 -06:00
Nathan Sobo
786c9dd8c8
Merge branch 'master' of github.com:github/atom
2012-07-26 10:09:38 -06:00
Nathan Sobo
54616aee78
Bugfix: When the command panel makes a selection, it destroys surrounding folds
2012-07-26 10:09:28 -06:00
Corey Johnson
9722bde747
don't assume DirectoryViews have entries when serializing
2012-07-25 16:04:08 -07:00
Corey Johnson
470e8a6191
Add rootView.deactivateExtension
2012-07-25 15:45:21 -07:00
Corey Johnson
c91e28071a
Add deactivate to TreeView
2012-07-25 15:16:13 -07:00
Corey Johnson
70dfdc6cdd
a TreeView without a root path can be serialized
2012-07-25 15:16:13 -07:00
Corey Johnson
fefb3bc175
Better error message when extension fails to serialize
2012-07-25 15:16:13 -07:00
Nathan Sobo
7dc9b2dbf5
Fix bug where short folded lines don't always span the scroll view
2012-07-25 15:32:15 -06: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
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
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
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
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
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
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
4f401b2ada
💄
2012-07-20 19:11:40 -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
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
411215f6c8
Fix bug where cursor occasionally precedes '/' after pressing meta-f
...
Now we always move cursor to end when setting the command panel's mini-editor text.
2012-07-20 10:44:49 -06:00
Corey Johnson & Nathan Sobo
b27a793b92
Fix bug in Project.scan that was getting the state machine into a bad state
...
Chunks of stdout data are being buffered by lines. But then we were splitting these chunks on \n and the last fragment was therefore always "". This caused problems. Still need to test this.
2012-07-19 19:17:31 -06:00
