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

Always copy code and output when changing new language #15

Closed
wants to merge 1 commit into from
Closed

Always copy code and output when changing new language #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 21 additions & 38 deletions src/scripts/plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,42 +14,18 @@ const languageDictionary = {
SageMath: ['SageMath'],
};

const editScriptAreaHTML = (language = 'python3') => {
const sample = {
python3: {
code: 'print(\'Hello world!\')',
output: 'Hello world!',
},
R: {
code: 'print(\'Hello world!\')',
output: '[1] "Hello world!"',
},
julia: {
code: 'println("Hello world!")',
output: 'Hello world!',
},
octave: {
code: 'printf(\'Hello world!\')',
output: 'Hello world! Hello world!',
},
SageMath: {
code: 'print(\'Hello world!\')',
output: 'Hello world!',
},
};

if (sample[language] === undefined) return 'Error!';
const editScriptAreaHTML = (language = 'python3', code = null, output = null) => (`
<label>Edit script:</label>
<pre data-executable="true" data-language=${language}>
${code === null ? 'print(\'Hello world!\')' : code}
</pre>
<div data-output="true">
${output === null ? 'Hello world!' : output}
</div>
`);

return `
<label>Edit script:</label>
<pre data-executable="true" data-language=${language}>
${sample[language].code}
</pre>
<div data-output="true">
${sample[language].output}
</div>
`;
};
const getOutputElement = () => document.querySelector('.cke_dialog_contents .jp-OutputArea-output');
const getCodeMirror = () => document.querySelector('.cke_dialog_contents .thebelab-input .CodeMirror').CodeMirror;

const dialogConfig = (editor) => ({
title: 'Insert Interactive Script',
Expand All @@ -71,7 +47,14 @@ const dialogConfig = (editor) => ({
default: 'Python 3',
onChange() {
const element = this.getDialog().getContentElement('tab-basic', 'code').getElement();
element.setHtml(editScriptAreaHTML(languageDictionary[this.getValue()]));
element.setHtml(
editScriptAreaHTML(
languageDictionary[this.getValue()],
getCodeMirror().getValue(),
getOutputElement().innerHTML,
),
);

activateThebelab(thebelabConfig);
},
},
Expand Down Expand Up @@ -109,7 +92,7 @@ const dialogConfig = (editor) => ({
const language = languageDictionary[dialog.getValueOf('tab-basic', 'language')];
const noOutput = dialog.getValueOf('tab-basic', 'no-output');
const noCode = dialog.getValueOf('tab-basic', 'no-code');
const cm = document.querySelector('.cke_dialog_contents .thebelab-input .CodeMirror').CodeMirror;
const cm = getCodeMirror();
const code = cm.getValue();

// creates code block to be inserted into text editor
Expand All @@ -123,7 +106,7 @@ const dialogConfig = (editor) => ({

// create output block
if (!noOutput) {
let output = document.querySelector('.cke_dialog_contents .jp-OutputArea-output');
let output = getOutputElement();
if (output) {
// the output will contain a pre tag if run by binder
if (output.children.length !== 0 && output.children[0].tagName === 'PRE') {
Expand Down