Skip to content

Use codeBoot bundle #7

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

Merged
feeley merged 1 commit into from
Aug 12, 2020
Merged

Use codeBoot bundle #7

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion include/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ CodeBootExecPointBubble.prototype.attachTo = function (elem, html) {
var tip = tippy(elem, {
appendTo: bubble.vm.root,
allowHTML: true,
placement: 'bottom-start',
placement: 'bottom-end',
maxWidth: 9999,
trigger: 'manual',
hideOnClick: false,
Expand Down
59 changes: 25 additions & 34 deletions include/codeboot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ function CodeBootVM(cb, root, opts) {

vm.lastExecEvent = 'stop';

//vm.alerts = undefined;

vm.repl = null;

vm.lastAST = null;
Expand Down Expand Up @@ -165,9 +163,9 @@ function CodeBootVM(cb, root, opts) {

vm.setLang(id_and_level);

vm.initRoot();
var initLast = vm.initRoot();

//vm.alerts = document.getElementById('alerts');
vm.initUI();

vm.setLangUI();

Expand Down Expand Up @@ -196,6 +194,8 @@ function CodeBootVM(cb, root, opts) {
? opts.animationSpeed
: (root.getAttribute('data-cb-animation-speed') ||
'normal'));

initLast();
};

CodeBootVM.prototype.initUI = function () {
Expand Down Expand Up @@ -539,7 +539,7 @@ CodeBootVM.prototype.consoleHTML = function (display) {
var vm = this;

return '\
<div class="cb-console" style="display: ' + display + ';">\
<div class="cb-console"' + (display ? '' : ' style="display: none;"') + '>\
<div class="cb-repl-container">\
<textarea class="cb-repl"></textarea>\
</div>\
Expand Down Expand Up @@ -576,73 +576,64 @@ CodeBootVM.prototype.initRoot = function () {

var vm = this;
var nChildren = vm.root.childNodes.length;
var content = null;

function initLast() {
if (content !== null) {

var file = vm.fs.newFile(undefined, content);

file.setReadOnly(true);

vm.setClass('cb-read-only', true);
}
}

if (vm.root.tagName === 'PRE') {

var content = vm.root.innerText;
content = vm.root.innerText;
var elem = document.createElement('div');

elem.className = 'cb-vm';

elem.innerHTML =
vm.execControlsHTML() +
vm.editorsHTML(false) +
vm.consoleHTML('inline');
vm.consoleHTML(false);

vm.root.replaceWith(elem);
vm.root = elem;

vm.setAttribute('data-cb-runable-code', true);

vm.initUI();

var file = vm.fs.newFile(undefined, content);

file.setReadOnly(true);

vm.setClass('cb-read-only', true);

return;
}
if (nChildren === 0) {
} else if (nChildren === 0) {

vm.root.innerHTML =
vm.headerHTML() +
vm.navbarHTML() +
vm.consoleHTML('inline') +
vm.consoleHTML(true) +
vm.editorsHTML(true) +
vm.footerHTML();

vm.initUI();

} else if (nChildren === 1) {

var child = vm.root.childNodes[0];

if (child.tagName === 'PRE') {

var content = child.innerText;
content = child.innerText;

vm.root.innerHTML =
vm.execControlsHTML() +
vm.editorsHTML(false) +
vm.consoleHTML('none');
vm.consoleHTML(false);

vm.setAttribute('data-cb-runable-code', true);

vm.initUI();

var file = vm.fs.newFile(undefined, content);

file.setReadOnly(true);

vm.setClass('cb-read-only', true);
} else {
vm.initUI();
}
} else {
vm.initUI();
}

return initLast;
};

function escape_HTML(text) {
Expand Down
2 changes: 1 addition & 1 deletion include/editors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ CodeBootVM.prototype.replAddSingleLineTranscript = function (text, cssClass) {

if (!editor) return;

vm.setDisplay('.cb-console', 'inline');
vm.setDisplay('.cb-console', 'block');

var transcriptPos = editor.cb.transcriptMarker.find();
var pos = transcriptPos ? transcriptPos.to : vm.beginningOfEditor();
Expand Down
2 changes: 1 addition & 1 deletion include/lang/py/pyinterp.js
View file
Open in desktop

Large diffs are not rendered by default.

49 changes: 2 additions & 47 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="apple-mobile-web-app-capable" content="yes">

<!-- Styles -->
<link rel="stylesheet" href="include/bootstrap-4.5.0-dist/css/bootstrap.min.css">
<link rel="stylesheet" href="include/codemirror-5.56.0/lib/codemirror.css">
<link rel="stylesheet" href="include/codeboot.css">
<link rel="stylesheet" href="codeboot.bundle.css">
<script src="codeboot.bundle.js"></script>

</head>

Expand Down Expand Up @@ -54,49 +52,6 @@ <h4 class="modal-title">About codeBoot</h4>

<!---------------------------------------------------------------------------->

<script src="include/jquery-3.2.1.min.js"></script>
<script src="include/jquery.clippy.min.js"></script>
<script src="include/bootstrap-4.5.0-dist/js/bootstrap.bundle.min.js"></script>
<script src="include/popper.min.js"></script>
<script src="include/tippy-bundle.umd.min.js"></script>

<script src="include/codemirror-5.56.0/lib/codemirror.js"></script>
<script src="include/codemirror-5.56.0/addon/edit/matchbrackets.js"></script>
<script src="include/codemirror-5.56.0/keymap/emacs.js"></script>
<script src="include/codemirror-5.56.0/mode/javascript/javascript.js"></script>
<script src="include/codemirror-5.56.0/mode/python/python.js"></script>

<script src="include/lang.js"></script>
<script src="include/lang/js/num.js"></script>

<!-- JavaScript language -->
<script src="include/lang/js/js.js"></script>
<script src="include/lang/js/system.js"></script>
<script src="include/lang/js/scanner.js"></script>
<script src="include/lang/js/parser.js"></script>
<script src="include/lang/js/pp.js"></script>
<script src="include/lang/js/ast-passes.js"></script>
<script src="include/lang/js/eval.js"></script>
<script src="include/lang/js/builtins.js"></script>
<!-- -->

<!-- Python language -->
<script src="include/lang/py/py.js"></script>
<script src="include/lang/py/pyinterp.js"></script>
<!-- -->

<script src="include/codeboot.js"></script>
<script src="include/drawing.js"></script>
<script src="include/actions.js"></script>
<script src="include/editors.js"></script>
<script src="include/fs.js"></script>
<script src="include/storage.js"></script>
<script src="include/tutorial.js"></script>
<script src="include/jquery.visibility.js"></script>
<script>//cb_query(null);</script>

</div>

</body>

</html>