github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 13:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
15,732 Commits 140 Branches 571 Tags
v0.97.0
Commit Graph

15732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Sobo
fe31d2d28a Add scrolling benchmark to React editor v0.97.0 2014-05-22 13:25:47 -06:00
Kevin Sawicki
71e83962ac Merge pull request #2356 from klorenz/master 
📝 Add solution for "TypeError: Unable to watch path"
 2014-05-22 11:34:50 -07:00
Kevin Sawicki
f79039e4f7 Upgrade to apm 0.57.0 2014-05-22 11:17:14 -07:00
Kevin Sawicki
08e6dc20e1 Upgrade to settings-view@0.116.0 2014-05-22 09:57:33 -07:00
Nathan Sobo
4f14d8a64f Merge pull request #2344 from atom/ns-ks-react-dont-measure-when-hidden 
React: Don't measure line height / char width when editor is hidden
 2014-05-22 10:56:43 -06:00
Nathan Sobo
da53dfc903 Upgrade atom-keymap for numpad fixes on Linux/Windows 2014-05-22 10:54:19 -06:00
Nathan Sobo
875cfefd36 Merge branch 'master' into ns-ks-react-dont-measure-when-hidden 
Conflicts:
	spec/editor-component-spec.coffee
	src/editor-component.coffee
	src/editor-scroll-view-component.coffee
	src/lines-component.coffee
 2014-05-22 10:48:21 -06:00
Nathan Sobo
b6fb996ceb Merge pull request #2327 from atom/ns-react-fork 
Use Atom-specific fork of React allowing selection restoration opt out
 2014-05-22 10:41:26 -06:00
Nathan Sobo
316559ae09 Merge pull request #2345 from atom/ns-ks-lines-div-height 
Ensure .lines div is always at least the height of the scroll view
 2014-05-22 10:35:44 -06:00
Nathan Sobo
08d28d7ed4 Upgrade space-pen so $.fn.views doesn't return undefined values 2014-05-22 10:34:15 -06:00
probablycorey
3a3adf43a4 Merge remote-tracking branch 'origin/master' into zelon-master 
Conflicts:
	docs/build-instructions/windows.md
 2014-05-22 09:29:53 -07:00
Kevin Sawicki & Nathan Sobo
0951305962 Wire editor.lineHeight config value 2014-05-22 10:17:22 -06:00
Kevin Sawicki & Nathan Sobo
481935c880 Add specs for updating lineHeightInPixels when changing font size/family 2014-05-22 10:17:22 -06:00
Kevin Sawicki & Nathan Sobo
8ffcdad89a Re-measure the line height in pixels when the CSS line-height changes 2014-05-22 10:17:21 -06:00
Kevin Sawicki & Nathan Sobo
9e3ce09658 Rename lineHeight to lineHeightInPixels to distinguish from CSS value 
CSS has a line-height property with values like '1.3', but we also have
a measured pixel value for line height. It's important to keep these
separate conceptually.
 2014-05-22 10:17:12 -06:00
Corey Johnson
8c5d0775bc Merge pull request #2339 from atom/cj-add-spec-documentation 
Add spec documentation
 2014-05-22 08:51:02 -07:00
Kay-Uwe (Kiwi) Lorenz
36e8b10917 Merge branch 'master' of https://github.com/klorenz/atom 2014-05-22 17:43:03 +02:00
Kay-Uwe (Kiwi) Lorenz
b2b048994c added a solution for an issue in linux troubleshooting section 2014-05-22 17:41:18 +02:00
Ivan Žužak
6db23e67e8 Merge pull request #2353 from aaronraimist/master 
Updates Jasmine link in CONTRIBUTING.md
 2014-05-22 17:13:18 +02:00
Aaron Raimist
7872e95561 Updates Jasmine link in CONTRIBUTING.md 2014-05-22 10:03:45 -05:00
Kevin Sawicki & Nathan Sobo
45eeee9aea Ensure .lines div is always at least the height of the scroll view 
This ensures that the wrap guide extends the entire height of the
editor.
 2014-05-21 19:07:03 -06:00
Kevin Sawicki & Nathan Sobo
9cbc693c77 Avoid measuring lineHeight/defaultCharWidth on show unless needed 
We only need to re-measure if the fontSize, fontFamily, or lineHeight
changed while the editor was hidden.
 2014-05-21 17:35:57 -06:00
Kevin Sawicki & Nathan Sobo
ee9d4ab70e Don't measure lineHeight/defaultCharWidth when editor is hidden 2014-05-21 17:15:47 -06:00
Kevin Sawicki & Nathan Sobo
68c3113b75 Call hide on the views instead of the jQuery collection 
This ensures that views with custom ::hide methods can invoke special
behavior.
 2014-05-21 17:11:36 -06:00
probablycorey
3a71b0470b Add links to writing specs doc 2014-05-21 14:47:30 -07:00
probablycorey
421cdb41b9 Add spec documentation 2014-05-21 14:45:36 -07:00
Corey Johnson
a8538a1361 Merge pull request #2295 from lee-dohm/contributing 
📝 Unify the two contributing documents
 2014-05-21 12:38:23 -07:00
Lee Dohm
c3cedd2dc9 Split out the package-specific information 
Per PR feedback, splitting out package-specific development information
into its own document.
 2014-05-21 11:35:23 -07:00
Kevin Sawicki
da38218941 Upgrade to bracket-matcher@0.38.0 2014-05-21 09:29:05 -07:00
Kevin Sawicki
c700ca0430 Remove unused sync option 2014-05-21 08:55:40 -07:00
KIM, JINWOOK
0fe3f2d03c Use 'with' instead of 'and' 
Using 'with' instead of 'and' could prevent some people to think that SP1 is an other program, or is Windows SP1
 2014-05-21 22:11:59 +09:00
Nathan Sobo
65b1e13b83 Use Atom-specific fork of React allowing selection restoration opt out 
This fork of React allows data-react-skip-selection-restoration to be
defined on input elements, skipping costly selection restoration that
occurs when the input element is focused during reconciliation.
 2014-05-20 23:05:13 -06:00
Nathan Sobo
2acb387446 Merge pull request #2317 from atom/cj-add-invisibles-to-react-editor 
Add invisibles to react editor
 2014-05-20 22:10:12 -06:00
probablycorey
746273a2ef Merge remote-tracking branch 'origin/master' into cj-add-invisibles-to-react-editor 2014-05-20 16:30:18 -07:00
Nathan Sobo
778beba901 Remove editor-colors class from line numbers 2014-05-20 17:10:55 -06:00
Nathan Sobo
9278920093 Merge branch 'master' into cj-add-invisibles-to-react-editor 
Conflicts:
	src/editor-component.coffee
 2014-05-20 17:03:14 -06:00
probablycorey
ece868c9de Concat strings instead of joining an Array 2014-05-20 15:16:07 -07:00
Kevin Sawicki
651ed9b91e Upgrade to apm 0.56.0 2014-05-20 15:08:23 -07:00
Nathan Sobo
ac993680db Remove stray logging 2014-05-20 15:27:28 -06:00
Nathan Sobo
48b33ed07d 💄 2014-05-20 15:17:19 -06:00
Nathan Sobo
724953206f Merge pull request #2319 from atom/ns-react-no-cursor-animation 
Don't use CSS animations to blink cursor in the React editor
 2014-05-20 15:09:50 -06:00
Nathan Sobo
c4e3b90201 Upgrade atom-keymap for Linux support and 'unset!' on partial matches 2014-05-20 15:07:43 -06:00
probablycorey
a722d1aa36 Make editor component spec pass 2014-05-20 14:07:36 -07:00
probablycorey
25e3ae0325 Re-render the lines when the showInvisible config option is triggered 2014-05-20 13:58:22 -07:00
Ivan Žužak
e26da5887d Upgrade to markdown-preview@0.72.0 2014-05-20 22:37:25 +02:00
Kevin Sawicki
31037797e4 Upgrade to bracket-matcher@0.37.0 2014-05-20 13:27:27 -07:00
Nathan Sobo
2ae7cba452 Don't blink cursors with CSS animation 
It seems to create intermittent lags when moving the cursor and typing.
 2014-05-20 14:04:59 -06:00
Nathan Sobo
fa3ebc8c0f Fix interval cancellation in specs 2014-05-20 14:03:44 -06:00
probablycorey
ff36781c98 Add failing spec for toggling showInvisibles config option 2014-05-20 12:34:43 -07:00
probablycorey
2f038cbe66 Update lines component when invisibles changes 2014-05-20 12:34:18 -07:00