Nathan Sobo
0438565c43
Fix site.createDocument shim
2013-12-17 16:46:16 -07:00
Nathan Sobo
e7b632eb18
Merge branch 'master' into ns-telepathic-atom-global
2013-12-17 16:30:24 -07:00
Kevin Sawicki
cdce91157f
Reverse load path order
...
Packages may be linked into ~/.atom/packages or ~/.atom/dev/packages
so the resource should be loaded from there when available.
2013-12-17 15:04:17 -08:00
Kevin Sawicki
a566bd469d
Use fs-plus.isFileSync to check path
...
Previously fs::statSyncNoException not being null was used but it always
returns an object or false so the first path checked was always being used.
2013-12-17 15:01:53 -08:00
Kevin Sawicki
389586bb41
Add ~/.atom/dev/packages to load paths
2013-12-17 15:00:27 -08:00
Nathan Sobo
a57083a48b
Mark Atom global class methods with instance equivalents as 'Private:'
2013-12-17 11:18:59 -07:00
Nathan Sobo
3db9e16637
Upgrade to telepath 0.75.0 for custom object support
2013-12-16 19:03:10 -07:00
Nathan Sobo
bd3cfda2bb
Merge branch 'master' into ns-telepathic-atom-global
...
Conflicts:
src/atom.coffee
2013-12-16 18:18:06 -07:00
Ben Ogle
43baee5abd
Merge pull request #1322 from atom/bo-fix-tabs-and-soft-wrap
...
Dont re-atomicize atomic tokens
2013-12-16 15:56:22 -08:00
Ben Ogle
b959fc0a6a
use @
2013-12-16 15:46:07 -08:00
Ben Ogle
77b5fd47ca
Dont re-atomicize atomic tokens.
...
Fixes #1318
2013-12-16 15:34:27 -08:00
Kevin Sawicki
9cdc15b161
Guard against no other focusable elements
...
This previously occurred in areas we all the elements had a -1 tabindex
or were disabled.
2013-12-16 13:54:59 -08:00
Kevin Sawicki
010931391e
Use event.target
2013-12-16 12:14:41 -08:00
Kevin Sawicki
eaf6aba943
Return true from event handler
2013-12-16 12:12:14 -08:00
Kevin Sawicki
d60d710325
Inline sendActionToFirstResponder
2013-12-16 12:11:19 -08:00
Kevin Sawicki
bb1bcc233a
Handle native commands in render process
...
This fixes copy, paste, undo, redo for elements with a native-key-bindings
class by forwarding to the menu's first responder from the render process.
2013-12-16 12:06:43 -08:00
Ben Ogle
c6e96a6188
Merge pull request #1308 from atom/bo-common-functions-up-a-level
...
Common core commands to workspaceView
2013-12-16 11:12:44 -08:00
Kevin Sawicki
6a7e4c30fb
🐎 Memoize version to prevent future IPC calls
2013-12-13 14:49:23 -08:00
Nathan Sobo
ed41cc3cad
Restore comment
2013-12-13 14:07:30 -08:00
Kevin Sawicki
70f3527123
Expose shell load time render process for metrics
2013-12-13 12:15:45 -08:00
Nathan Sobo
e67e8ff0f5
Restore Atom::getLoadSettings and spy on it in window spec
...
I initially ripped out Atom::getLoadSettings in favor of a mutable
property because window spec was making an assumption that such a
property existed anyway. Since load settings need to be available from
class methods, the instance method just delegates to the class method.
But that means there's no ::loadSettings property to mutate in that
spec. I replaced the former approach with a spy which has the added
advantage of not polluting windowSettings for subsequent specs.
2013-12-13 12:02:48 -08:00
Nathan Sobo
da964a8f15
Fix comment
2013-12-13 09:55:45 -08:00
Nathan Sobo
2c4aee1181
Restore cloning of ::loadSettings in ::getLoadSettings
...
It's a deprecated method, but if you call it you'll get a clone.
2013-12-13 09:55:13 -08:00
Nathan Sobo
24d3f1daeb
Reduce diff size by restoring old method order where possible
2013-12-13 09:50:57 -08:00
Nathan Sobo
beb2fb08ea
Merge branch 'master' into ns-telepathic-atom-global
...
Conflicts:
package.json
2013-12-13 09:32:13 -08:00
Kevin Sawicki
87e325dce1
Set body's visibility to hidden when unloading
...
Previously the display was changed to none via $.hide() which accidentally
affected the ability of package's to serialize DOM properties such as
scrollTop since the value would always be zero when the display was none.
The goal here is to just prevent a flicker when refreshing the
editor window and setting visibility to hidden still accomplishes this.
2013-12-12 18:05:36 -08:00
Ben Ogle
a25812dca7
Move cmd-s and cmd-S to workspaceView
2013-12-12 17:50:15 -08:00
Ben Ogle
1f9a7599b7
cmd-w works anywhere in the editor
2013-12-12 17:50:15 -08:00
Nathan Sobo
39fe0c418b
Add back deprecated Atom::getLoadSettings method for packages
2013-12-12 16:49:00 -08:00
Nathan Sobo
75cee638bc
Protect from exceptions when attaching editor views w/ dead editors
...
Addresses #1306
We still need to know why this is happening, so I left an exception in
non-release builds. Since the pane system is about to change a lot I
think this is good enough for now.
2013-12-12 16:41:35 -08:00
Nathan Sobo
0b7f291e17
Remove reference to workspaceView in Atom::unloadEditorWindow
2013-12-12 16:35:26 -08:00
Nathan Sobo
a61b057aea
Eliminate exceptions in Editor::inspect
2013-12-12 16:34:48 -08:00
Nathan Sobo
4c817baf4c
Don't destroy project when WorkspaceView is removed
...
Whenever we're removing the workspaceView, we're usually destroying
the project anyway.
2013-12-12 16:34:10 -08:00
Nathan Sobo
a564cc66f6
Replace Atom::getLoadSettings with a ::loadSettings property
...
We assign a value into ::loadSettings anyway in a spec, so there's not
much point leaving it a method. Eventually I'd like to pass all these
settings in when constructing the Atom object and eliminate awareness
of the loadSettings altogether from the Atom global.
2013-12-12 16:33:30 -08:00
Nathan Sobo
14c58c4517
Set up window event handler for all windows
2013-12-12 15:45:25 -08:00
probablycorey
90f3726c5c
Fix window specs
2013-12-12 15:10:01 -08:00
Nathan Sobo
23957d7f66
WIP: Make atom global a telepath model
...
Specs seem to be green but hang on what I'm assuming to be a long GC
pause near the end. I need to investigate what's going on memory wise.
2013-12-12 14:33:50 -08:00
probablycorey
58bf19cc83
Fix syntax error
2013-12-12 14:00:21 -08:00
probablycorey
f439b04978
Update tree-view and find-and-replace packages
2013-12-12 13:37:56 -08:00
probablycorey
132194337e
Merge remote-tracking branch 'origin/master' into cj-deleted-files-not-modified
2013-12-12 11:00:17 -08:00
Ben Ogle
4ffa5bb90e
Make this fn private.
2013-12-12 10:34:08 -08:00
Ben Ogle
7111961929
Move function into setTextViaDiff()
2013-12-12 10:34:08 -08:00
Ben Ogle
5d46d7a881
💄
2013-12-12 10:34:08 -08:00
Ben Ogle
8d1d64d9d3
bufferRow -> row
2013-12-12 10:34:08 -08:00
Ben Ogle
60498616b7
numberLines -> lineCount
2013-12-12 10:34:08 -08:00
Ben Ogle
ed745d2072
Remove log lines
2013-12-12 10:34:08 -08:00
Ben Ogle
1f69963982
Apply text to buffer via diff on reload
...
Previously, it would blindly read from disk on reload, and set the text
into the editor. This was problematic as it would mess with markers and
folds. No longer.
Fixes #1285 and fixes atom/bookmarks#3
2013-12-12 10:34:08 -08:00
probablycorey
2d5b04579f
Merge branch 'master' into cj-deleted-files-not-modified
...
Conflicts:
src/pane.coffee
2013-12-12 09:57:28 -08:00
Kevin Sawicki
9fbfeb970b
Remove mixins already added by Model superclass
2013-12-12 09:04:16 -08:00
Nathan Sobo
b9b8c61c11
🚱 Properly remove items from pane's state document
...
Fixes #1299 .
This updates Pane::removeItemAtIndex to call Array::splice with the
index to be removed instead of Array::remove, which was changed to take
the *object* to be remove rather than an index. Oops.
2013-12-11 21:39:38 -08:00
