From bc5aeebd11cd14d217970a955de6f4e636e1f2ae Mon Sep 17 00:00:00 2001
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: Thu, 24 Nov 2011 19:36:20 +0100
Subject: [PATCH] handle null objectname on tooltip

---
 .../frontend/html/notebook/static/js/kernel.js   | 16 ++++++++++------
 .../frontend/html/notebook/static/js/notebook.js |  5 +++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/IPython/frontend/html/notebook/static/js/kernel.js b/IPython/frontend/html/notebook/static/js/kernel.js
index 53a8d6868..b3ae6ba4f 100644
--- a/IPython/frontend/html/notebook/static/js/kernel.js
+++ b/IPython/frontend/html/notebook/static/js/kernel.js
@@ -171,12 +171,16 @@ var IPython = (function (IPython) {
     };
 
     Kernel.prototype.object_info_request = function (objname) {
-        var content = {
-            oname : objname.toString(),
-        };
-        var msg = this.get_msg("object_info_request", content);
-        this.shell_channel.send(JSON.stringify(msg));
-        return msg.header.msg_id;
+        if(typeof(objname)!=null)
+        {
+            var content = {
+                oname : objname.toString(),
+            };
+            var msg = this.get_msg("object_info_request", content);
+            this.shell_channel.send(JSON.stringify(msg));
+            return msg.header.msg_id;
+        }
+        return;
     }
 
     Kernel.prototype.execute = function (code) {
diff --git a/IPython/frontend/html/notebook/static/js/notebook.js b/IPython/frontend/html/notebook/static/js/notebook.js
index f824e97d7..d59105e12 100644
--- a/IPython/frontend/html/notebook/static/js/notebook.js
+++ b/IPython/frontend/html/notebook/static/js/notebook.js
@@ -739,7 +739,6 @@ var IPython = (function (IPython) {
 
     Notebook.prototype.handle_payload = function (cell, payload) {
         var l = payload.length;
-        console.log(payload);
         for (var i=0; i<l; i++) {
             if (payload[i].source === 'IPython.zmq.page.page') {
                 if (payload[i].text.trim() !== '') {
@@ -919,7 +918,9 @@ var IPython = (function (IPython) {
         func = func.replace(endBracket,"");
         var re = /[a-zA-Z._]+$/g;
         var msg_id = this.kernel.object_info_request(re.exec(func));
-        this.msg_cell_map[msg_id] = cell.cell_id;
+        if(typeof(msg_id)!='undefined'){
+            this.msg_cell_map[msg_id] = cell.cell_id;
+            }
     };
 
     Notebook.prototype.complete_cell = function (cell, line, cursor_pos) {