probablycorey
132194337e
Merge remote-tracking branch 'origin/master' into cj-deleted-files-not-modified
2013-12-12 11:00:17 -08:00
Ben Ogle
f0198944b5
Merge pull request #1297 from atom/bo-diff-reload
...
Apply text to buffer via diff on reload
2013-12-12 10:40:47 -08:00
probablycorey
f414c0955b
Specs don't prompt to save editors by default.
2013-12-12 10:35:11 -08:00
Ben Ogle
4ffa5bb90e
Make this fn private.
2013-12-12 10:34:08 -08:00
Ben Ogle
4dbca94d32
spec 💄
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
787b6fb677
Revert "Don't pop-up save dialog in specs"
...
This reverts commit e0ad22d0bd
2013-12-12 10:09:41 -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
Kevin Sawicki
63cac904ae
Export telepath Model
2013-12-12 08:51:02 -08:00
Kevin Sawicki
04ad048e1f
:non-potable_water Upgrade to space-pen@2.0.0
2013-12-12 08:15:48 -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
Kevin Sawicki
6a8697a357
Upgrade to status-bar@0.27.0 for tooltip update
2013-12-11 19:13:09 -08:00
Kevin Sawicki
bb35655e67
Upgrade to status-bar@0.26.0 for icon tweak
2013-12-11 19:02:06 -08:00
Kevin Sawicki
865d94d758
Add dev mode icon to status bar
...
Skull colliding with tabs was too much to handle.
Red square in status bar is the new indicator.
2013-12-11 18:57:07 -08:00
Matt Colyer
965e146bf2
Merge pull request #1298 from atom/upgrade-download-atom-shell
...
Upgrade grunt-download-atom-shell@0.2.1
2013-12-11 18:53:31 -08:00
Matt Colyer
d97b394000
Upgrade grunt-download-atom-shell@0.2.1
2013-12-11 18:23:50 -08:00
Kevin Sawicki
29b85a1bb9
Clear the goal column when the cursor moves
...
Previously it was only cleared when changing the position explicitly
and not as a result of the underlying marker changing such as during a
text insertion.
Closes #1295
2013-12-11 18:02:52 -08:00
Kevin Sawicki
dda65d82c3
Remove unused guid require
2013-12-11 17:49:31 -08:00
Kevin Sawicki
56de32f433
📝 Mention packages instead of extension
2013-12-11 17:23:23 -08:00
Kevin Sawicki
3cb751723d
Register editor with project when deserializing
2013-12-11 17:18:03 -08:00
Nathan Sobo
344e6d15ce
Merge branch 'ns-latest-telepath'
2013-12-11 17:03:19 -08:00
Nathan Sobo
8e7de0dc89
Upgrade to telepath 0.70.0 for undefined marker timestamp fix
...
This upgrades the serialization version of telepath documents because
for a window of time we were storing undefined timestamps. It also
adds dev-mode assertions that raise when the index of a solo marker
exceeds the array length. I think that issue should actually be resolved
and if we don't see an assertion failure here for a while we can remove
the Math.min shim.
Closes atom/telepath#7
2013-12-11 16:49:05 -08:00
probablycorey
3b388f16fd
Update metrics package… again.
2013-12-11 16:47:43 -08:00
probablycorey
c64b1a7628
Update metrics package
2013-12-11 16:37:38 -08:00
Kevin Sawicki
5ce71f5ded
Upgrade to atom-dark-ui@0.17.0 for status icon tweak
2013-12-11 16:30:32 -08:00
Kevin Sawicki
02415ca400
Upgrade ui themes for hover removal
2013-12-11 16:04:13 -08:00
Nathan Sobo
69f357b538
Merge branch 'ns-latest-telepath'
2013-12-11 15:30:49 -08:00
Nathan Sobo
780441bdb8
Upgrade to telepath 0.68.0 for solo marker multiple undo fix
2013-12-11 15:19:46 -08:00
probablycorey
e0ad22d0bd
Don't pop-up save dialog in specs
2013-12-11 14:51:44 -08:00
probablycorey
115203cbd2
Update spec description
2013-12-11 14:48:12 -08:00
Nathan Sobo
0b5155f496
Set telepath.devMode to true when not on an official release
...
This will enable assertions inside of telepath to help us diagnose
atom/telepath#7 . Otherwise, the issue *should* be covered over for end
users.
2013-12-11 14:47:52 -08:00
Nathan Sobo
4f18baaed5
Upgrade telepath to 0.67.0 for devMode flag
2013-12-11 14:46:40 -08:00
Kevin Sawicki
095320680f
📝 Start CoffeeScript styleguide
2013-12-11 14:35:06 -08:00
Nathan Sobo
8a8df8d6cb
Add Atom::isReleasedVersion, which determines if the version is a SHA
2013-12-11 12:28:20 -08:00
Nathan Sobo
6bb4eaee93
Merge branch 'ns-teleditor'
2013-12-11 11:17:45 -08:00
Nathan Sobo
7710845cdc
Use property accessors instead of accessing state directly
2013-12-11 11:10:43 -08:00
Nathan Sobo
8471ffed29
Observe scroll* behaviors instead of the entire state document
2013-12-11 11:10:06 -08:00
Nathan Sobo
ce6d793528
Merge branch 'ns-reopen-uris'
2013-12-11 11:03:59 -08:00
Nathan Sobo
e5bf70544e
Document methods
2013-12-11 11:02:56 -08:00
Kevin Sawicki
c591911455
📝 There is no tomorrow
2013-12-11 10:37:26 -08:00
Kevin Sawicki
44955e536b
Upgrade to tree-view@0.44.0
2013-12-11 10:20:29 -08:00
Kevin Sawicki
6f25945911
Upgrade to fs-plus@0.11.0 to remove npm warning
2013-12-11 10:09:06 -08:00
Kevin Sawicki
e5bd341f05
Set npm log level to warn instead of silent
2013-12-11 10:03:32 -08:00
Kevin Sawicki
e9d4563084
Disable apm colors in CI builds
2013-12-11 09:40:30 -08:00
