Skip to content

erp5
erp5
Commit 9beecd84 authored by Boxiang Sun's avatar Boxiang Sun
Browse files
Options

erp5_notebook: Load pyodide in jsmd eval file to handle python setction. 

The output of  Python is  a mimic of jupyter notebook.
parent 854572f8
Show whitespace changes
Inline Side-by-side
Showing with 75 additions and 3 deletions
bt5/erp5_notebook/SkinTemplateItem/portal_skins/erp5_notebook/gadget_jsmd_eval.html.html
View file @ 9beecd84
...@@ -8,10 +8,15 @@ ...@@ -8,10 +8,15 @@
<meta name="viewport" content="width=device-width" /> <meta name="viewport" content="width=device-width" />
<title>JSMD Eval Gadget</title> <title>JSMD Eval Gadget</title>
<link rel="stylesheet" type="text/css" href="default.css" />
<script src="rsvp.js" type="text/javascript"></script> <script src="rsvp.js" type="text/javascript"></script>
<script src="marked.js" type="text/javascript"></script> <script src="marked.js" type="text/javascript"></script>
<script src="pyodide.js" type="text/javascript"></script>
<script src="gadget_jsmd_eval.js" type="text/javascript"></script> <script src="gadget_jsmd_eval.js" type="text/javascript"></script>
<script src="highlight.js" type="text/javascript"></script>
<script>hljs.initHighlightingOnLoad();</script>
</head> </head>
<body class="pane-content"> <body class="pane-content">
......
bt5/erp5_notebook/SkinTemplateItem/portal_skins/erp5_notebook/gadget_jsmd_eval.js.js
View file @ 9beecd84
/*global window, console, RSVP, document, URL, eval, XMLHttpRequest, marked */ /*global window, console, RSVP, document, URL, eval, XMLHttpRequest, marked, pyodide hljs */
/*jslint nomen: true, indent: 2, maxerr: 3 */ /*jslint nomen: true, indent: 2, maxerr: 3 */
(function (window) { (function (window, languagePluginLoader) {
"use strict"; "use strict";
var IODide = function createIODide() { var IODide = function createIODide() {
...@@ -107,6 +107,8 @@ ...@@ -107,6 +107,8 @@
pre, pre,
br, br,
code; code;
renderCodeblock(line_list.join('\n'), 'undefined', 'js');
try { try {
return eval.call(window, text); return eval.call(window, text);
} catch (e) { } catch (e) {
...@@ -253,6 +255,60 @@ ...@@ -253,6 +255,60 @@
}); });
} }
function executePyCell(line_list) {
return new RSVP.Promise(function (resolve, reject) {
var result_text, code_text = line_list.join('\n');
try {
result_text = pyodide.runPython(line_list.join('\n'));
} catch (e) {
result_text = e.message;
}
console.log("Result test:");
console.log(result_text);
console.log("=================");
if (typeof(result_text) === 'undefined') {
result_text = 'undefined';
}
renderCodeblock(code_text, result_text, 'python');
resolve();
});
}
function renderCodeblock(code_text, result_text, language) {
var div = document.createElement('div'),
pre0 = document.createElement('pre'),
p = document.createElement('p'),
pre1 = document.createElement('pre'),
pre2 = document.createElement('pre'),
code = document.createElement('code'),
result = document.createElement('code');
div.style.border = '1px solid #C3CCD0';
div.style.margin = '40px 10px';
code.style.border = '1px solid #C3CCD0';
code.classList.add(language);
code.classList.add('hljs');
result.classList.add('shell');
result.classList.add('hljs');
code.innerHTML = code_text;
hljs.highlightBlock(code);
hljs.highlightBlock(result);
p.innerHTML = language;
p.style.marginLeft = '10px';
pre0.appendChild(p);
pre1.appendChild(code);
div.appendChild(pre0);
div.appendChild(pre1);
if (result_text !== 'undefined') {
result.innerHTML = result_text;
pre2.appendChild(result);
div.appendChild(pre2);
}
document.body.appendChild(div);
}
function executeCell(cell) { function executeCell(cell) {
if (cell._type === 'raw') { if (cell._type === 'raw') {
// Do nothing... // Do nothing...
...@@ -273,6 +329,9 @@ ...@@ -273,6 +329,9 @@
if (cell._type === 'css') { if (cell._type === 'css') {
return executeCssCell(cell._line_list); return executeCssCell(cell._line_list);
} }
if (cell._type === 'py') {
return executePyCell(cell._line_list);
}
return executeUnknownCellType(cell); return executeUnknownCellType(cell);
} }
...@@ -291,6 +350,9 @@ ...@@ -291,6 +350,9 @@
i, i,
queue = new RSVP.Queue(); queue = new RSVP.Queue();
queue.push(function () {
return languagePluginLoader;
});
for (i = 0; i < len; i += 1) { for (i = 0; i < len; i += 1) {
queue.push(deferCellExecution(cell_list[i])); queue.push(deferCellExecution(cell_list[i]));
} }
...@@ -299,6 +361,11 @@ ...@@ -299,6 +361,11 @@
console.info('JSMD executed.'); console.info('JSMD executed.');
}, function (error) { }, function (error) {
console.error(error); console.error(error);
// do not print the error page with a non-styled pre tag
// the Python error message will be displayed along with Python source code in above
if (error.message.startsWith('Traceback')) {
return;
}
var pre = document.createElement('pre'); var pre = document.createElement('pre');
pre.textContent = error; pre.textContent = error;
document.body.appendChild(pre); document.body.appendChild(pre);
...@@ -306,4 +373,4 @@ ...@@ -306,4 +373,4 @@
}, false); }, false);
}(window)); }(window, languagePluginLoader));
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7