Nathan Sobo
13d7f93dd9
GlobalKeyMap adds a 'keystroke' string to events
...
The keystroke is a string representation of the event... like
"alt-ctrl-x" or "q"
2012-01-13 14:03:22 -08:00
Corey Johnson & Nathan Sobo
fd48c67bfa
Add App.bindKey
2012-01-13 12:06:52 -08:00
Corey Johnson & Nathan Sobo
ca2b7c9fd1
Add MoveUp command to VimMode
2012-01-13 10:57:08 -08:00
Corey Johnson & Nathan Sobo
d3d832a740
Add h (move left) monvment to vimMode.
2012-01-13 10:44:51 -08:00
Nathan Sobo
86d7a91dcd
💄
2012-01-12 17:56:49 -08:00
Nathan Sobo
a2cf77892d
Don't insert characters in vim command mode
...
GlobalKeymap.bindKey can take a selector and a custom function that
maps key events to commands. If it returns false, no command is
triggered but event propagation is halted.
2012-01-12 17:51:23 -08:00
Nathan Sobo
ee068a4b84
GlobalKeymap favor most recently declared bindings in case of tie
...
Just like in CSS, when multiple equally-specific selectors match an
element, we favor the most recently declared one, so keybindings
cascade.
2012-01-12 16:35:10 -08:00
Nathan Sobo
2c2423f985
Single-digit numeric prefixes can repeat commands in vim-mode
...
Vim mode has an operator stack. Every time an operator is pushed to the
stack, we ask if it is complete. If it's complete, we compose it with
the operator below it, then pop that operator if its complete. When no
operators remain on the stack, we call execute the final composed
operator. So far we only have DeleteChar (x) and NumericPrefix
operators.
2012-01-11 22:02:47 -08:00
Nathan Sobo
671d862441
💄
2012-01-11 20:21:38 -08:00
Corey Johnson & Nathan Sobo
8471270add
Vim mode supports command mode and insert mode with i, esc, and x bindings
2012-01-11 15:00:40 -08:00
Corey Johnson & Nathan Sobo
17ad7a26e7
Ensure focus returns to the editor when file finder closes.
...
We just capture focusout events on root view… if anything other than the editors text area lost focus, we focus the editor again. This will likely need refinement when we add more widgets to the system, but its enough to make the fuzzy finder behave appropriately.
2012-01-11 13:16:11 -08:00
Corey Johnson & Nathan Sobo
83a68dbbb0
GlobalKeymap.handleKeyEvent does not stop event propagation if no binding matches.
2012-01-11 13:16:11 -08:00
Corey Johnson & Nathan Sobo
278ac6a9f2
Remove bindKey from views. Make FileFinder use atom.bindKeys
2012-01-11 13:16:11 -08:00
Corey Johnson & Nathan Sobo
1aa99c379f
Move GlobalKeymap instance to App. Clear bindings between examples.
2012-01-11 13:16:11 -08:00
Corey Johnson & Nathan Sobo
e58f699681
Remove KeyBinder and CommandMap.
2012-01-11 13:16:11 -08:00
Nathan Sobo
2a80a72d64
Bind keydown on root view to catch events that aren't handled by ace
...
Also fixed a bug where the GlobalKeymap wasn't returning true when it
matched a binding, which caused key events to be processed twice when
they bubbled out of the editor and hit the root view.
2012-01-11 13:16:11 -08:00
Nathan Sobo
7f4120ce36
Toggle file-finder with a new CSS-style keybinding
...
Still doesn't hide when the text field is focused because we need to
handle key events that didn't emerge from Ace. That's next.
2012-01-11 13:16:11 -08:00
Nathan Sobo
51736e7695
Call window.close when window receives the 'close' event.
...
The RootView binds meta-w to the 'close' event.
2012-01-11 13:16:11 -08:00
Nathan Sobo
783e9446e9
Fix bug: Don't call handleKeyEvent with undefined event
...
Ace triggers key handlers for both keydown (onCommandKey) and input
(onTextInput) events. Input events don't pass the event, which was
blowing up the keymap.
2012-01-11 13:16:11 -08:00
Corey Johnson & Nathan Sobo
0346671d18
💄
2012-01-11 13:16:11 -08:00
Corey Johnson & Nathan Sobo
4e7b1b8979
Meta-s triggers save event with the new css-based keymap.
2012-01-11 13:16:10 -08:00
Corey Johnson & Nathan Sobo
6a25dc00c5
Add BindingSetSpec and change keybinding pattern separator.
...
Also, we allow chorded bindings to be surrounded in <…> in preparation of key sequences.
2012-01-11 13:16:10 -08:00
Corey Johnson & Nathan Sobo
11866b90fe
Rename KeyEventHandler to GlobalKeymap
2012-01-11 13:16:10 -08:00
Corey Johnson & Nathan Sobo
e9c0b9903d
Test that global key bindings defined on root view work in the editor.
2012-01-11 13:16:10 -08:00
Corey Johnson & Nathan Sobo
c3b5cd19ea
Editor can have custom key event handler.
...
editor.keyEventHandler.handleKeyEvent is passed all key events. When it returns true, the event is not handled by Ace.
2012-01-11 13:16:10 -08:00
Corey Johnson & Nathan Sobo
7f3396c125
Rename createKeyEvent to keydownEvent
2012-01-11 13:16:10 -08:00
Corey Johnson & Nathan Sobo
6ed0684eed
Fix Project.getFilePaths spec. It returns relative paths.
2012-01-11 13:16:10 -08:00
Nathan Sobo
65605409b0
Favor key bindings with the most specific CSS selectors
...
Now if a keypress event bubbles to an element with bindings for
multiple matching selectors, the most specific selector is chosen. This
allows us to override a keybinding by using a more specific selector.
For example, say we have an editor instance inside of the file-finder
widget, so that the user can use all their normal bindings when they
type the name of the file. Except when they hit <esc> we want to close
the file finder, not do whatever they normally have it bound to. Now we
can just say:
```
.file-finder .editor {
<esc>: close-file-finder
}
```
And we're assured that our binding will take precedence.
2012-01-11 13:16:10 -08:00
Nathan Sobo
f5be55e000
Only trigger bindings on the closest ancestor node of an event target.
...
Say we have a structure like:
div.parent
div.child
div.grandchild
And we have two mappings:
.parent { x: foo }
.child { x:bar }
If there's an event originating on grandchild, it will *only* trigger
bar, because that selector selects a closer ancestor.
2012-01-11 13:16:10 -08:00
Nathan Sobo
9c98e971fc
Key binding selectors match events on descendants
2012-01-11 13:16:10 -08:00
Nathan Sobo
18e614e88d
Start experiment: associate key bindings with CSS selectors
...
KeyEventHandler holds references to BindingSets. The name "binding set"
is based on the concept of a CSS ruleset. The idea is to choose a key
binding for an event based on what selectors (match / most closely
contain) the event's target DOM node.
2012-01-11 13:16:10 -08:00
Nathan Sobo
3a1d167a0f
Command map allows for ambiguous key pattern prefix matches.
...
If we have pattern 'da' and 'dad' both mapped, when 'da' is typed, the KeyMap waits for a given timeout for another character to be entered. If the time elapses, it goes ahead and executes the action for 'da'. But if a 'd' is subsequently entered, it executes 'dad'.
2012-01-11 13:16:10 -08:00
Nathan Sobo
d0ff3c7d4a
Start on CommandMap for Vim-style command mode. Matches patterns involving multiple key events.
2012-01-11 13:16:10 -08:00
Corey Johnson & Nathan Sobo
18b9782b16
Opening a previously opened url restores the same buffer and session.
2012-01-05 16:33:53 -08:00
Corey Johnson & Nathan Sobo
23c3cbf85f
Add Project.open, which returns a buffer for an absolute/relative path.
2012-01-05 12:02:25 -08:00
Corey Johnson & Nathan Sobo
5293ba7469
Add fs.join
2012-01-05 12:01:55 -08:00
Corey Johnson & Nathan Sobo
1c24ad0fdd
Eliminate Editor.open
2012-01-05 11:26:14 -08:00
Corey Johnson & Nathan Sobo
b5b1ac67fa
Remove slow specs
2012-01-05 11:20:18 -08:00
Corey Johnson & Nathan Sobo
aee7df0b9f
Add Editor.setBuffer
2012-01-05 11:13:55 -08:00
Corey Johnson
4121b2076e
Display relative paths in the file finder
2012-01-05 11:01:17 -08:00
Nathan Sobo
192166d61a
Merge branch 'master' of github.com:probablycorey/Atomicity
...
Conflicts:
src/atom/project.coffee
2012-01-04 19:05:01 -08:00
Nathan Sobo
1689824ad7
💄
2012-01-04 19:08:23 -07:00
Nathan Sobo
629c1ef239
If passed a directory path, fs.directory returns the path it is given (not the parent dir)
2012-01-04 19:07:55 -07:00
Nathan Sobo
80e4fda2f9
Filter out directory paths for FileFinder in Objective-C instead of JS.
...
Rename FileSystemHelper-contentsOfDirectoryAtPath… to -listFilesAtPath to make it clear that we're only listing files, not subdirectories. This is a fairly special purpose method but it saves us from calling back into objective-c a ton of times to filter them in JS, and makes bringing up the file finder ~2x as fast.
2012-01-04 18:22:22 -07:00
Nathan Sobo
be0fa84f1f
Move fs support methods out of AtomController into FileSystemHelper
2012-01-04 18:01:31 -07:00
Nathan Sobo
ee53616d82
Ensure that all windows are closed before proceeding to next spec.
2012-01-04 17:33:06 -07:00
Corey Johnson
7e270d641d
FileFinder removes itself when item is selected.
2012-01-04 15:47:41 -08:00
Corey Johnson
3ffe57f228
Project.getFilePaths returns full urls.
...
FileFinder.initialize takes a 'selected' callback.
2012-01-04 15:30:41 -08:00
Corey Johnson
9419a9ec86
Spread the app specs out.
2012-01-04 15:25:57 -08:00
Nathan Sobo
816f3774e1
Merge branch 'master' into asyncfs
2012-01-04 13:58:10 -07:00
Corey Johnson & Nathan Sobo
236ea5e906
RootView handles opening directories
2012-01-04 10:51:41 -08:00
Corey Johnson & Nathan Sobo
44802e9647
Hitting enter on FileFinder opens file in new window.
2012-01-03 17:08:13 -08:00
Corey Johnson & Nathan Sobo
f0976d4650
FileFinder requires the full filePath.
2012-01-03 17:08:04 -08:00
Nathan Sobo
1420ca9adb
Rename Project.list -> Project.getFilePaths, and change its behavior.
...
getFilePaths only resolves to the project-relative paths of all files in the project, excluding directories.
2012-01-03 17:22:03 -07:00
Nathan Sobo
6dddb1aa26
RootView.toggleFileFinder scans urls asynchronously.
2012-01-03 16:39:09 -07:00
Nathan Sobo
07b40cdbeb
RootView opens a project for the directory of the url passed to initialize.
...
Rename fixtures/file-finder-dir to fixtures/dir, because it's not really file-finder specific.
2012-01-03 16:01:46 -07:00
Corey Johnson & Nathan Sobo
f8b04cd902
RootView is initialized with a url and opens it with its editor
2012-01-03 13:57:10 -08:00
Corey Johnson & Nathan Sobo
2cfea9fa42
Fix broken specs
2012-01-03 14:40:31 -07:00
Corey Johnson & Nathan Sobo
5b3e0e9f83
fs.async.list takes a boolean 'recursive' flag.
2012-01-03 14:23:18 -07:00
Corey Johnson & Nathan Sobo
3822549007
Spec passes for fs.async.list.
2012-01-03 14:03:03 -07:00
Corey Johnson & Nathan Sobo
b3a7e1e097
Add failing fs.async.list spec.
2012-01-03 11:18:08 -07:00
Corey Johnson & Nathan Sobo
fe0c6f9a61
Remove common path prefix from FileFinder matches
2011-12-30 11:50:29 -08:00
Corey Johnson & Nathan Sobo
e6053a2d66
FileFinder only returns up to maxResults
2011-12-30 11:37:11 -08:00
Nathan Sobo
ad024bc1e6
Move window-global key bindings from window object to RootView.
...
This makes it simpler to discard bindings between specs: just throw away the RootView. It's also more straightforward to call @bindKey on self in the initialization of RootView, rather than binding to document on window.startup.
2011-12-30 13:26:48 -06:00
Nathan Sobo
a1e0039890
Centralize key binding logic in KeyBinder and jQuery.fn.bindKey extension.
...
This commit removes window.bindKey in favor of binding keys on dom elements. It also refactors pattern parsing in the test helper to use KeyBinder.parseKeyPattern.
2011-12-30 13:19:41 -06:00
Nathan Sobo
5273cb0638
Add $.fn.bindKey, which works on any jquery-wrapped element.
...
If given a string as an action, it attempts to call a method by that name on the element's view object. If given a function, it calls it directly.
2011-12-30 12:33:55 -06:00
Nathan Sobo
dc38a0e375
Add $.fn.view method, which links any jquery element to its parent view.
...
When generating a jQuery fragment with the templating framework, I store the fragment in the 'view' data property on all the fragments elements. This allows us to query an element from the DOM and determine what view object it belongs to.
2011-12-30 12:05:11 -06:00
Corey Johnson & Nathan Sobo
e4d73ace25
Bound up / down keys to moveUp / moveDown in fileFinder
2011-12-29 17:38:08 -08:00
Corey Johnson & Nathan Sobo
98458806ea
Add moveUp and moveDown to FileFinder
2011-12-29 16:43:22 -08:00
Corey Johnson & Nathan Sobo
0f772c0858
Template framework can bind events on the root of views, in addition to descendant elements.
2011-12-29 16:13:16 -08:00
Corey Johnson & Nathan Sobo
5aee51eb35
FileFinder tests pass
2011-12-29 15:37:08 -08:00
Corey Johnson & Nathan Sobo
b279063550
Fix bug where subviews could clobber outlets on superviews.
...
Now we wire outlets before the subviews are attached, preventing any outlets on the subview from overwriting outlets on the superview.
2011-12-29 16:29:06 -06:00
Corey Johnson & Nathan Sobo
2eb7d2a215
FileFinder loads files from editor.url's directory
2011-12-29 12:23:04 -08:00
Corey Johnson & Nathan Sobo
35e4b0e969
Incorporate Editor into templating framework.
2011-12-29 13:12:13 -06:00
Corey Johnson & Nathan Sobo
0285c3d94d
Builder.subview wires an outlet directly, rather than assigning an outlet property.
2011-12-29 13:10:44 -06:00
Corey Johnson & Nathan Sobo
b25fc80c9a
Template.subview expects a view instance instead of a template and params hash.
2011-12-29 12:17:52 -06:00
Corey Johnson & Nathan Sobo
8455507566
Use _.uniqueId to generate temporary subview divs.
2011-12-29 11:58:59 -06:00
Corey Johnson & Nathan Sobo
79ead1fefb
Add Builder.subview / Template.subview
2011-12-29 11:43:14 -06:00
Corey Johnson & Nathan Sobo
81dbe51851
Editor.buildAceEditor is causing root-view-spec to fail because it expects the DOM to have a #main element. I think we need to implement subviews for this to work, but didn't have time to get that working.
2011-12-28 17:30:34 -08:00
Corey Johnson & Nathan Sobo
e617e129e0
Rename Layout to RootView
2011-12-28 17:14:32 -08:00
Corey Johnson & Nathan Sobo
c6fbad8e9e
FileFinder is toggleable
2011-12-28 16:21:38 -08:00
Corey Johnson
7c2f4ff1be
Remove focused spec
2011-12-28 15:17:42 -08:00
Corey Johnson & Nathan Sobo
c6d90748f7
Meta-t adds file finder to bottom of layout.
2011-12-28 16:30:08 -06:00
Nathan Sobo
0fe85355f8
Merge branch 'view'
2011-12-28 14:22:12 -06:00
Nathan Sobo
886c435b43
Populate url list of file finder as user types.
2011-12-28 14:21:43 -06:00
Nathan Sobo
51c89acc5b
Add FileFinder with a findMatches method that returns ranked urls.
...
Change stringscore.js to be a function that takes a string, rather than extending the prototype.
2011-12-28 13:53:39 -06:00
Nathan Sobo
28ef202a6a
Un-focus and fix Layout template.
2011-12-28 12:47:04 -06:00
Corey Johnson
4d9e1d94aa
Remove test that is not used
2011-12-27 17:29:59 -08:00
Corey Johnson
06fd50de96
Bind keyPatterns to menuItems.
...
I don't like the implementation of this, but it works. Next step is cleaning it up.
2011-12-27 17:28:32 -08:00
Nathan Sobo
a622da2904
💄
2011-12-27 19:14:29 -06:00
Nathan Sobo
eeb20673b3
Pass the event and element to event-handling methods on the view.
2011-12-27 19:13:54 -06:00
Nathan Sobo
ba18614c2f
Bind DOM events to view methods based on element attributes.
...
For example, if you give an element the attribute click: 'elementClicked', the template will bind a click event to that element which calls the elementClicked method on the view.
2011-12-27 19:00:00 -06:00
Nathan Sobo
7948543a5b
Template extends view with @viewProperties and calls initialize with attributes passed to build.
2011-12-27 18:36:54 -06:00
Corey Johnson
a0fc994dcb
addMenuItem
can take a key pattern and set it as the key equivalent.
2011-12-27 16:30:48 -08:00
Nathan Sobo
08c1d33836
Switch Template to use builder. Wire outlets in Template.
2011-12-27 18:21:00 -06:00
Nathan Sobo
43ddb6b16a
Builder.toFragment creates outlet references on the fragment.
2011-12-27 17:43:05 -06:00
Nathan Sobo
a7aa1d2b75
Add jasmine jquery matchers.
2011-12-27 17:42:29 -06:00
Nathan Sobo
bd79d9cd5d
Builder correctly generates void (self-closing) tags.
2011-12-27 16:43:28 -06:00
Nathan Sobo
21fb88141e
Builder can generate tags with attributes.
2011-12-27 16:16:35 -06:00
Nathan Sobo
b5a06c288e
Tags can take textual content.
2011-12-27 16:05:01 -06:00
Nathan Sobo
e570c5d454
Tags can take a function for their content.
2011-12-27 15:57:29 -06:00
Nathan Sobo
22167faf28
Add template/Builder. It generates basic tags.
2011-12-27 15:50:39 -06:00
Nathan Sobo
a48a1b24f4
Don't add the same menu item more than once.
2011-12-26 23:33:05 -06:00
Nathan Sobo
b9f844ab18
Listen for focus/blur on window, not document.
2011-12-26 23:32:54 -06:00
Nathan Sobo
90188a871c
Only show menu items for a window/document when it is the key window.
...
Also add "File > Save" menu item. When document is focused, all menu items associated with its window are added to the main menu. When it is blurred, main menu is reset.
2011-12-26 14:49:51 -06:00
Nathan Sobo
a010c8e3c6
Add window.bindMenuItem, which adds a menu item that invokes a given function.
...
Every menu item is created with a path (File > Save). The functions are stored in a hash from (menu item path -> action) on the window. When an AtomMenuItem is selected, it looks up the action on the current window based on its path.
2011-12-26 13:12:27 -06:00
Nathan Sobo
0cc29a0319
Beef up Native.addMenuItem spec
2011-12-23 16:59:02 -06:00
Nathan Sobo
11d502b511
Unfocus spec. Fix spec.
2011-12-23 16:50:35 -06:00
Nathan Sobo
00bccdca96
Add partial implementation Native.addMenuItem.
...
It takes a path like "Menu 1 > Menu 2 > Item", and builds a series of submenus if needed along that path, then adds the final item at its terminus. Specs still need to be fleshed out further.
2011-12-23 16:45:04 -06:00
Nathan Sobo
68ce5544a7
Merge branch 'master' into wip
2011-12-23 15:58:11 -06:00
Nathan Sobo
c2b102d9f4
💄
2011-12-23 15:38:38 -06:00
Nathan Sobo
5b7a80f707
fdescribe / fit can be used to focus specs manually
2011-12-23 15:38:22 -06:00
Nathan Sobo
ae4fdf8812
Add Native.resetMainMenu and call it in global afterEach
...
This method removes any AtomMenuItems that aren't marked as 'global'. It ignores menu items that aren't instances of our custom subclass. This is needed by specs to clear any menu items added during tests. It will also be needed when a window loses focus and we want to remove any non-global menus associated with the window.
2011-12-23 12:43:32 -06:00
Nathan Sobo
deb088f1ed
Merge branch 'master' of github.com:probablycorey/Atomicity
2011-12-23 10:48:22 -06:00
Nathan Sobo
7d524f5f54
Editor.open assigns the url on the atom controller so refresh works properly.
2011-12-23 10:48:11 -06:00
Corey Johnson
2d6ddcedfd
Add window.bindKey which matches a pattern to an action.
2011-12-22 16:24:09 -08:00
Corey Johnson
b15c493693
Remove meta-o handler from window.
2011-12-22 14:58:34 -08:00
Corey Johnson
d0ed5992ca
'meta-o' presents open dialog.
2011-12-20 10:41:31 -08:00
Corey Johnson
f2d9f818a8
Add spec to verify mode is set on the aceEditor session.
2011-12-20 09:27:32 -08:00
Corey Johnson
f78d1461d3
Sobo'd the spec.
2011-12-20 09:25:15 -08:00
Corey Johnson
1abccbf9eb
Buffer with no url returns Text as its mode.
2011-12-19 16:40:55 -08:00
Corey Johnson
a72fb416f8
Buffer.getMode returns the ace mode based on the url.
2011-12-19 16:26:55 -08:00
Corey Johnson
ce9f5b7f5d
Better spec name
2011-12-19 13:20:45 -08:00
Corey Johnson
8efbd8c281
Move keybindings to window.
...
Window has startup and shutdown methods.
2011-12-19 12:59:11 -08:00
Corey Johnson
5ec94fc28c
Triggers the event created with window.keydown.
2011-12-19 12:58:35 -08:00
Nathan Sobo
7dcb00f0ec
When saving buffer with no url, pop up 'save as' dialog.
...
Remove a lot of old code.
2011-12-16 16:31:02 -08:00
Nathan Sobo
c75c3555bb
Meta+s triggers save on Editor.
...
Still can't save buffers that don't have a url.
2011-12-16 16:30:51 -08:00
Nathan Sobo
4ce635d539
Always assign the app to a global in specs console.
2011-12-15 19:11:20 -08:00
Corey Johnson & Nathan Sobo
a07daf26ca
Add Buffer.save
2011-12-15 15:59:32 -08:00
Corey Johnson & Nathan Sobo
5fbb320957
Buffer is empty when created with no url.
2011-12-15 15:16:44 -08:00
Corey Johnson & Nathan Sobo
c16c25b69b
ace Editor uses Document held by Buffer.
2011-12-15 15:06:34 -08:00
Corey Johnson & Nathan Sobo
27dd97069a
Attach and populate the ace editor with buffer text when an editor is created.
2011-12-15 14:13:34 -08:00
Corey Johnson & Nathan Sobo
32631468e7
Recursively require all -spec.coffee files in spec suite.
2011-12-15 14:11:00 -08:00
Corey Johnson & Nathan Sobo
71d9dfb147
Rename jasmine_content to jasmine-content.
2011-12-15 14:09:40 -08:00
Corey Johnson & Nathan Sobo
cf02d1183a
App.open opens a new window with an editor pointing at the given url.
2011-12-15 10:45:15 -08:00
Corey Johnson
9e55a00a56
Closes all non-spec windows opened by the app.
2011-12-14 18:30:17 -08:00
Corey Johnson
fbb3efacf4
wii - gettings specs on App.open. Window closing not working quite right.
2011-12-14 16:24:30 -08:00
Corey Johnson & Nathan Sobo
607149a07d
Half-baked template experiment
2011-12-12 16:24:55 -08:00
Corey Johnson & Nathan Sobo
0dd6df1ab6
Empty test suite runs when you hit ctr-alt-cmd-s
2011-12-12 15:05:59 -08:00