jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote branch 'jviereck/keymapping'

Browse source 
Conflicts:
	.gitignore
	.gitmodules
	LICENSE
	demo/boot.js
	demo/startup.js
	lib/ace/editor.js
	support/cockpit
This commit is contained in:
Fabian Jakobs 2011-01-14 15:21:38 +01:00
commit 18adea4251
26 changed files with 2725 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

7
demo/boot.js
View file

@ -44,8 +44,11 @@ var config = {
}
};
require(config, ["pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings",
"pilot/environment", "demo/startup"], function() {
var deps = [ "pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings",
"pilot/environment", "demo/startup" ];
require(config);
require(deps, function() {
var catalog = require("pilot/plugin_manager").catalog;
catalog.registerPlugins([ "pilot/index", "cockpit/index" ]).then(function() {
var env = require("pilot/environment").create();

18
demo/startup.js
View file

@ -55,6 +55,10 @@ exports.launch = function(env) {
var TextMode = require("ace/mode/text").Mode;
var UndoManager = require("ace/undomanager").UndoManager;
var vim = require("ace/keyboard/vim").Vim;
var emacs = require("ace/keyboard/emacs").Emacs;
var HashHandler = require("ace/keyboard/hash_handler").HashHandler;
var docs = {};
docs.js = new Document(document.getElementById("jstext").innerHTML);
@ -80,6 +84,7 @@ exports.launch = function(env) {
var container = document.getElementById("editor");
env.editor = new Editor(new Renderer(container, theme));
<<<<<<< HEAD:demo/startup.js
var modes = {
text: new TextMode(),
@ -102,6 +107,17 @@ exports.launch = function(env) {
}
modeEl.onchange = setMode;
setMode();
=======
// This is how you can set a custom keyboardHandler.
//
// Define some basic keymapping using a hash:
// env.editor.setKeyboardHandler(new HashHandler({
// "gotoright": "Tab"
// }));
//
// Use a more complex keymapping:
// env.editor.setKeyboardHandler(vim);
>>>>>>> jviereck/keymapping:demo/demo_startup.js
var docEl = document.getElementById("doc");
function onDocChange() {
@ -235,4 +251,4 @@ exports.launch = function(env) {
});
};
});
});