github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-08 05:35:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,142 Commits 140 Branches 571 Tags
9866e84c9f002bc1be2580da109b6da4860caa88
Commit Graph

70 Commits

Author SHA1 Message Date
Garen Torikian
a50cfa26cc Updates for new biscotto 2013-04-18 13:05:40 -07:00
Garen Torikian
130baf2235 Merge branch 'master' into api/docs 2013-04-17 16:08:18 -07:00
Nathan Sobo
738fc31f56 Add twitter bootstrap submodule and put it on less search path 2013-04-15 20:45:54 -06:00
Nathan Sobo
bbf7c6ca1b Replace requireStylesheet calls w/ @import directives in atom.less 2013-04-15 20:45:54 -06:00
Garen Torikian
6963503d6f Finish config 2013-04-12 14:23:43 -05:00
Garen Torikian
7e5b6bf5c4 Massive updates 2013-04-11 21:11:12 -05:00
Garen Torikian
bb8f5bb40c Fix errors 2013-04-11 02:29:48 -05:00
Nathan Sobo
f03b6207de Make all requires of 'fs-utils' assign to fsUtils var instead of fs 2013-04-03 12:01:37 -06:00
Kevin Sawicki & Nathan Sobo
501dc9b76c Merge remote-tracking branch 'origin/master' into cefode 
Conflicts:
	native/v8_extensions/native.mm
	spec/app/config-spec.coffee
	spec/app/window-spec.coffee
	spec/spec-helper.coffee
	spec/stdlib/fs-utils-spec.coffee
	src/app/atom-package.coffee
	src/app/config.coffee
	src/app/window.coffee
	src/packages/fuzzy-finder/lib/load-paths-handler.coffee
	src/packages/markdown-preview/lib/markdown-preview-view.coffee
	src/packages/tree-view/spec/tree-view-spec.coffee
	src/stdlib/require.coffee
 2013-03-20 10:46:50 -06:00
Kevin Sawicki
8dbcb44d06 Rename traverseTree to traverseTreeSync 
Also rename traverseTreeAsync to traverseTree
 2013-03-13 14:40:31 -07:00
Corey Johnson
c236325c1a Log errors (instead of crashing) when the config file cannot be parsed 
Also, config won't overwrite changes to config.cson when the file can not be parsed. Closes #401
 2013-03-12 16:47:26 -07:00
Kevin Sawicki & Nathan Sobo
1d1ba5f6d1 Use node's require instead of internal require 2013-03-12 10:38:05 -07:00
Kevin Sawicki
115b960ce7 Handle reading and writing in cson.coffee 
Moves helpers from fs.coffee to cson.coffee
 2013-03-11 22:40:00 -07:00
Kevin Sawicki
2212222c47 Use underscore node module 2013-03-11 11:22:36 -07:00
Kevin Sawicki
8cf32149b7 Return absolute paths from $native.traverseTree() 
Previously relative paths were generated even though
things like fs.list() and fs.listTree() would just
recombine them with the root path.

Closes #391
 2013-03-08 13:44:28 -08:00
Kevin Sawicki & Nathan Sobo
969327e822 Require user init script path after user keymaps 
Previously the user init script path was required before the
packages and user keymaps were loaded which could override
config and keymap settings set by the user init script path.
 2013-02-25 11:46:34 -08:00
Corey Johnson & Kevin Sawicki
31d8151c3e Copy themes to ~/.atom/themes when config loads 2013-02-22 14:46:30 -08:00
Corey Johnson & Kevin Sawicki
fa81871907 Initialize ~/.atom when config is loaded 
Closes #299
 2013-02-22 14:46:30 -08:00
Kevin Sawicki
b8aaad06a4 💄 2013-02-22 10:56:19 -08:00
Nathan Sobo
7f2747ead0 Make project a global and refactor startup process 2013-02-19 18:26:50 -07:00
Corey Johnson
d049f47844 expose config.userPackagesDirPath 2013-02-13 10:42:22 -08:00
Kevin Sawicki
449e4f5ac7 Load user keymaps after packages 
This allows user keymaps to override the default
bindings provided by packages.

Refs #261
 2013-02-12 20:38:05 -08:00
Kevin Sawicki
25b75b6659 Use fs.resolve instead of fs.resolveExtension 2013-02-04 12:51:04 -08:00
Kevin Sawicki
bd88a0de15 Support CSON config file 
Use ~/.atom/config.cson as the new default when no
config file exists.

~/.atom/config.json is still the default if they both
exist.
 2013-02-04 12:38:00 -08:00
Justin Palmer
82f1fb4420 load user.coffee from .atom directory 2013-01-30 15:34:38 -08:00
Kevin Sawicki
2001cc330f Remove unused requires 2013-01-29 10:22:57 -08:00
Jon Rohan
e1e764418b making the packageDirPaths order back to the way it was 2013-01-22 13:17:06 -08:00
Jon Rohan
379824f6b0 adding vendor/themes and themes to themeDirPaths 2013-01-22 12:41:59 -08:00
Jon Rohan
20e5b303a7 refactoring all the stylesheets into /Atom - Dark/ 
Conflicts:
	.atom/themes/Atom - Dark/vim-mode.css
 2013-01-17 22:11:45 -08:00
Kevin Sawicki & Nathan Sobo
ac3c059246 Extract _.setValueForKeyPath to underscore extensions 2013-01-10 18:02:55 -07:00
Nathan Sobo
d509093076 Don't write config defaults out to config.json 2013-01-04 17:08:25 -07:00
Kevin Sawicki
4078046ac6 Vendor textmate bundles as submodules 2013-01-04 08:18:52 -08:00
Nathan Sobo
0f59f5f58a Rename config "update" event to "updated" 2013-01-02 13:48:10 -07:00
Nathan Sobo
2d73aa292d Make theme loading more similar to package loading 
These changes are mostly aesthetic in nature. I just thought it would 
be a good idea to have theme loading be parallel to package loading as
much as possible. So I localized more logic on the `atom` global.
 2012-12-31 14:18:45 -06:00
Nathan Sobo
fa7bcfe51b Bundle a themes directory so we don't depend on ~/.atom/themes 
We'll look first in the user themes directory, then in the built-in
themes directory. This allows us to default to 'IR_Black' and not crash
if the user doesn't setup their `~/.atom/themes` directory.
 2012-12-31 12:08:36 -06:00
Corey Johnson
4a6d336763 Theme.load can take multiple theme names 2012-12-27 16:13:53 -08:00
Corey Johnson
4244e673af Load themes from Config.load 2012-12-27 15:52:09 -08:00
Corey Johnson
e5e5c497e1 Load themes from ~/.atom/themes 2012-12-26 17:41:48 -08:00
Nathan Sobo
886995364f Start on syntax global. Use it to replace scoped config settings. 
We'll store all syntax-related global state in the `syntax` global. For
now, this means that all scoped properties will be stored here, as well
as all grammars.
 2012-12-23 12:50:58 -07:00
Nathan Sobo
9b6c310239 Implement scoped config settings 
You can pass a scope stack when calling `config.get`, which will prefer
settings under the most specific matching scope selector for the given
scope stack.
 2012-12-21 18:20:20 -07:00
Nathan Sobo
356702c2f3 Clone defaults in config constructor so they aren't mutated. 
This fixes failures caused pollution of state between specs
 2012-12-20 22:13:12 -07:00
Nathan Sobo
0ca1440026 Oops. Don't overwrite user config w/ defaults before its loaded 2012-12-20 21:40:08 -07:00
Nathan Sobo
c7605b8aa6 Move loadPackages to atom global. Handle '-tmbundle' in regex. 
This simplifies the loading of TextMate bundles in the spec and benchmark helpers. Since `loadBundle` was already implemented on `atom`, it made sense to move this logic here. Config is now more focused on its core job of handling configuration, not loading bundles.
 2012-12-20 21:34:07 -07:00
Nathan Sobo
dd8597cc9c Set config defaults in its constructor 2012-12-20 21:30:37 -07:00
Corey Johnson
0515274e2f TextMate bundles end in .tmbundle or _tmbundle 2012-12-20 17:01:12 -08:00
Corey Johnson
5ea9a4d365 Load TextMate Bundles from packages directories 2012-12-20 16:25:08 -08:00
Corey Johnson
972d3e5536 💄 2012-12-20 10:34:36 -08:00
Nathan Sobo
4ce8583cb2 Rename extensions to packages 
We now look at the `core.disabledPackages` config key. Rename the `src/extensions` directory to `src/packages`. The config object now talks about loading packages instead of extensions.
 2012-12-18 20:03:21 -07:00
Nathan Sobo
37f0aa3f90 Replace window.requireExtension with atom.loadPackage 
The goal is that `loadPackage` will be the go-to place for loading all kinds of resources out of directories. `requireExtension` was only designed to load and activate extension modules.
 2012-12-18 19:47:20 -07:00
Nathan Sobo
e2457b90ac Disable extensions w/ config.core.disabledExtensions 
This replaces the `config.core.extensions` array with just an array of the extensions you don't want to load. The previous solution was attempting to allow the user to control extension load order, but we're not actually sure that's a good idea and this is simpler.
 2012-12-17 21:06:36 -07:00