##// END OF EJS Templates
rename show/hide methods to avoid jQuery conflict....
Matthias BUSSONNIER -
Show More
@@ -9,8 +9,8 b''
9 **/
9 **/
10 /*
10 /*
11 * We'll try to get something pretty, so we
11 * We'll try to get something pretty, so we
12 * have some strange ccs to have the scroll bar on
12 * have some strange css to have the scroll bar on
13 * the left of the left with fix button on the top right of the tooltip
13 * the left with fix button on the top right of the tooltip
14 */
14 */
15 @-moz-keyframes fadeOut {
15 @-moz-keyframes fadeOut {
16 from {
16 from {
@@ -131,9 +131,3 b''
131 -ms-transform: rotate(45deg);
131 -ms-transform: rotate(45deg);
132 -o-transform: rotate(45deg);
132 -o-transform: rotate(45deg);
133 }
133 }
134 .tooltip.hide {
135 -webkit-animation: fadeOut 800ms;
136 -moz-animation: fadeOut 800ms;
137 animation: fadeOut 800ms;
138 opacity: 0;
139 }
@@ -152,8 +152,8 b' var IPython = (function (IPython) {'
152
152
153 // deal with all the logic of hiding the tooltip
153 // deal with all the logic of hiding the tooltip
154 // and reset it's status
154 // and reset it's status
155 Tooltip.prototype.hide = function () {
155 Tooltip.prototype._hide = function () {
156 this.tooltip.addClass('hide');
156 this.tooltip.fadeOut('fast');
157 $('#expanbutton').show('slow');
157 $('#expanbutton').show('slow');
158 this.text.removeClass('bigtooltip');
158 this.text.removeClass('bigtooltip');
159 this.text.addClass('smalltooltip');
159 this.text.addClass('smalltooltip');
@@ -167,10 +167,11 b' var IPython = (function (IPython) {'
167 // as in the completer, because it is not focusable, so won't
167 // as in the completer, because it is not focusable, so won't
168 // get the event.
168 // get the event.
169 if (this._sticky == false || force == true) {
169 if (this._sticky == false || force == true) {
170 this.hide();
170 this._hide();
171 }
171 }
172 this.cancel_pending();
172 this.cancel_pending();
173 this.reset_tabs_function ();
173 this.reset_tabs_function();
174 this._cmfocus();
174 }
175 }
175
176
176 // cancel autocall done after '(' for example.
177 // cancel autocall done after '(' for example.
@@ -210,7 +211,7 b' var IPython = (function (IPython) {'
210
211
211 var re = /[a-z_][0-9a-z._]+$/gi; // casse insensitive
212 var re = /[a-z_][0-9a-z._]+$/gi; // casse insensitive
212 var callbacks = {
213 var callbacks = {
213 'object_info_reply': $.proxy(this.show, this)
214 'object_info_reply': $.proxy(this._show, this)
214 }
215 }
215 var msg_id = IPython.notebook.kernel.object_info_request(re.exec(func), callbacks);
216 var msg_id = IPython.notebook.kernel.object_info_request(re.exec(func), callbacks);
216 }
217 }
@@ -278,7 +279,7 b' var IPython = (function (IPython) {'
278 }
279 }
279
280
280 // should be called with the kernel reply to actually show the tooltip
281 // should be called with the kernel reply to actually show the tooltip
281 Tooltip.prototype.show = function (reply) {
282 Tooltip.prototype._show = function (reply) {
282 // move the bubble if it is not hidden
283 // move the bubble if it is not hidden
283 // otherwise fade it
284 // otherwise fade it
284 this.name = reply.name;
285 this.name = reply.name;
@@ -310,8 +311,7 b' var IPython = (function (IPython) {'
310 this.arrow.animate({
311 this.arrow.animate({
311 'left': posarrowleft + 'px'
312 'left': posarrowleft + 'px'
312 });
313 });
313 this.tooltip.removeClass('hidden')
314 this.tooltip.fadeIn('fast');
314 this.tooltip.removeClass('hide');
315 this._hidden = false;
315 this._hidden = false;
316
316
317 // build docstring
317 // build docstring
@@ -12,7 +12,7 b''
12 /*
12 /*
13 * We'll try to get something pretty, so we
13 * We'll try to get something pretty, so we
14 * have some strange css to have the scroll bar on
14 * have some strange css to have the scroll bar on
15 * the left of the left with fix button on the top right of the tooltip
15 * the left with fix button on the top right of the tooltip
16 */
16 */
17
17
18 // double slash comment are remove by less compilation
18 // double slash comment are remove by less compilation
@@ -157,11 +157,3 b''
157 -ms-transform: rotate(@theta);
157 -ms-transform: rotate(@theta);
158 -o-transform: rotate(@theta);
158 -o-transform: rotate(@theta);
159 }
159 }
160
161 .tooltip.hide
162 {
163 -webkit-animation: fadeOut 800ms;
164 -moz-animation: fadeOut 800ms;
165 animation: fadeOut 800ms;
166 opacity : 0;
167 }
@@ -194,7 +194,7 b' data-notebook-id={{notebook_id}}'
194 </div>
194 </div>
195
195
196 </div>
196 </div>
197 <div id='tooltip' class='tooltip ui-corner-all hidden hide'></div>
197 <div id='tooltip' class='tooltip ui-corner-all' style='display:none'></div>
198
198
199
199
200 {% end %}
200 {% end %}
General Comments 0
You need to be logged in to leave comments. Login now