##// END OF EJS Templates
Merge pull request #4876 from minrk/tooltip-not-found...
Matthias Bussonnier -
r14789:a3e6ba6a merge
parent child Browse files
Show More
@@ -303,6 +303,10 var IPython = (function (IPython) {
303 // move the bubble if it is not hidden
303 // move the bubble if it is not hidden
304 // otherwise fade it
304 // otherwise fade it
305 var content = reply.content;
305 var content = reply.content;
306 if (!content.found) {
307 // object not found, nothing to show
308 return;
309 }
306 this.name = content.name;
310 this.name = content.name;
307
311
308 // do some math to have the tooltip arrow on more or less on left or right
312 // do some math to have the tooltip arrow on more or less on left or right
@@ -337,22 +341,22 var IPython = (function (IPython) {
337
341
338 // build docstring
342 // build docstring
339 var defstring = content.call_def;
343 var defstring = content.call_def;
340 if (defstring == null) {
344 if (!defstring) {
341 defstring = content.init_definition;
345 defstring = content.init_definition;
342 }
346 }
343 if (defstring == null) {
347 if (!defstring) {
344 defstring = content.definition;
348 defstring = content.definition;
345 }
349 }
346
350
347 var docstring = content.call_docstring;
351 var docstring = content.call_docstring;
348 if (docstring == null) {
352 if (!docstring) {
349 docstring = content.init_docstring;
353 docstring = content.init_docstring;
350 }
354 }
351 if (docstring == null) {
355 if (!docstring) {
352 docstring = content.docstring;
356 docstring = content.docstring;
353 }
357 }
354
358
355 if (docstring == null) {
359 if (!docstring) {
356 // For reals this time, no docstring
360 // For reals this time, no docstring
357 if (this._hide_if_no_docstring) {
361 if (this._hide_if_no_docstring) {
358 return;
362 return;
General Comments 0
You need to be logged in to leave comments. Login now