upstream/ipython Commit - r7170:e0eb36bc

Clean code, retab and minor fix...

Matthias BUSSONNIER -

r7170:e0eb36bc

parent child

IPython/frontend/html/notebook/static/js/completer.js

0 +17 -18

                 // what is the common start of all completions
                 function sharedStart(B){
-                        if(B.length == 1){return B[0]}
+                        if(B.length == 1){return B[0];}
-                        var A = new Array()
+                        var A = new Array();
                         for(var i=0; i< B.length; i++)
                         {
                            A.push(B[i].str);
                         }
                         if(A.length > 1 ){
-                            var tem1, tem2, s, A = A.slice(0).sort();
+                            var tem1, tem2, s;
+                            A = A.slice(0).sort();
                             tem1 = A[0];
                             s = tem1.length;
                             tem2 = A.pop();
                     this.editor = cell.code_mirror;
                     // if last caractere before cursor is not in this, we stop completing
                     this.reg = /[0-9a-z.]/i; // casse insensitive
+                };
                 Completer.prototype.kernelCompletionRequest = function(){
                     var cur  = this.editor.getCursor();
                     // one could fork here and directly call finish completing if kernel is busy
                     var callbacks = {'complete_reply': $.proxy(this.finish_completing,this)};
                     IPython.notebook.kernel.complete(line, cur.ch, callbacks);
+                };
                 Completer.prototype.startCompletion = function()
                     this.done = false;
                     // use to get focus back on opera
                     this.carryOnCompletion(true);
+                };
                 Completer.prototype.carryOnCompletion = function(ff) {
                     // Pass true as parameter if you want the commpleter to autopick when
                     //one kernel completion came back, finish_completing will be called with the results
                     this.kernelCompletionRequest();
+                };
                 Completer.prototype.finish_completing =function (content) {
                     // let's build a function that wrap all that stuff into what is needed
                                 type : "introspection",
                                 from : {line: cur.line, ch: cur.ch-matched_text.length},
                                 to   : {line: cur.line, ch: cur.ch}
-                            })
+                            });
                     }
                     // one the 2 sources results have been merge, deal with it
                     // When there is only one completion, use it directly.
                     if (this.autopick == true && this.raw_result.length == 1)
+                    {
-                            this.insert(this.raw_result[0]);
+                        this.insert(this.raw_result[0]);
-                            return true;
+                        return;
+                    }
                     if (this.raw_result.length == 1)
                     {
                         // test if first and only completion totally matches
                         // what is typed, in this case dismiss
-                        var str = this.raw_result[0].str
+                        var str = this.raw_result[0].str;
-                        var cur = this.editor.getCursor();
                         var pre_cursor = this.editor.getRange({line:cur.line,ch:cur.ch-str.length},cur);
                         if(pre_cursor == str)
                             { this.close(); return ; }
                     $('body').append(this.complete);
                     //build the container
                     var that = this;
-                    this.sel.dblclick(function(){that.pick()});
+                    this.sel.dblclick(function(){that.pick();});
                     this.sel.blur(this.close);
-                    this.sel.keydown(function(event){that.keydown(event)});
+                    this.sel.keydown(function(event){that.keydown(event);});
                     this.build_gui_list(this.raw_result);
                 Completer.prototype.keydown = function(event) {
                   var code = event.keyCode;
+                  var that = this;
                   // Enter
                   if (code == key.enter) {CodeMirror.e_stop(event); this.pick();}
                   // Escape or backspace
                         CodeMirror.e_stop(event);
                         this.editor.focus();
                         //reinvoke self
-                        var that = this;
                         setTimeout(function(){that.carryOnCompletion();}, 50);
                   }
                   else if (code == key.upArrow || code == key.downArrow) {
                   else if (code != key.upArrow && code != key.downArrow) {
                     this.close(); this.editor.focus();
                     //we give focus to the editor immediately and call sell in 50 ms
-                    var that = this;
                     setTimeout(function(){that.carryOnCompletion();}, 50);
                   }
                 }

IPython/frontend/html/notebook/static/js/notebook.js

0 +5 -5

                 Notebook.prototype.bind_events = function () {
                     var that = this;
                     $([IPython.events]).on('set_next_input.Notebook', function (event, data) {
                         var index = that.find_cell_index(data.cell);
                         var new_cell = that.insert_cell_below('code',index);
                     $([IPython.events]).on('select.Cell', function (event, data) {
                         var index = that.find_cell_index(data.cell);
-            			that.select(index);
+                        that.select(index);
                     });
                 // Kernel related things
                 Notebook.prototype.start_kernel = function () {
-            		var base_url = $('body').data('baseKernelUrl') + "kernels";
+                    var base_url = $('body').data('baseKernelUrl') + "kernels";
                     this.kernel = new IPython.Kernel(base_url);
                     this.kernel.start(this.notebook_id);
                 };
                     var cell = that.get_selected_cell();
                     var cell_index = that.find_cell_index(cell);
                     if (cell instanceof IPython.CodeCell) {
-            			cell.execute();
+                        cell.execute();
                     } else if (cell instanceof IPython.HTMLCell) {
                         cell.render();
                     }
                 Notebook.prototype.load_notebook_success = function (data, status, xhr) {
-            		// Create the kernel before creating cells as they need to be passed it.
+                    // Create the kernel before creating cells as they need to be passed it.
                     if (! this.read_only) {
                         this.start_kernel();
                     }

IPython/frontend/html/notebook/static/js/tooltip.js

0 +1 -4

             // Tooltip
             //============================================================================
             //
-            // you can set the autocall time by setting `IPython.notebook.time_before_tooltip` in ms
+            // you can set the autocall time by setting `IPython.tooltip.time_before_tooltip` in ms
             var IPython = (function (IPython) {
                     this.tooltip.append(this.text);
                 };
-                // will resend the request on behalf on the cell which invoked the tooltip
-                // to show in it in pager. This is done so to be sure of having the same
-                // result as invoking `something?`
                 Tooltip.prototype.showInPager = function()
                 {
                      var that = this;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages