github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-17 18:11:29 -05:00
Code Issues Packages Projects Releases Wiki Activity
25,704 Commits 140 Branches 571 Tags
4d44016eb1b9511b7f6524e9d3c3900a9c700ea5
Commit Graph

12958 Commits

Author SHA1 Message Date
simurai
ff93fdf617 Merge pull request #8537 from atom/as-gutter-z-index 
Gutter z-index
 2015-08-28 17:31:58 +09:00
Luke Pommersheim
3a5abef3af bug fix: go through the selections in reverse order 2015-08-28 10:13:31 +02:00
Nathan Sobo
314e082f1d Clean up max scroll margin code 
Previously we were attempting the same computation twice, once
incorrectly when returning the scroll margins as integers and then doing
the same thing in terms of pixels. This just cleans up the original
calculation. It’s *slightly* different because it takes the floor to
continue returning integers, but the behavior is extremely close.
 2015-08-27 17:40:01 -06:00
Antonio Scandurra
fa28aef2b5 Put a decreasing z-index on line numbers 2015-08-27 12:47:43 +02:00
Antonio Scandurra
9ea62673d2 Put a decreasing z-index on line-numbers tiles 2015-08-27 12:15:55 +02:00
Antonio Scandurra
423c3d945e 🐎 Remove redundant calls to screen conversion methods 2015-08-27 11:37:23 +02:00
Nathan Sobo
4bbc1d806e Create a selection automatically as needed if the last one was destroyed 
Fixes atom/bracket-matcher#102
 2015-08-26 17:59:33 -06:00
Nathan Sobo
6bfa228060 Merge pull request #8520 from atom/as-lines-height 
Change lines container height based on `TextEditorElement` dimensions
 2015-08-26 17:21:52 -06:00
Max Brunsfeld
014243637b Merge pull request #8527 from atom/mb-add-child-root-folder 
Allow adding a root folder that's within another root folder
 2015-08-26 15:44:30 -07:00
Max Brunsfeld
6df058c7f3 Allow adding a root folder that's within another root folder 2015-08-26 15:26:02 -07:00
Natthu Bharambe
4ffb8fae27 Merge remote-tracking branch 'upstream/master' 2015-08-26 14:36:25 -07:00
Jacek Kopecky
763d871470 use undo in IME composition 2015-08-26 20:28:23 +01:00
Nathan Sobo
1827aebc4b Merge pull request #8497 from ssorallen/menu-item-doc 
Document MenuItem `enabled` and `visible`
 2015-08-26 10:40:41 -06:00
Ross Allen
28f157acd9 Document MenuItem enabled and visible 
The Electron MenuItem[1] `enabled` and `visible` options are exposed to
Atom context menus in menu_helpers.coffee[2] but are not yet documented.
Both options are passed through to Electron.

[1] http://electron.atom.io/docs/v0.31.0/api/menu-item/
[2] https://github.com/atom/atom/blob/v1.0.7/src/menu-helpers.coffee#L49
 2015-08-26 09:00:23 -07:00
Antonio Scandurra
b5c0f5ac0b Change lines container height based on boundingClientRect 2015-08-26 16:21:51 +02:00
Max Brunsfeld
6c73f5eda7 Merge branch 'master' of https://github.com/jonathandelgado/atom into jonathandelgado-master 2015-08-25 12:36:58 -07:00
Max Brunsfeld
f57da0c6f8 Suppress merging selections during undo/redo 
Now, during undo/redo overlapping selections will be temporarily
created as markers are created via snapshots. Old selections will
immediately be destroyed though, since undo/redo now completely
replace all historied markers w/ those in the snapshot, so there
is no need to merge selections.
 2015-08-25 10:51:45 -07:00
Max Brunsfeld
5f7a0a32aa Merge pull request #8480 from jeremyramin/fix-config-get 
Fix config.get for schemas with objects
 2015-08-25 09:15:43 -07:00
Natthu Bharambe
e17a02b8b3 Fix a bug with refreshing the gutter UI. 2015-08-24 16:44:09 -07:00
Nathan Sobo
39e5e58be1 Merge pull request #8494 from lpommers/documentation-selections-preserve-folds 
📝 add preserveFolds documentation to setSelectedBufferRange(s)
 2015-08-24 15:40:53 -06:00
Max Brunsfeld
5c73e5a001 Add CommandRegistry::onDidDispatch 2015-08-24 14:10:02 -07:00
Luke Pommersheim
d03db928f8 📝 add preserveFolds documentation to setSelectedBufferRange(s) 2015-08-24 18:29:21 +02:00
Luke Pommersheim
7bb8586905 now possible to always move lines down at the end of the file 2015-08-23 19:30:10 +02:00
Luke Pommersheim
b394b2c903 preserve folds when making new selections 2015-08-23 19:29:14 +02:00
Luke Pommersheim
b29f2ae5a8 removed unnecessary + operator 2015-08-23 19:29:14 +02:00
Luke Pommersheim
e74b8b6ae2 use Point as insertion and no need to post-fix newline 2015-08-23 19:29:14 +02:00
Luke Pommersheim
5b698cfa2b update typo in comment 2015-08-23 17:50:23 +02:00
Jonathan Delgado
c292299516 Changed setting disableInitialEmptyEditor to openEmptyEditorOnStart 2015-08-23 07:51:22 -07:00
Jeremy Ramin
9a0d657d52 Adds deepDefaults to config 
Took at the deepExtend in the atom/underscore-plus repo and modified it
to become a deepDefaults method. Using this instead to see if it fixes
the failing specs.
 2015-08-22 23:03:19 -07:00
Jeremy Ramin
85800f6d00 Fix method typo 2015-08-22 21:16:32 -07:00
Jeremy Ebneyamin
f2c9688b43 Fix config.get for schemas containing objects 
The config.get method would not return the default values for the
properties in objects. Now with _.deepExtends, the default values are
the base while any new values overwrite the defaults. This way all
default values appear, including those nested in an object. This fixes
atom/settings-view#386 and fixes atom/settings-view#518.
 2015-08-22 19:44:17 -07:00
Max Brunsfeld
fb2a45d71d Merge pull request #8433 from atom/mb-bundle-line-ending-selector 
Support bundling babel packages and bundle the line-ending-selector package
 2015-08-21 17:45:10 -07:00
Max Brunsfeld
a4b9b9c6cd 👕 Use standard style for js code 2015-08-21 16:56:32 -07:00
Kevin Sawicki
fc95b5cded Merge pull request #8473 from atom/ld-typo 
📝 Fix a typo and make recommendation more clear
 2015-08-21 16:41:13 -07:00
Max Brunsfeld
f3778148a0 Catch errors when retrieving source maps 2015-08-21 15:37:36 -07:00
Max Brunsfeld
a18b7e2fa9 Don't make prepareStackTrace unwritable 
This breaks other code (such as Grim) that may want to temporarily
use a different prepareStackTrace function.
 2015-08-21 14:57:39 -07:00
Max Brunsfeld
a6fa098a8c Add CompileCache spec 2015-08-21 14:47:32 -07:00
Max Brunsfeld
f8397661d1 Defer coffee-script require, prevent it from reassigning prepareStackTrace 2015-08-21 13:48:56 -07:00
Max Brunsfeld
b533aff8f4 🐎 Minimize dependencies loaded before the module-cache 2015-08-21 13:48:56 -07:00
Lee Dohm
73dded1e42 📝 Fix a typo and make recommendation more clear 2015-08-21 13:14:28 -07:00
Jess Lin
b5b8591a51 Destroy a TextEditor's Gutters when it is destroyed 2015-08-21 12:55:22 -07:00
Max Brunsfeld
bb69f1352d 🎨 2015-08-21 11:50:54 -07:00
Max Brunsfeld
408202729e Add sourceURL comment to all compiled js files 2015-08-21 11:19:11 -07:00
Nathan Sobo
8b7f9b0471 Merge branch 'master' into mb-bundle-line-ending-selector 2015-08-21 11:54:10 -06:00
Max Brunsfeld
8c5eed28d2 Don't use es6 features in compile-cache 
APM requires it directly, and it uses an older version of node
 2015-08-21 10:31:29 -07:00
Max Brunsfeld
f531684acf Use compile-cache in browser process (for dev mode) 2015-08-20 17:59:29 -07:00
Nathan Sobo
6f44fc4c7f Generate sourceFiles in CoffeeScript source maps correctly 2015-08-20 16:08:25 -06:00
Nathan Sobo
c0f3ca6dcd Fix inline source map regex 
Need to enable multi-line mode after all

Signed-off-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2015-08-20 16:08:03 -06:00
Nathan Sobo
61ef1da815 🎨 
Signed-off-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2015-08-20 16:07:37 -06:00
Nathan Sobo
dba53f3358 Merge branch 'master' into mb-bundle-line-ending-selector 2015-08-20 14:05:28 -06:00