Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make 'Paste Above' the default paste behavior. #2572

Merged
merged 4 commits into from
Nov 22, 2012
Merged

Make 'Paste Above' the default paste behavior. #2572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a45e0e
Make 'Paste Above' the default paste behavior.
dwf Nov 12, 2012
1d61e05
"Paste Cell Replace" -> "Paste Cell & Replace"
dwf Nov 12, 2012
0f43c4f
past below by default
Carreau Nov 18, 2012
2faf0b8
Merge pull request #1 from Carreau/pr2572
dwf Nov 22, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions IPython/frontend/html/notebook/static/js/maintoolbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ var IPython = (function (IPython) {
},
{
id : 'paste_b',
label : 'Paste Cell',
label : 'Paste Cell Below',
icon : 'ui-icon-clipboard',
callback : function () {
IPython.notebook.paste_cell();
IPython.notebook.paste_cell_below();
}
}
],'cut_copy_paste');
Expand Down
12 changes: 6 additions & 6 deletions IPython/frontend/html/notebook/static/js/notebook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ var IPython = (function (IPython) {
that.control_key_active = false;
return false;
} else if (event.which === 86 && that.control_key_active) {
// Paste selected cell = v
that.paste_cell();
// Paste below selected cell = v
that.paste_cell_below();
that.control_key_active = false;
return false;
} else if (event.which === 68 && that.control_key_active) {
Expand Down Expand Up @@ -778,8 +778,8 @@ var IPython = (function (IPython) {
Notebook.prototype.enable_paste = function () {
var that = this;
if (!this.paste_enabled) {
$('#paste_cell').removeClass('ui-state-disabled')
.on('click', function () {that.paste_cell();});
$('#paste_cell_replace').removeClass('ui-state-disabled')
.on('click', function () {that.paste_cell_replace();});
$('#paste_cell_above').removeClass('ui-state-disabled')
.on('click', function () {that.paste_cell_above();});
$('#paste_cell_below').removeClass('ui-state-disabled')
Expand All @@ -791,7 +791,7 @@ var IPython = (function (IPython) {

Notebook.prototype.disable_paste = function () {
if (this.paste_enabled) {
$('#paste_cell').addClass('ui-state-disabled').off('click');
$('#paste_cell_replace').addClass('ui-state-disabled').off('click');
$('#paste_cell_above').addClass('ui-state-disabled').off('click');
$('#paste_cell_below').addClass('ui-state-disabled').off('click');
this.paste_enabled = false;
Expand All @@ -811,7 +811,7 @@ var IPython = (function (IPython) {
};


Notebook.prototype.paste_cell = function () {
Notebook.prototype.paste_cell_replace = function () {
if (this.clipboard !== null && this.paste_enabled) {
var cell_data = this.clipboard;
var new_cell = this.insert_cell_above(cell_data.cell_type);
Expand Down
2 changes: 1 addition & 1 deletion IPython/frontend/html/notebook/templates/notebook.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@
<ul>
<li id="cut_cell"><a href="#">Cut Cell</a></li>
<li id="copy_cell"><a href="#">Copy Cell</a></li>
<li id="paste_cell" class="ui-state-disabled"><a href="#">Paste Cell</a></li>
<li id="paste_cell_above" class="ui-state-disabled"><a href="#">Paste Cell Above</a></li>
<li id="paste_cell_below" class="ui-state-disabled"><a href="#">Paste Cell Below</a></li>
<li id="paste_cell_replace" class="ui-state-disabled"><a href="#">Paste Cell &amp; Replace</a></li>
<li id="delete_cell"><a href="#">Delete</a></li>
<hr/>
<li id="split_cell"><a href="#">Split Cell</a></li>
Expand Down