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

Updates to scratchpad #787

Merged
merged 6 commits into from
Nov 6, 2016
Merged

Updates to scratchpad #787

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5aaa623
use cjs require
minrk Mar 29, 2016
de75a09
enable ctrl-enter
Sep 22, 2016
43c13e5
pass even through to notebook when scratchpad isn't focuesd
Sep 22, 2016
8712931
use forward-compatible function instead of alias
Sep 22, 2016
18a7d48
Merge pull request #9 from dwyatte/shortcuts
minrk Sep 24, 2016
0581186
Merge remote-tracking branch 'scratchpad/master' into scratchpad
jcb91 Nov 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions src/jupyter_contrib_nbextensions/nbextensions/scratchpad/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define(['require'], function (require) {
define(function (require, exports, module) {
"use strict";
var $ = require('jquery');
var Jupyter = require('base/js/namespace');
Expand Down Expand Up @@ -41,7 +41,10 @@ define(['require'], function (require) {
cell.refresh();
this.collapse();

// override shift-enter to execute me if I'm focused instead of the notebook's cell
// override ctrl/shift-enter to execute me if I'm focused instead of the notebook's cell
var execute_and_select_action = this.km.actions.register({
handler: $.proxy(this.execute_and_select_event, this),
}, 'scratchpad-execute-and-select');
var execute_action = this.km.actions.register({
handler: $.proxy(this.execute_event, this),
}, 'scratchpad-execute');
Expand All @@ -50,7 +53,8 @@ define(['require'], function (require) {
}, 'scratchpad-toggle');

var shortcuts = {
'shift-enter': execute_action,
'shift-enter': execute_and_select_action,
'ctrl-enter': execute_action,
'ctrl-b': toggle_action,
}
this.km.edit_shortcuts.add_shortcuts(shortcuts);
Expand Down Expand Up @@ -93,14 +97,22 @@ define(['require'], function (require) {
this.cell.element.hide();
};

Scratchpad.prototype.execute_event = function (evt) {
Scratchpad.prototype.execute_and_select_event = function (evt) {
if (utils.is_focused(this.element)) {
this.cell.execute();
} else {
this.notebook.execute_cell_and_select_below();
}
};

Scratchpad.prototype.execute_event = function (evt) {
if (utils.is_focused(this.element)) {
this.cell.execute();
} else {
this.notebook.execute_selected_cells();
}
};

function setup_scratchpad () {
// lazy, hook it up to Jupyter.notebook as the handle on all the singletons
console.log("Setting up scratchpad");
Expand Down