Merge pull request #1899 from ethereum/yann300-patch-23

Fix the context view
pull/1/head
yann300 6 years ago committed by GitHub
commit bb060fc8e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/app.js
  2. 2
      src/app/editor/contextView.js
  3. 8
      src/app/editor/styles/contextView-styles.js
  4. 4
      src/universal-dapp.js

@ -283,7 +283,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
registry.put({api: udapp, name: 'udapp'}) registry.put({api: udapp, name: 'udapp'})
udapp.event.register('transactionBroadcasted', (txhash, networkName) => { udapp.event.register('transactionBroadcasted', (txhash, networkName) => {
var txLink = executionContext.txDetailsLink(networkName, txhash) var txLink = executionContext.txDetailsLink(networkName, txhash)
if (txLink) registry.get('logCallback').api.logCallback(yo`<a href="${txLink}" target="_blank">${txLink}</a>`) if (txLink) registry.get('logCallback').api(yo`<a href="${txLink}" target="_blank">${txLink}</a>`)
}) })
const udappUI = new UniversalDAppUI(udapp, registry) const udappUI = new UniversalDAppUI(udapp, registry)

@ -41,7 +41,7 @@ class ContextView {
} }
render () { render () {
const view = yo`<div class="${css.contextview} ${css.contextviewcontainer} bg-secondary border-top-0"> const view = yo`<div class="${css.contextview} ${css.contextviewcontainer} badge badge-secondary border-top-0">
<div class=${css.container}> <div class=${css.container}>
${this._renderTarget()} ${this._renderTarget()}
</div> </div>

@ -2,7 +2,7 @@ var csjs = require('csjs-inject')
var css = csjs` var css = csjs`
.contextview { .contextview {
opacity : 0.8; opacity : 1;
} }
.container { .container {
padding : 1px 15px; padding : 1px 15px;
@ -14,7 +14,7 @@ var css = csjs`
text-overflow : ellipsis; text-overflow : ellipsis;
overflow : hidden; overflow : hidden;
white-space : nowrap; white-space : nowrap;
font-size : 11px; font-size : 18px;
} }
.type { .type {
font-style : italic; font-style : italic;
@ -45,9 +45,9 @@ var css = csjs`
} }
.contextviewcontainer{ .contextviewcontainer{
position : absolute; position : absolute;
top : 39px; top : 35px;
z-index : 50; z-index : 50;
left : 350px; left : 40%;
border-radius : 1px; border-radius : 1px;
border : 2px solid var(--secondary); border : 2px solid var(--secondary);
} }

@ -68,7 +68,7 @@ module.exports = class UniversalDApp extends UdappApi {
executionContext.detectNetwork(cb) executionContext.detectNetwork(cb)
}, },
personalMode: () => { personalMode: () => {
return this.config.get('settings/personal-mode') return this._deps.config.get('settings/personal-mode')
} }
}) })
this.txRunner.event.register('transactionBroadcasted', (txhash) => { this.txRunner.event.register('transactionBroadcasted', (txhash) => {
@ -94,7 +94,7 @@ module.exports = class UniversalDApp extends UdappApi {
newAccount (password, passwordPromptCb, cb) { newAccount (password, passwordPromptCb, cb) {
if (!executionContext.isVM()) { if (!executionContext.isVM()) {
if (!this.config.get('settings/personal-mode')) { if (!this._deps.config.get('settings/personal-mode')) {
return cb('Not running in personal mode') return cb('Not running in personal mode')
} }
passwordPromptCb((passphrase) => { passwordPromptCb((passphrase) => {

Loading…
Cancel
Save