Skip to content

terminal2 #1210

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
merged 2 commits into from
May 21, 2021
Merged

terminal2 #1210

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4782e6
terminal2
bunsenstraat May 20, 2021
93128aa
Merge branch 'master' into bunsenstraat-patch-1
bunsenstraat May 21, 2021
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
35 changes: 33 additions & 2 deletions apps/remix-ide/src/app/panels/terminal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* global Node, requestAnimationFrame */
import { Plugin } from '@remixproject/engine'
import * as packageJson from '../../../../../package.json'
import * as remixBleach from '../../lib/remixBleach'

var yo = require('yo-yo')
var javascriptserialize = require('javascript-serialize')
Expand All @@ -26,7 +27,7 @@ var ghostbar = yo`<div class=${css.ghostbar} bg-secondary></div>`
const profile = {
displayName: 'Terminal',
name: 'terminal',
methods: [],
methods: ['log'],
events: [],
description: ' - ',
version: packageJson.version
Expand Down Expand Up @@ -113,6 +114,32 @@ class Terminal extends Plugin {
this.off('scriptRunner', 'error')
}

log (message) {
var command = this.commands[message.type]
if (typeof command === 'function') {
if (typeof message.value === 'string' && message.type === 'html') {
var el = document.createElement('div')
el.innerHTML = remixBleach.sanitize(message.value, {
list: [
'a',
'b',
'p',
'em',
'strong',
'div',
'span',
'ul',
'li',
'ol',
'hr'
]
})
message.value = el
}
command(message.value)
};
}

logHtml (html) {
var command = this.commands.html
if (typeof command === 'function') command(html)
Expand Down Expand Up @@ -653,7 +680,11 @@ class Terminal extends Plugin {
return function logger (args, scopedCommands, append) {
var types = args.filter(filterUndefined).map(type)
var values = javascriptserialize.apply(null, args.filter(filterUndefined)).map(function (val, idx) {
if (typeof args[idx] === 'string') val = args[idx]
if (typeof args[idx] === 'string') {
const el = document.createElement('div')
el.innerHTML = args[idx].replace(/(\r\n|\n|\r)/gm, '<br>')
val = el.children.length === 0 ? el.firstChild : el
}
if (types[idx] === 'element') val = jsbeautify.html(val)
return val
})
Expand Down