Merge pull request #3848 from minrk/empty-docstring

fix incorrect `empty-docstring`
13 years ago · 40b113fc4e
parent 14da30f06f 1f97024d2b
commit 40b113fc4e
1 changed files with 8 additions and 5 deletions
--- a/IPython/html/static/notebook/js/tooltip.js
+++ b/IPython/html/static/notebook/js/tooltip.js
@ -334,11 +334,14 @@ var IPython = (function (IPython) {
        if (docstring == null) {
            docstring = reply.docstring;
        }
-
-        if (docstring == null && this._hide_if_no_docstring) {
-            return;
-        } else {
-            docstring = "<empty docstring>";
+        
+        if (docstring == null) {
+            // For reals this time, no docstring
+            if (this._hide_if_no_docstring) {
+                return;
+            } else {
+                docstring = "<empty docstring>";
+            }
        }

        this.tooltip.fadeIn('fast');