JSON tweaks.

This commit is contained in:
Thomas Wilburn 2013-09-10 16:38:30 -07:00
parent bc1b736222
commit fa0f0820e8
2 changed files with 17 additions and 2 deletions

View file

@ -1,7 +1,21 @@
/*
All settings for Caret are stored in JSON-formatted files. If you open one of
these files from the menu, then save it, it'll be dropped into Chrome's
synchronized storage, which means that (theoretically) all your computers will
get a copy.
Unfortunately, it's not (yet) feasible to merge configuration the way that
Sublime does, which means that this won't behave exactly like you may expect.
If new options are introduced, you'll need to copy your settings to a new
file, reset Caret's config to the defaults from the menu, then copy your
configuration changes back over. Sorry about that. I'm working on it.
*/
{
"defaultTheme": "chrome", //AKA "Native"
"indentation": 2,
"wordWrap": true,
"fontFamily": "", //only fixed-width fonts are currently supported
"fontFamily": "", //WARNING: only fixed-width fonts are currently supported
"fontSize": 13
}

View file

@ -303,7 +303,8 @@ define([
Settings.load(name, function() {
var data = Settings.getAsString(name);
var file = Settings.getAsFile(name);
addTab(data, file).setUseWorker(false);
//since we allow comments, it's a good idea to tweak the display to JS mode
addTab(data, file).setMode("ace/mode/javascript");
});
});