From 06f63549e5bacb750155370fe88c4295b2b31b64 Mon Sep 17 00:00:00 2001
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: Thu, 24 Nov 2011 21:00:31 +0100
Subject: [PATCH 1/7] Base of an as you type conpleter.

	when invoking the completer, instead of having to chose/dismiss, you can
	continue typing, it will filter the result "as you type" and dismiss itself
	if ther is no match left.

	As it is now, it's only works with lowercase letters, I need to find a workaroud
	for this.

	for example
	if you type :
	* P-y-<tab>-S-o-m-e-t-h-i-n-g
	* it will propose PySide, but will dismiss when 'o' is pressed and pasting Pyso with a lower case 's'
---
 .../html/notebook/static/css/notebook.css     |   9 ++
 .../html/notebook/static/js/codecell.js       | 114 +++++++++++++-----
 2 files changed, 95 insertions(+), 28 deletions(-)

diff --git a/IPython/frontend/html/notebook/static/css/notebook.css b/IPython/frontend/html/notebook/static/css/notebook.css
index d2a37af2a..01d376c27 100644
--- a/IPython/frontend/html/notebook/static/css/notebook.css
+++ b/IPython/frontend/html/notebook/static/css/notebook.css
@@ -406,6 +406,15 @@ div.text_cell_render {
     min-height:50px;
 }
 
+.completions p{
+    background: #DDF;
+    /*outline: none;
+    padding: 0px;*/
+    border-bottom: black solid 1px;
+    padding: 1px;
+    font-family: monospace;
+}
+
 @media print {
     body { overflow: visible !important; }
     .ui-widget-content { border: 0px; }
diff --git a/IPython/frontend/html/notebook/static/js/codecell.js b/IPython/frontend/html/notebook/static/js/codecell.js
index 8aa744199..6d7901128 100644
--- a/IPython/frontend/html/notebook/static/js/codecell.js
+++ b/IPython/frontend/html/notebook/static/js/codecell.js
@@ -229,9 +229,10 @@ var IPython = (function (IPython) {
         // setTimeout(CodeCell.prototype.remove_and_cancell_tooltip, 5000);
     };
 
-
+    // As you type completer
     CodeCell.prototype.finish_completing = function (matched_text, matches) {
-        // console.log("Got matches", matched_text, matches);
+
+        // smart completion, sort kwarg ending with '='
         var newm = new Array();
         if(this.notebook.smart_completer)
         {
@@ -245,6 +246,8 @@ var IPython = (function (IPython) {
             newm = kwargs.concat(other);
             matches=newm;
         }
+        // end sort kwargs
+
         if (!this.is_completing || matches.length === 0) {return;}
 
         //try to check if the user is typing tab at least twice after a word
@@ -268,54 +271,90 @@ var IPython = (function (IPython) {
             this.prevmatch="";
             this.npressed=0;
         }
+        // end fallback on tooltip
 
+        // Real completion logic start here
         var that = this;
         var cur = this.completion_cursor;
+        var done = false;
+
+        // call to dismmiss the completer
+        var close = function () {
+            if (done) return;
+            done = true;
+            if (complete!=undefined)
+            {complete.remove();}
+            that.is_completing = false;
+            that.completion_cursor = null;
+        };
 
+        // insert the given text and exit the completer
         var insert = function (selected_text) {
             that.code_mirror.replaceRange(
                 selected_text,
                 {line: cur.line, ch: (cur.ch-matched_text.length)},
                 {line: cur.line, ch: cur.ch}
             );
+            event.stopPropagation();
+            event.preventDefault();
+            close();
+            setTimeout(function(){that.code_mirror.focus();}, 50);
+        };
+
+        // insert the curent highlited selection and exit
+        var pick = function () {
+            insert(select.val()[0]);
         };
 
+        // if only one match, complete to it, don't ask user
         if (matches.length === 1) {
             insert(matches[0]);
-            setTimeout(function(){that.code_mirror.focus();}, 50);
             return;
         };
 
+
+        // Define function to clear the completer, refill it with the new
+        // matches, update the pseuso typing field. Note that this is case
+        // insensitive for now
+        var complete_with = function(matches,typed_text)
+        {
+            //clear the previous completion if any
+            if (matches.length < 1) {
+                insert(typed_text);
+            }
+            complete.children().children().remove();
+            $('#asyoutype').text(typed_text);
+            select=$('#asyoutypeselect');
+            for (var i=0; i<matches.length; ++i) {
+                    select.append($('<option/>').html(matches[i]));
+            }
+            select.children().first().attr('selected','true');
+        }
+
+        // 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
+
         var select = $('<select/>').attr('multiple','true');
-        for (var i=0; i<matches.length; ++i) {
-            select.append($('<option/>').text(matches[i]));
-        }
-        select.children().first().attr('selected','true');
-        select.attr('size',Math.min(10,matches.length));
+            select.attr('id', 'asyoutypeselect')
+            select.attr('size',Math.min(10,matches.length));
         var pos = this.code_mirror.cursorCoords();
+
+        // TODO: I propose to remove enough horizontal pixel
+        // to align the text later
         complete.css('left',pos.x+'px');
         complete.css('top',pos.yBot+'px');
         complete.append(select);
 
         $('body').append(complete);
-        var done = false;
-
-        var close = function () {
-            if (done) return;
-            done = true;
-            complete.remove();
-            that.is_completing = false;
-            that.completion_cursor = null;
-        };
 
-        var pick = function () {
-            insert(select.val()[0]);
-            close();
-            setTimeout(function(){that.code_mirror.focus();}, 50);
-        };
+        //do a first actual completion
+        complete_with(matches,matched_text);
 
-        select.blur(close);
+        // Give focus to select, and make it filter the match as the user type
+        // by filtering the previous matches
+        typed_characters = "";
         select.keydown(function (event) {
             var code = event.which;
             if (code === 13 || code === 32) {
@@ -327,16 +366,35 @@ var IPython = (function (IPython) {
                 // We don't want the document keydown handler to handle UP/DOWN,
                 // but we want the default action.
                 event.stopPropagation();
+            } else if (code>64 && code <90 || code==8){
+                // issues with _-.. on chrome at least
+                if(code != 8)
+                {
+                    var newchar = String.fromCharCode(code).toLowerCase();
+                    typed_characters=typed_characters+newchar;
+                } else {
+                    // 8 is backspace remove 1 char cancel if
+                    // user have erase everything, otherwise
+                    // decrease what we filter with
+                    if (typed_characters.length <= 0)
+                    {
+                        insert(matched_text)
+                    }
+                    typed_characters=typed_characters.substr(0,typed_characters.length-1);
+                }
+                re = new RegExp("^"+"\%?"+matched_text+typed_characters,"i");
+                filterd= matches.filter(function(x){return re.test(x)});
+                complete_with(filterd,matched_text+typed_characters);
             } else {
-                // All other key presses exit completion.
-                event.stopPropagation();
-                event.preventDefault();
-                close();
-                that.code_mirror.focus();
+                // abort with what the user have pressed until now
+                console.log('aborting with keycode : '+code);
+                insert(matched_text+typed_characters);
             }
         });
         // Double click also causes a pick.
+        // and bind the last actions.
         select.dblclick(pick);
+        select.blur(close);
         select.focus();
     };
 

From 5f70418dc5b8eca7afc60604c02ed4fbc811f5c4 Mon Sep 17 00:00:00 2001
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: Fri, 25 Nov 2011 18:11:29 +0100
Subject: [PATCH 2/7] protect shift extend on Uppercase

---
 IPython/frontend/html/notebook/static/js/codecell.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IPython/frontend/html/notebook/static/js/codecell.js b/IPython/frontend/html/notebook/static/js/codecell.js
index 6d7901128..4f6ef53ab 100644
--- a/IPython/frontend/html/notebook/static/js/codecell.js
+++ b/IPython/frontend/html/notebook/static/js/codecell.js
@@ -357,6 +357,10 @@ var IPython = (function (IPython) {
         typed_characters = "";
         select.keydown(function (event) {
             var code = event.which;
+            if (code === 16) {
+                // nothing on Shift
+                return;
+            }
             if (code === 13 || code === 32) {
                 // Pressing SPACE or ENTER will cause a pick
                 event.stopPropagation();
@@ -366,7 +370,7 @@ var IPython = (function (IPython) {
                 // We don't want the document keydown handler to handle UP/DOWN,
                 // but we want the default action.
                 event.stopPropagation();
-            } else if (code>64 && code <90 || code==8){
+            } else if (code>64 && code <=122 || code==8){
                 // issues with _-.. on chrome at least
                 if(code != 8)
                 {

From 27f2b2b876fb7fbeccef7ca47df1ebbbee7e54b3 Mon Sep 17 00:00:00 2001
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: Tue, 29 Nov 2011 17:54:22 +0100
Subject: [PATCH 3/7] Handle lower and uppercase

---
 .../html/notebook/static/js/codecell.js       | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/IPython/frontend/html/notebook/static/js/codecell.js b/IPython/frontend/html/notebook/static/js/codecell.js
index 4f6ef53ab..0ecf26023 100644
--- a/IPython/frontend/html/notebook/static/js/codecell.js
+++ b/IPython/frontend/html/notebook/static/js/codecell.js
@@ -355,7 +355,14 @@ var IPython = (function (IPython) {
         // Give focus to select, and make it filter the match as the user type
         // by filtering the previous matches
         typed_characters = "";
-        select.keydown(function (event) {
+        var downandpress = function (event,press_or_down) {
+            if (press_or_down === 0){
+                press=true;
+                down=false;
+            } else if (press_or_down == 1){
+                press=false;
+                down=true;
+            }
             var code = event.which;
             if (code === 16) {
                 // nothing on Shift
@@ -370,13 +377,13 @@ var IPython = (function (IPython) {
                 // We don't want the document keydown handler to handle UP/DOWN,
                 // but we want the default action.
                 event.stopPropagation();
-            } else if (code>64 && code <=122 || code==8){
+            } else if ((code>64 && code <=122)|| (code==8 && down)){
                 // issues with _-.. on chrome at least
-                if(code != 8)
+                if(code != 8 && press)
                 {
-                    var newchar = String.fromCharCode(code).toLowerCase();
+                    var newchar = String.fromCharCode(code);
                     typed_characters=typed_characters+newchar;
-                } else {
+                } else if (code == 8) {
                     // 8 is backspace remove 1 char cancel if
                     // user have erase everything, otherwise
                     // decrease what we filter with
@@ -386,14 +393,20 @@ var IPython = (function (IPython) {
                     }
                     typed_characters=typed_characters.substr(0,typed_characters.length-1);
                 }
-                re = new RegExp("^"+"\%?"+matched_text+typed_characters,"i");
+                re = new RegExp("^"+"\%?"+matched_text+typed_characters,"");
                 filterd= matches.filter(function(x){return re.test(x)});
                 complete_with(filterd,matched_text+typed_characters);
-            } else {
+            } else if(down){ // abort only on press
                 // abort with what the user have pressed until now
                 console.log('aborting with keycode : '+code);
                 insert(matched_text+typed_characters);
             }
+        }
+        select.keydown(function (event) {
+            downandpress(event,1)
+        });
+        select.keypress(function (event) {
+            downandpress(event,0)
         });
         // Double click also causes a pick.
         // and bind the last actions.

From 5e1bd70d3604843cd87bb2c02a4c0bb7567b1d3c Mon Sep 17 00:00:00 2001
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: Tue, 29 Nov 2011 20:59:37 +0100
Subject: [PATCH 4/7] tabs fast forward user tab

---
 .../html/notebook/static/js/codecell.js       | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/IPython/frontend/html/notebook/static/js/codecell.js b/IPython/frontend/html/notebook/static/js/codecell.js
index 0ecf26023..4513bbf93 100644
--- a/IPython/frontend/html/notebook/static/js/codecell.js
+++ b/IPython/frontend/html/notebook/static/js/codecell.js
@@ -248,6 +248,20 @@ var IPython = (function (IPython) {
         }
         // end sort kwargs
 
+        function sharedStart(A){
+            if(A.length > 1 ){
+            var tem1, tem2, s, A= A.slice(0).sort();
+            tem1= A[0];
+            s= tem1.length;
+            tem2= A.pop();
+            while(s && tem2.indexOf(tem1)== -1){
+                tem1= tem1.substring(0, --s);
+            }
+            return tem1;
+            }
+            return "";
+        }
+
         if (!this.is_completing || matches.length === 0) {return;}
 
         //try to check if the user is typing tab at least twice after a word
@@ -377,12 +391,19 @@ var IPython = (function (IPython) {
                 // We don't want the document keydown handler to handle UP/DOWN,
                 // but we want the default action.
                 event.stopPropagation();
-            } else if ((code>64 && code <=122)|| (code==8 && down)){
+            } else if ((code>64 && code <=122)|| (code==8 && down)||(code==9 && down)){
                 // issues with _-.. on chrome at least
                 if(code != 8 && press)
                 {
                     var newchar = String.fromCharCode(code);
                     typed_characters=typed_characters+newchar;
+                } else if (code == 9) {
+                    fastForward = sharedStart(filterd)
+                    ffsub = fastForward.substr(matched_text.length+typed_characters.length);
+                    typed_characters=typed_characters+ffsub;
+                    console.log("Fast forded by :"+ffsub);
+                    event.stopPropagation();
+                    event.preventDefault();
                 } else if (code == 8) {
                     // 8 is backspace remove 1 char cancel if
                     // user have erase everything, otherwise

From 1fb62e259eebe848ab68cbf9967dceb2fb25bcc7 Mon Sep 17 00:00:00 2001
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: Wed, 30 Nov 2011 00:05:12 +0100
Subject: [PATCH 5/7] tab pick if only one match left

---
 .../html/notebook/static/js/codecell.js       | 57 +++++++++++--------
 .../html/notebook/static/js/kernel.js         |  2 +-
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/IPython/frontend/html/notebook/static/js/codecell.js b/IPython/frontend/html/notebook/static/js/codecell.js
index 4513bbf93..5c2a16cbd 100644
--- a/IPython/frontend/html/notebook/static/js/codecell.js
+++ b/IPython/frontend/html/notebook/static/js/codecell.js
@@ -233,6 +233,14 @@ var IPython = (function (IPython) {
     CodeCell.prototype.finish_completing = function (matched_text, matches) {
 
         // smart completion, sort kwarg ending with '='
+        var key = { tab:9,
+                    esc:8,
+                    space:13,
+                    shift:16,
+                    enter:32,
+                    // _ is 189
+                    isCompSymbol : function (code) {return ((code>64 && code <=122)|| code == 189)}
+                    }
         var newm = new Array();
         if(this.notebook.smart_completer)
         {
@@ -320,22 +328,20 @@ var IPython = (function (IPython) {
             insert(select.val()[0]);
         };
 
-        // if only one match, complete to it, don't ask user
-        if (matches.length === 1) {
-            insert(matches[0]);
-            return;
-        };
-
 
         // Define function to clear the completer, refill it with the new
         // matches, update the pseuso typing field. Note that this is case
         // insensitive for now
-        var complete_with = function(matches,typed_text)
+        var complete_with = function(matches,typed_text,autopick)
         {
-            //clear the previous completion if any
+            // If autopick an only one match, past.
+            // Used to 'pick' when pressing tab
             if (matches.length < 1) {
                 insert(typed_text);
+            } else if (autopick && matches.length==1) {
+                insert(matches[0]);
             }
+            //clear the previous completion if any
             complete.children().children().remove();
             $('#asyoutype').text(typed_text);
             select=$('#asyoutypeselect');
@@ -364,25 +370,25 @@ var IPython = (function (IPython) {
         $('body').append(complete);
 
         //do a first actual completion
-        complete_with(matches,matched_text);
-
+        fastForward = sharedStart(matches)
+        typed_characters= fastForward.substr(matched_text.length);
+        complete_with(matches,matched_text+typed_characters,true);
+        filterd=matches;
         // Give focus to select, and make it filter the match as the user type
         // by filtering the previous matches
-        typed_characters = "";
         var downandpress = function (event,press_or_down) {
+            var code = event.which;
+            var autopick = false; // auto 'pick' if only one match
             if (press_or_down === 0){
-                press=true;
-                down=false;
+                press=true; down=false; //Are we called from keypress or keydown
             } else if (press_or_down == 1){
-                press=false;
-                down=true;
+                press=false; down=true;
             }
-            var code = event.which;
-            if (code === 16) {
+            if (code === key.shift) {
                 // nothing on Shift
                 return;
             }
-            if (code === 13 || code === 32) {
+            if (code === key.space || code === key.enter) {
                 // Pressing SPACE or ENTER will cause a pick
                 event.stopPropagation();
                 event.preventDefault();
@@ -391,20 +397,21 @@ var IPython = (function (IPython) {
                 // We don't want the document keydown handler to handle UP/DOWN,
                 // but we want the default action.
                 event.stopPropagation();
-            } else if ((code>64 && code <=122)|| (code==8 && down)||(code==9 && down)){
+            //} else if ( key.isCompSymbol(code)|| (code==key.backspace)||(code==key.tab && down)){
+            } else if ( (code==key.backspace)||(code==key.tab) || press || key.isCompSymbol(code)){
                 // issues with _-.. on chrome at least
-                if(code != 8 && press)
+                if((code != key.backspace) && (code != key.tab) && press) 
                 {
                     var newchar = String.fromCharCode(code);
                     typed_characters=typed_characters+newchar;
-                } else if (code == 9) {
+                } else if (code == key.tab) {
                     fastForward = sharedStart(filterd)
                     ffsub = fastForward.substr(matched_text.length+typed_characters.length);
                     typed_characters=typed_characters+ffsub;
-                    console.log("Fast forded by :"+ffsub);
+                    autopick=true;
                     event.stopPropagation();
                     event.preventDefault();
-                } else if (code == 8) {
+                } else if (code == key.backspace) {
                     // 8 is backspace remove 1 char cancel if
                     // user have erase everything, otherwise
                     // decrease what we filter with
@@ -416,10 +423,10 @@ 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);
+                complete_with(filterd,matched_text+typed_characters,autopick);
             } else if(down){ // abort only on press
                 // abort with what the user have pressed until now
-                console.log('aborting with keycode : '+code);
+                console.log('aborting with keycode : '+code+press);
                 insert(matched_text+typed_characters);
             }
         }
diff --git a/IPython/frontend/html/notebook/static/js/kernel.js b/IPython/frontend/html/notebook/static/js/kernel.js
index 16f9445bf..6f00922cb 100644
--- a/IPython/frontend/html/notebook/static/js/kernel.js
+++ b/IPython/frontend/html/notebook/static/js/kernel.js
@@ -171,7 +171,7 @@ var IPython = (function (IPython) {
     };
 
     Kernel.prototype.object_info_request = function (objname) {
-        if(typeof(objname)!=null)
+        if(typeof(objname)!=null && objname!=null)
         {
             var content = {
                 oname : objname.toString(),

From 1b68c17acc755998b0ebf90425d2c270426ba66d Mon Sep 17 00:00:00 2001
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: Wed, 30 Nov 2011 00:26:14 +0100
Subject: [PATCH 6/7] tidy up code

---
 .../html/notebook/static/js/codecell.js       | 56 ++++++++++---------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/IPython/frontend/html/notebook/static/js/codecell.js b/IPython/frontend/html/notebook/static/js/codecell.js
index 5c2a16cbd..5ba34745b 100644
--- a/IPython/frontend/html/notebook/static/js/codecell.js
+++ b/IPython/frontend/html/notebook/static/js/codecell.js
@@ -231,16 +231,22 @@ var IPython = (function (IPython) {
 
     // As you type completer
     CodeCell.prototype.finish_completing = function (matched_text, matches) {
+        //return if not completing or nothing to complete
+        if (!this.is_completing || matches.length === 0) {return;}
 
-        // smart completion, sort kwarg ending with '='
+        // for later readability
         var key = { tab:9,
-                    esc:8,
+                    esc:27,
+                    backspace:8,
                     space:13,
                     shift:16,
                     enter:32,
                     // _ is 189
-                    isCompSymbol : function (code) {return ((code>64 && code <=122)|| code == 189)}
+                    isCompSymbol : function (code)
+                        {return ((code>64 && code <=122)|| code == 189)}
                     }
+
+        // smart completion, sort kwarg ending with '='
         var newm = new Array();
         if(this.notebook.smart_completer)
         {
@@ -256,21 +262,21 @@ var IPython = (function (IPython) {
         }
         // end sort kwargs
 
+        // give common prefix of a array of string
         function sharedStart(A){
             if(A.length > 1 ){
-            var tem1, tem2, s, A= A.slice(0).sort();
-            tem1= A[0];
-            s= tem1.length;
-            tem2= A.pop();
-            while(s && tem2.indexOf(tem1)== -1){
-                tem1= tem1.substring(0, --s);
-            }
-            return tem1;
+                var tem1, tem2, s, A= A.slice(0).sort();
+                tem1= A[0];
+                s= tem1.length;
+                tem2= A.pop();
+                while(s && tem2.indexOf(tem1)== -1){
+                    tem1= tem1.substring(0, --s);
+                }
+                return tem1;
             }
             return "";
         }
 
-        if (!this.is_completing || matches.length === 0) {return;}
 
         //try to check if the user is typing tab at least twice after a word
         // and completion is "done"
@@ -294,7 +300,7 @@ var IPython = (function (IPython) {
             this.npressed=0;
         }
         // end fallback on tooltip
-
+        //==================================
         // Real completion logic start here
         var that = this;
         var cur = this.completion_cursor;
@@ -330,8 +336,9 @@ var IPython = (function (IPython) {
 
 
         // Define function to clear the completer, refill it with the new
-        // matches, update the pseuso typing field. Note that this is case
-        // insensitive for now
+        // matches, update the pseuso typing field. autopick insert match if
+        // only one left, in no matches (anymore) dismiss itself by pasting
+        // what the user have typed until then
         var complete_with = function(matches,typed_text,autopick)
         {
             // If autopick an only one match, past.
@@ -369,13 +376,14 @@ var IPython = (function (IPython) {
 
         $('body').append(complete);
 
-        //do a first actual completion
+        // So a first actual completion.  see if all the completion start wit
+        // the same letter and complete if necessary
         fastForward = sharedStart(matches)
         typed_characters= fastForward.substr(matched_text.length);
         complete_with(matches,matched_text+typed_characters,true);
         filterd=matches;
         // Give focus to select, and make it filter the match as the user type
-        // by filtering the previous matches
+        // by filtering the previous matches. Called by .keypress and .keydown
         var downandpress = function (event,press_or_down) {
             var code = event.which;
             var autopick = false; // auto 'pick' if only one match
@@ -399,8 +407,7 @@ var IPython = (function (IPython) {
                 event.stopPropagation();
             //} else if ( key.isCompSymbol(code)|| (code==key.backspace)||(code==key.tab && down)){
             } else if ( (code==key.backspace)||(code==key.tab) || press || key.isCompSymbol(code)){
-                // issues with _-.. on chrome at least
-                if((code != key.backspace) && (code != key.tab) && press) 
+                if((code != key.backspace) && (code != key.tab) && press)
                 {
                     var newchar = String.fromCharCode(code);
                     typed_characters=typed_characters+newchar;
@@ -412,9 +419,8 @@ var IPython = (function (IPython) {
                     event.stopPropagation();
                     event.preventDefault();
                 } else if (code == key.backspace) {
-                    // 8 is backspace remove 1 char cancel if
-                    // user have erase everything, otherwise
-                    // decrease what we filter with
+                    // cancel if user have erase everything, otherwise decrease
+                    // what we filter with
                     if (typed_characters.length <= 0)
                     {
                         insert(matched_text)
@@ -422,11 +428,11 @@ var IPython = (function (IPython) {
                     typed_characters=typed_characters.substr(0,typed_characters.length-1);
                 }
                 re = new RegExp("^"+"\%?"+matched_text+typed_characters,"");
-                filterd= matches.filter(function(x){return re.test(x)});
+                filterd = matches.filter(function(x){return re.test(x)});
                 complete_with(filterd,matched_text+typed_characters,autopick);
-            } else if(down){ // abort only on press
+            } else if(down){ // abort only on .keydown
                 // abort with what the user have pressed until now
-                console.log('aborting with keycode : '+code+press);
+                console.log('aborting with keycode : '+code+' is down :'+down);
                 insert(matched_text+typed_characters);
             }
         }

From 90b6f1b8d6e14186159b73d40ed3826f11f1cb2b Mon Sep 17 00:00:00 2001
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: Wed, 30 Nov 2011 00:31:58 +0100
Subject: [PATCH 7/7] fix double tooltip

	there was a possibility of 2 tooltip if clicking in two cell
	and one that it wasn't able to dismiss
---
 IPython/frontend/html/notebook/static/js/codecell.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/IPython/frontend/html/notebook/static/js/codecell.js b/IPython/frontend/html/notebook/static/js/codecell.js
index 5ba34745b..9bb1f6914 100644
--- a/IPython/frontend/html/notebook/static/js/codecell.js
+++ b/IPython/frontend/html/notebook/static/js/codecell.js
@@ -73,8 +73,8 @@ var IPython = (function (IPython) {
         var that = this;
         // whatever key is pressed, first, cancel the tooltip request before
         // they are sent, and remove tooltip if any
-        if(event.type === 'keydown' && this.tooltip_timeout != null){
-            CodeCell.prototype.remove_and_cancell_tooltip(that.tooltip_timeout);
+        if(event.type === 'keydown' ){
+            CodeCell.prototype.remove_and_cancel_tooltip(that.tooltip_timeout);
             that.tooltip_timeout=null;
         }
 
@@ -145,12 +145,13 @@ var IPython = (function (IPython) {
         return false;
     };
 
-    CodeCell.prototype.remove_and_cancell_tooltip = function(timeout)
+    CodeCell.prototype.remove_and_cancel_tooltip = function(timeout)
     {
         // note that we don't handle closing directly inside the calltip
         // as in the completer, because it is not focusable, so won't
         // get the event.
-        clearTimeout(timeout);
+        if(timeout != null)
+        { clearTimeout(timeout);}
         $('#tooltip').remove();
     }