mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-12 11:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

completer update code-miror on the fly

Browse Source 
Following @fperez advice, change the completer apparence to avoid user confusion.

	- Append what the user type in the completer in code-miror, (Almost) as if
	  codemirror still have focus
	- distinguish between "fixed" completion  part, which was sent to the kernel
	  (now written in bold) and filtering one,handled only in JS,that the user
	  can errase without dismissing the completer

	I changed the action of <Space> to dismiss the completer with what have
	already been typed and inserting a space instead of "picking" the currently
	hilighted option

	<Escape> will still dissmiss the completer and remove everything the user as
	typed since the completer invocation

	Note that while the completer is shown, code-mirror does not show any
	blinking cursor
This commit is contained in:
Matthias BUSSONNIER 2011-12-03 18:29:38 +01:00
parent 1fbf5b18dd
commit c596d17eaf
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IPython/frontend/html/notebook/static/css/notebook.css
View File

@ -419,6 +419,11 @@ div.text_cell_render {
min-height:50px;
}
/*fixed part of the completion*/
.completions p b{
font-weight:bold;
}
.completions p{
background: #DDF;
/*outline: none;

40
IPython/frontend/html/notebook/static/js/codecell.js
View File

@ -241,19 +241,19 @@ var IPython = (function (IPython) {
var key = { tab:9,
esc:27,
backspace:8,
space:13,
space:32,
shift:16,
enter:32,
enter:13,
// _ is 95
isCompSymbol : function (code)
{
return (code > 64 && code <= 90)
return (code > 64 && code <= 90)
|| (code >= 97 && code <= 122)
|| (code == 95)
},
dismissAndAppend : function (code)
{
chararr = ['(',')','[',']','+','-','/','\\','.'];
chararr = ['(',')','[',']','+','-','/','\\','.',' '];
codearr = chararr.map(function(x){return x.charCodeAt(0)});
return jQuery.inArray(code, codearr) != -1;
}
@ -330,17 +330,23 @@ var IPython = (function (IPython) {
that.completion_cursor = null;
};
// insert the given text and exit the completer
var insert = function (selected_text, event) {
// update codemirror with the typed text
prev = matched_text
var update = function (inserted_text, event) {
that.code_mirror.replaceRange(
selected_text,
inserted_text,
{line: cur.line, ch: (cur.ch-matched_text.length)},
{line: cur.line, ch: cur.ch}
{line: cur.line, ch: (cur.ch+prev.length-matched_text.length)}
);
prev = inserted_text
if(event != null){
event.stopPropagation();
event.preventDefault();
}
};
// insert the given text and exit the completer
var insert = function (selected_text, event) {
update(selected_text)
close();
setTimeout(function(){that.code_mirror.focus();}, 50);
};
@ -373,8 +379,9 @@ var IPython = (function (IPython) {
}
}
//clear the previous completion if any
update(typed_text,event);
complete.children().children().remove();
$('#asyoutype').text(typed_text);
$('#asyoutype').html("<b>"+matched_text+"</b>"+typed_text.substr(matched_text.length));
select = $('#asyoutypeselect');
for (var i = 0; i<matches.length; ++i) {
select.append($('<option/>').html(matches[i]));
@ -385,7 +392,7 @@ var IPython = (function (IPython) {
// create html for completer
var complete = $('<div/>').addClass('completions');
complete.attr('id','complete');
complete.append($('<p/>').attr('id', 'asyoutype').html(matched_text));//pseudo input field
complete.append($('<p/>').attr('id', 'asyoutype').html('<b>fixed part</b>user part'));//pseudo input field
var select = $('<select/>').attr('multiple','true');
select.attr('id', 'asyoutypeselect')
@ -426,8 +433,8 @@ var IPython = (function (IPython) {
insert(matched_text+typed_characters,event);
return
}
if (code === key.space || code === key.enter) {
// Pressing SPACE or ENTER will cause a pick
if (code === key.enter) {
// Pressing ENTER will cause a pick
event.stopPropagation();
event.preventDefault();
pick();
@ -445,11 +452,10 @@ var IPython = (function (IPython) {
ffsub = fastForward.substr(matched_text.length+typed_characters.length);
typed_characters = typed_characters+ffsub;
autopick = true;
event.stopPropagation();
event.preventDefault();
} else if (code == key.backspace && down) {
// cancel if user have erase everything, otherwise decrease
// what we filter with
event.preventDefault();
if (typed_characters.length <= 0)
{
insert(matched_text,event)
@ -465,10 +471,12 @@ var IPython = (function (IPython) {
re = new RegExp("^"+"\%?"+matched_text+typed_characters,"");
filterd = matches.filter(function(x){return re.test(x)});
complete_with(filterd,matched_text+typed_characters,autopick,event);
} else if( press || code == key.esc){ // abort only on .keypress or esc
} else if( code == key.esc) {
// dismiss the completer and go back to before invoking it
insert(matched_text,event);
} else if( press ){ // abort only on .keypress or esc
// abort with what the user have pressed until now
console.log('aborting with keycode : '+code+' is down :'+down);
insert(matched_text+typed_characters,event);
}
}
select.keydown(function (event) {