mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2024-12-21 04:10:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renaming execute methods.

Browse Source
This commit is contained in:
Brian E. Granger 2014-01-09 12:30:06 -08:00
parent 8d73a3ac05
commit 201217d847
5 changed files with 67 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IPython/html/static/notebook/js/keyboardmanager.js
View File

@ -104,21 +104,21 @@ var IPython = (function (IPython) {
'shift+enter' : {
help : 'run cell',
handler : function (event) {
IPython.notebook.execute_selected_cell('shift');
IPython.notebook.execute_cell();
return false;
}
},
'alt+enter' : {
help : 'run cell, insert below',
handler : function (event) {
IPython.notebook.execute_selected_cell('alt');
IPython.notebook.execute_cell_and_insert_below();
return false;
}
},
'ctrl+enter' : {
help : 'run cell, select below',
handler : function (event) {
IPython.notebook.execute_selected_cell('ctrl');
IPython.notebook.execute_cell_and_select_below();
return false;
}
}

2
IPython/html/static/notebook/js/maintoolbar.js
View File

@ -100,7 +100,7 @@ var IPython = (function (IPython) {
label : 'Run Cell',
icon : 'icon-play',
callback : function () {
IPython.notebook.execute_selected_cell();
IPython.notebook.execute_cell();
}
},
{

9
IPython/html/static/notebook/js/menubar.js
View File

@ -208,10 +208,13 @@ var IPython = (function (IPython) {
});
// Cell
this.element.find('#run_cell').click(function () {
IPython.notebook.execute_selected_cell();
IPython.notebook.execute_cell();
});
this.element.find('#run_cell_in_place').click(function () {
IPython.notebook.execute_selected_cell({terminal:true});
this.element.find('#run_cell_select_below').click(function () {
IPython.notebook.execute_cell_and_select_below();
});
this.element.find('#run_cell_insert_below').click(function () {
IPython.notebook.execute_cell_and_insert_below();
});
this.element.find('#run_all_cells').click(function () {
IPython.notebook.execute_all_cells();

77
IPython/html/static/notebook/js/notebook.js
View File

@ -1336,48 +1336,77 @@ var IPython = (function (IPython) {
};
/**
* Run the selected cell.
* Execute or render cell outputs and go into command mode.
*
* Execute or render cell outputs.
*
* @method execute_selected_cell
* @param {Object} options Customize post-execution behavior
* @method execute_cell
*/
Notebook.prototype.execute_selected_cell = function (mode) {
Notebook.prototype.execute_cell = function () {
// mode = shift, ctrl, alt
mode = mode || 'shift'
var cell = this.get_selected_cell();
var cell_index = this.find_cell_index(cell);
cell.execute();
this.command_mode();
this.set_dirty(true);
}
/**
* Execute or render cell outputs and insert a new cell below.
*
* @method execute_cell_and_insert_below
*/
Notebook.prototype.execute_cell_and_insert_below = function () {
var cell = this.get_selected_cell();
var cell_index = this.find_cell_index(cell);
cell.execute();
// If we are at the end always insert a new cell and return
if (cell_index === (this.ncells()-1) && mode !== 'shift') {
if (cell_index === (this.ncells()-1)) {
this.insert_cell_below('code');
this.select(cell_index+1);
this.edit_mode();
this.scroll_to_bottom();
this.set_dirty(true);
return;
}
if (mode === 'shift') {
this.command_mode();
} else if (mode === 'ctrl') {
this.select(cell_index+1);
this.get_cell(cell_index+1).focus_cell();
} else if (mode === 'alt') {
// Only insert a new cell, if we ended up in an already populated cell
var next_text = this.get_cell(cell_index+1).get_text();
if (/\S/.test(next_text) === true) {
this.insert_cell_below('code');
}
this.select(cell_index+1);
this.edit_mode();
}
// Only insert a new cell, if we ended up in an already populated cell
var next_text = this.get_cell(cell_index+1).get_text();
if (/\S/.test(next_text) === true) {
this.insert_cell_below('code');
}
this.select(cell_index+1);
this.edit_mode();
this.set_dirty(true);
};
/**
* Execute or render cell outputs and select the next cell.
*
* @method execute_cell_and_select_below
*/
Notebook.prototype.execute_cell_and_select_below = function () {
var cell = this.get_selected_cell();
var cell_index = this.find_cell_index(cell);
cell.execute();
// If we are at the end always insert a new cell and return
if (cell_index === (this.ncells()-1)) {
this.insert_cell_below('code');
this.select(cell_index+1);
this.edit_mode();
this.scroll_to_bottom();
this.set_dirty(true);
return;
}
this.select(cell_index+1);
this.get_cell(cell_index+1).focus_cell();
this.set_dirty(true);
};
/**
* Execute all cells below the selected cell.
@ -1418,7 +1447,7 @@ var IPython = (function (IPython) {
Notebook.prototype.execute_cell_range = function (start, end) {
for (var i=start; i<end; i++) {
this.select(i);
this.execute_selected_cell({add_new:false});
this.execute_cell();
};
};

6
IPython/html/templates/notebook.html
View File

@ -140,8 +140,10 @@ class="notebook_app"
<ul class="dropdown-menu">
<li id="run_cell" title="Run this cell, and move cursor to the next one">
<a href="#">Run</a></li>
<li id="run_cell_in_place" title="Run this cell, without moving to the next one">
<a href="#">Run in Place</a></li>
<li id="run_cell_select_below" title="Run this cell, select below">
<a href="#">Run and Select Below</a></li>
<li id="run_cell_insert_below" title="Run this cell, insert below">
<a href="#">Run and Insert Below</a></li>
<li id="run_all_cells" title="Run all cells in the notebook">
<a href="#">Run All</a></li>
<li id="run_all_cells_above" title="Run all cells above (but not including) this cell">