Skip to content

Make escape work like ctrl-[. #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivanov merged 1 commit into from
Jul 11, 2014
Merged

Make escape work like ctrl-[. #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions vimception.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ cmd.add_shortcuts(command_shortcuts);
// (IPython.keyboard_manager) get it CodeMirror issues signals on mode change,
// so we have to hook into that to get Ctrl-[
edit.remove_shortcut('Ctrl-[');
edit.remove_shortcut('Esc');

CodeMirror.commands.leaveInsertOrEdit = function (cm) {
if ( cm.state.vim.insertMode ) {
Expand All @@ -153,6 +154,7 @@ CodeMirror.commands.leaveInsertOrEdit = function (cm) {
//C().options.extraKeys['Ctrl-['] = 'leaveInsertOrEdit';
all_cm( function (cm) {
cm.options.extraKeys['Ctrl-['] = 'leaveInsertOrEdit';
cm.options.extraKeys['Esc'] = 'leaveInsertOrEdit';
if ( CodeMirror.defaults.extraKeys === null ) {
CodeMirror.defaults.extraKeys = {};
}
Expand All @@ -162,6 +164,8 @@ all_cm( function (cm) {
// - it could also be the case that when we instatiate CodeMirror, we somehow leave out CM.defaults.extraKeys
IPython.CodeCell.options_default.cm_config.extraKeys['Ctrl-['] = 'leaveInsertOrEdit';
IPython.TextCell.options_default.cm_config.extraKeys['Ctrl-['] = 'leaveInsertOrEdit';
IPython.CodeCell.options_default.cm_config.extraKeys['Esc'] = 'leaveInsertOrEdit';
IPython.TextCell.options_default.cm_config.extraKeys['Esc'] = 'leaveInsertOrEdit';
})

// On blur, make sure we go back to command mode for CodeMirror (in case user clicked away)
Expand Down Expand Up @@ -259,7 +263,6 @@ cmd.add_shortcut('shift-j', def_cmd['shift-m'])

//edit.add_shortcut('k', def_edit['up'].handler);
//[edit.add_shortcut('j', def_edit['down'].handler);
edit.remove_shortcut('ctrl-[');

CodeMirror.prototype.save = function() {
IPython.notebook.save_checkpoint()
Expand Down Expand Up @@ -323,9 +326,6 @@ all_cm( function (cm) {
cm.setOption('theme', "xq-light");
// support this a :only? turn off full screen on blur
cm.options.extraKeys["F11"] = function(cm) { cm.setOption("fullScreen", !cm.getOption("fullScreen"))};
cm.options.extraKeys["Esc"] = function(cm) {
if (cm.getOption("fullScreen")) cm.setOption("fullScreen", false);
};
cm.options.extraKeys["Ctrl-A"] = function(cm) {
if (cm.getOption("fullScreen")) cm.setOption("fullScreen", false);
};
Expand Down