Commit Graph

183 Commits

Author SHA1 Message Date
Kevin Sawicki & Nathan Sobo
c2ec172617 Upgrade telepath to avoid marker update corner case 2013-07-26 13:04:42 -06:00
Kevin Sawicki & Nathan Sobo
79fab6602f Don't replicate spell check markers 2013-07-23 18:31:30 -07:00
Kevin Sawicki & Nathan Sobo
636f81703c Distinguish remote and local selections in EditSession
Also: Add an Environment spec helper class that swaps out global
variables to simulate running code in different environments for the
replication specs.
2013-07-23 17:49:14 -07:00
Kevin Sawicki
4fff0b9792 Remove project path from state so it doesn't replicate 2013-07-23 11:40:21 -07:00
Kevin Sawicki & Nathan Sobo
501a6b7d11 Add site global used to create all telepath documents 2013-07-22 19:58:27 -07:00
Kevin Sawicki & Nathan Sobo
f4e7693e70 💩 Put apm back to version we clobbered during merge 2013-07-22 18:47:16 -06:00
Kevin Sawicki
56a2c79fe1 Merge branch 'collaboration-presence' into shared-buffers
Conflicts:
	src/app/edit-session.coffee
	src/app/project.coffee
	src/app/text-buffer.coffee
	src/app/window.coffee
	src/packages/collaboration/lib/bootstrap.coffee
	src/packages/collaboration/lib/session-utils.coffee
	vendor/telepath
2013-07-22 10:12:45 -07:00
Nathan Sobo
da95d26c58 Upgrade telepath to fix markers at end of buffer being invalid 2013-07-21 17:49:51 -06:00
Nathan Sobo
2b7a294cdd Use new marker attribute API to store/replicate selection goal ranges 2013-07-20 02:24:35 -07:00
Nathan Sobo
74347ea874 Upgrade telepath to allow marker attributes to be updated 2013-07-20 02:23:06 -07:00
Nathan Sobo
de1b69dbc9 Add DisplayBuffer.copy 2013-07-18 11:34:39 -07:00
Nathan Sobo
8b53b4d749 Add ability to copy display buffer markers 2013-07-18 10:25:03 -07:00
Nathan Sobo
804df73e8d Get edit session specs passing with selection based markers 2013-07-17 19:16:42 -07:00
Ben Ogle & Nathan Sobo
bb695ec53f Replicate the destruction of selections 2013-07-17 11:53:39 -07:00
Ben Ogle & Nathan Sobo
baeae2d8d5 Upgrade telepath so we can query 'invalidation' key in findMarkers 2013-07-17 10:25:02 -07:00
Kevin Sawicki
b1ca43ac0f Upgrade telepath 2013-07-16 09:49:45 -07:00
Kevin Sawicki & Nathan Sobo
abc20b3a05 Update text buffer to use telepath markers 2013-07-15 17:07:06 -07:00
Kevin Sawicki
041f52aaaa Upgrade apm 2013-07-12 14:07:03 -07:00
Kevin Sawicki
acb69a4221 Format stack traces in console reporter
This generates valid CoffeeScript line/column numbers and
also removes noisy lines from jasmine.js and from the grunt
stack portion for the initial test process spawn.
2013-07-06 15:39:32 -07:00
Kevin Sawicki & Nathan Sobo
bffe361151 Upgrade telepath 2013-07-05 12:53:51 -07:00
Kevin Sawicki
1efa480b4e Upgrade telepath 2013-07-05 12:53:50 -07:00
Kevin Sawicki & Nathan Sobo
05a3f35512 Normalize line endings in TextBuffer.change() 2013-07-05 12:53:50 -07:00
Kevin Sawicki & Nathan Sobo
72f9af4d00 Replicate buffer changes
Still some failures due to line endings
2013-07-05 12:53:49 -07:00
Kevin Sawicki & Nathan Sobo
dd0f7a032f Start basing Buffer's text on a replicable string 2013-07-05 12:53:49 -07:00
Cheng Zhao
857629e07e Revert "Revert "Upgrade apm: update node to v0.10.12.""
This reverts commit 18c5c788d7.
2013-07-04 08:52:13 +08:00
Cheng Zhao
18c5c788d7 Revert "Upgrade apm: update node to v0.10.12."
This reverts commit 433beac9aa.
2013-07-04 08:37:59 +08:00
Cheng Zhao
433beac9aa Upgrade apm: update node to v0.10.12. 2013-07-03 18:23:41 +08:00
Nathan Sobo
5a9e45f9d8 Upgrade telepath 2013-06-28 04:39:31 -06:00
Kevin Sawicki
b439e6239d Add telepath as submodule 2013-06-28 04:39:28 -06:00
Kevin Sawicki & Nathan Sobo
9c95a4751b Return telepath documents from getWindowState() 2013-06-28 04:39:25 -06:00
Cheng Zhao
f45ce3a7ee Upgrade apm: update to node v0.10.12. 2013-06-27 10:59:09 +08:00
Kevin Sawicki
46eac52dbf Upgrade apm 2013-06-24 14:57:32 -07:00
Kevin Sawicki
d227d8794d Upgrade apm 2013-06-24 14:24:29 -07:00
Kevin Sawicki
cf936a8a02 Upgrade apm 2013-06-24 11:45:53 -07:00
Kevin Sawicki
8aeedb8971 Upgrade apm 2013-06-06 13:23:19 -07:00
Cheng Zhao
feab9862ac Update apm for node v0.10.9. 2013-06-06 09:57:03 +08:00
Kevin Sawicki
2b6a4365ac Upgrade apm 2013-06-03 09:34:53 -07:00
Corey Johnson & Kevin Sawicki
17a83933d4 Use two -f flags to clean all git dirs 2013-05-29 10:01:33 -07:00
Kevin Sawicki
617af68aeb Upgrade apm 2013-05-28 09:25:28 -07:00
Kevin Sawicki
6690598024 Use TextMate packages instead of vendoring bundles 2013-05-28 09:25:22 -07:00
Kevin Sawicki
61b5160d81 Move apm to github org. 2013-05-21 18:24:55 -07:00
Kevin Sawicki
5859ae6ba7 Upgrade apm 2013-05-17 15:37:21 -07:00
Kevin Sawicki
74c889062b Upgrade apm 2013-05-14 13:14:55 -07:00
Kevin Sawicki
851febd495 Use apm to install modules 2013-05-14 12:30:35 -07:00
probablycorey
2e61201f86 Update ruby TextMate bundle
Closes #541
2013-05-13 16:51:30 -07:00
Nathan Sobo
b70ff1b164 Don't assign window.jQuery in jasmine-jquery.js helper
I wrap it in a function wrapper to ensure that the assignment
`var jQuery` doesn't end up assigning a window global.
2013-04-26 15:36:13 -07:00
Kevin Sawicki
a720919dd8 Add hyperlink helper TextMate bundle 2013-04-23 08:39:25 -07:00
Nathan Sobo
9204836d70 Update grammars when grammars they include are added/removed
If the Ruby on Rails grammar depends on HTML, but it isn't loaded, its
syntax highlighting won't include HTMl tokens. If we later load HTML,
we should update any buffer with the Rails grammar to reflect the
change. This commit changes grammars to memoize their initial rule and
repository. If an included grammar is added or removed, we clear the
memoized rules and emit a 'grammar-updated' event. Any tokenized
buffer that points to this grammar can then retokenize to reflect the
newly available/unavailable included grammar.
2013-04-22 11:33:59 -06:00
Kevin Sawicki
faca7f091a Include PEG js bundle 2013-04-19 10:58:35 -07:00
Kevin Sawicki
ed9f46b39f Upgrade TextMate PHP bundle to current master 2013-04-19 10:58:33 -07:00