From bdb1c94137e28ca89d617e819a7c6ead540df1f5 Mon Sep 17 00:00:00 2001 From: Matthias BUSSONNIER Date: Sat, 26 Oct 2013 13:28:58 +0200 Subject: [PATCH 1/2] fix and add shim for change introduce by #4195 comm merging renamed object_info_request to object_info --- IPython/html/static/notebook/js/tooltip.js | 6 ++---- IPython/html/static/services/kernels/js/kernel.js | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/IPython/html/static/notebook/js/tooltip.js b/IPython/html/static/notebook/js/tooltip.js index 4cfadf666..983aca4aa 100644 --- a/IPython/html/static/notebook/js/tooltip.js +++ b/IPython/html/static/notebook/js/tooltip.js @@ -221,11 +221,9 @@ var IPython = (function (IPython) { }; Tooltip.prototype._request_tooltip = function (cell, line) { - var callbacks = { shell : { - reply : $.proxy(this._show, this) - }}; + var callbacks = $.proxy(this._show, this); var oir_token = this.extract_oir_token(line); - var msg_id = cell.kernel.object_info_request(oir_token, callbacks); + var msg_id = cell.kernel.object_info(oir_token, callbacks); }; // make an imediate completion request diff --git a/IPython/html/static/services/kernels/js/kernel.js b/IPython/html/static/services/kernels/js/kernel.js index 9aa91aa2c..d16397c35 100644 --- a/IPython/html/static/services/kernels/js/kernel.js +++ b/IPython/html/static/services/kernels/js/kernel.js @@ -269,6 +269,11 @@ var IPython = (function (IPython) { return; }; + Kernel.prototype.object_info_request = function(objname, callback){ + console.log('Warning object_info_request is deprecated, use object_info') + return this.object_info(objname, callback.shell.reply) + } + /** * Execute given code into kernel, and pass result to callback. * From a74c36b62a326f9bfc103b2df9b2146ab45f44c6 Mon Sep 17 00:00:00 2001 From: Matthias BUSSONNIER Date: Sat, 26 Oct 2013 19:59:49 +0200 Subject: [PATCH 2/2] remove compatibility layer --- IPython/html/static/services/kernels/js/kernel.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/IPython/html/static/services/kernels/js/kernel.js b/IPython/html/static/services/kernels/js/kernel.js index d16397c35..9aa91aa2c 100644 --- a/IPython/html/static/services/kernels/js/kernel.js +++ b/IPython/html/static/services/kernels/js/kernel.js @@ -269,11 +269,6 @@ var IPython = (function (IPython) { return; }; - Kernel.prototype.object_info_request = function(objname, callback){ - console.log('Warning object_info_request is deprecated, use object_info') - return this.object_info(objname, callback.shell.reply) - } - /** * Execute given code into kernel, and pass result to callback. *