Commit b75836b9 authored by serapath's avatar serapath

FIX script execution + FIX autofocus

parent 90db5db4
...@@ -8,6 +8,8 @@ var vm = require('vm') ...@@ -8,6 +8,8 @@ var vm = require('vm')
var EventManager = require('ethereum-remix').lib.EventManager var EventManager = require('ethereum-remix').lib.EventManager
var Web3 = require('web3') var Web3 = require('web3')
var executionContext = require('../../execution-context')
var css = csjs` var css = csjs`
.panel { .panel {
position : relative; position : relative;
...@@ -217,7 +219,7 @@ class Terminal { ...@@ -217,7 +219,7 @@ class Terminal {
self._output(self.data.banner) self._output(self.data.banner)
function focusinput (event) { function focusinput (event) {
if (self._view.journal.offsetHeight - self._view.term.scrollTop < 330) { if (self._view.journal.offsetHeight - (self._view.term.scrollTop + self._view.term.offsetHeight) < 50) {
refocus() refocus()
} }
} }
...@@ -294,7 +296,6 @@ class Terminal { ...@@ -294,7 +296,6 @@ class Terminal {
self.scroll2bottom = function () { self.scroll2bottom = function () {
var next = placeholder.nextElementSibling var next = placeholder.nextElementSibling
if (next) { if (next) {
console.error('new messages')
placeholder.style = '' placeholder.style = ''
check() check()
var messages = 1 var messages = 1
...@@ -502,10 +503,10 @@ class Terminal { ...@@ -502,10 +503,10 @@ class Terminal {
} }
} }
// @TODO add all the `console` functions
function domTerminalFeatures (self) { function domTerminalFeatures (self) {
// @TODO add all the `console` functions
return { return {
web3: self._api.context() !== 'vm' ? new Web3(self._api.web3().currentProvider) : null, web3: executionContext.getProvider() !== 'vm' ? new Web3(executionContext.web3().currentProvider) : null,
console: { console: {
log: function () { self._output.apply(self, arguments) } log: function () { self._output.apply(self, arguments) }
} }
......
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