Show More
@@ -179,12 +179,7 b' var IPython = (function (IPython) {' | |||||
179 | return true; |
|
179 | return true; | |
180 | }; |
|
180 | }; | |
181 | } else if (event.which === key.ESC) { |
|
181 | } else if (event.which === key.ESC) { | |
182 |
|
|
182 | return IPython.tooltip.remove_and_cancel_tooltip(true); | |
183 | IPython.tooltip.remove_and_cancel_tooltip(true); |
|
|||
184 | return true; |
|
|||
185 | } else { |
|
|||
186 | return false; |
|
|||
187 | } |
|
|||
188 | } else if (event.which === key.DOWNARROW && event.type === 'keydown') { |
|
183 | } else if (event.which === key.DOWNARROW && event.type === 'keydown') { | |
189 | // If we are not at the bottom, let CM handle the down arrow and |
|
184 | // If we are not at the bottom, let CM handle the down arrow and | |
190 | // prevent the global keydown handler from handling it. |
|
185 | // prevent the global keydown handler from handling it. |
@@ -161,16 +161,23 b' var IPython = (function (IPython) {' | |||||
161 | this.code_mirror = null; |
|
161 | this.code_mirror = null; | |
162 | } |
|
162 | } | |
163 |
|
163 | |||
|
164 | // return true on successfully removing a visible tooltip; otherwise return | |||
|
165 | // false. | |||
164 | Tooltip.prototype.remove_and_cancel_tooltip = function (force) { |
|
166 | Tooltip.prototype.remove_and_cancel_tooltip = function (force) { | |
165 | // note that we don't handle closing directly inside the calltip |
|
167 | // note that we don't handle closing directly inside the calltip | |
166 | // as in the completer, because it is not focusable, so won't |
|
168 | // as in the completer, because it is not focusable, so won't | |
167 | // get the event. |
|
169 | // get the event. | |
168 |
if (this._ |
|
170 | if (this._hidden === false) { | |
169 | this.cancel_stick(); |
|
171 | if (this._sticky == false || force == true) { | |
170 |
this. |
|
172 | this.cancel_stick(); | |
|
173 | this._hide(); | |||
|
174 | } | |||
|
175 | this.cancel_pending(); | |||
|
176 | this.reset_tabs_function(); | |||
|
177 | return true; | |||
|
178 | } else { | |||
|
179 | return false; | |||
171 | } |
|
180 | } | |
172 | this.cancel_pending(); |
|
|||
173 | this.reset_tabs_function(); |
|
|||
174 | } |
|
181 | } | |
175 |
|
182 | |||
176 | // cancel autocall done after '(' for example. |
|
183 | // cancel autocall done after '(' for example. | |
@@ -335,7 +342,7 b' var IPython = (function (IPython) {' | |||||
335 | if (docstring == null) { |
|
342 | if (docstring == null) { | |
336 | docstring = reply.docstring; |
|
343 | docstring = reply.docstring; | |
337 | } |
|
344 | } | |
338 |
|
345 | |||
339 | if (docstring == null) { |
|
346 | if (docstring == null) { | |
340 | // For reals this time, no docstring |
|
347 | // For reals this time, no docstring | |
341 | if (this._hide_if_no_docstring) { |
|
348 | if (this._hide_if_no_docstring) { |
General Comments 0
You need to be logged in to leave comments.
Login now