Merge pull request #2049 from ethereum/toaster_l

Toaster tooltip fix
pull/1/head
yann300 6 years ago committed by GitHub
commit bc33f29d24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/app/components/plugin-manager-component.js
  2. 7
      src/app/components/vertical-icons.js
  3. 2
      src/app/panels/tab-proxy.js
  4. 8
      test-browser/helpers/init.js

@ -91,7 +91,7 @@ class PluginManagerComponent extends BaseApi {
</button>`
return yo`
<article class="list-group-item py-1" title="${name}" >
<article id="remixPluginManagerListItem_${name}" class="list-group-item py-1" title="${displayName}" >
<div class="${css.row} justify-content-between align-items-center">
<h6 class="${css.displayName}">${displayName}</h6>
${activationButton}
@ -155,7 +155,7 @@ class PluginManagerComponent extends BaseApi {
? yo`
<nav class="navbar navbar-expand-lg navbar-light bg-light justify-content-between align-items-center">
<span class="navbar-brand">Inactive Modules</span>
<span class="badge badge-pill badge-primary">${inactives.length}</span>
<span class="badge badge-pill badge-primary" style = "cursor: default;">${inactives.length}</span>
</nav>`
: ''

@ -10,7 +10,7 @@ export class VerticalIcons {
constructor (name, appStore, homeProfile) {
this.store = appStore
this.homeProfile = homeProfile
this.homeProfile = homeProfile.profile
this.events = new EventEmitter()
this.icons = {}
this.iconKind = {}
@ -74,12 +74,13 @@ export class VerticalIcons {
* @param {ModuleProfile} profile The profile of the module
*/
addIcon ({kind, name, icon, displayName, tooltip}) {
let title = (displayName || name)// + (tooltip ? tooltip : "")
let title = (tooltip || displayName || name)
this.icons[name] = yo`
<div
class="${css.icon}"
onclick="${() => { this._iconClick(name) }}"
plugin="${name}" title="${title}" >
plugin="${name}"
title="${title}">
<img class="image" src="${icon}" alt="${name}" />
</div>`
this.iconKind[kind || 'other'].appendChild(this.icons[name])

@ -117,7 +117,7 @@ export class TabProxy {
id: name,
title,
icon,
tooltip: name
tooltip: title
})
this._handlers[name] = { switchTo, close }
}

@ -21,10 +21,10 @@ function initModules (browser, callback) {
.execute(function () {
document.querySelector('div[id="pluginManager"]').scrollTop = document.querySelector('div[id="pluginManager"]').scrollHeight
}, [], function () {
browser.click('#pluginManager article[title="solidity"] button')
.click('#pluginManager article[title="run"] button')
.click('#pluginManager article[title="solidityStaticAnalysis"] button')
.click('#pluginManager article[title="debugger"] button')
browser.click('#pluginManager article[id="remixPluginManagerListItem_solidity"] button')
.click('#pluginManager article[id="remixPluginManagerListItem_run"] button')
.click('#pluginManager article[id="remixPluginManagerListItem_solidityStaticAnalysis"] button')
.click('#pluginManager article[id="remixPluginManagerListItem_debugger"] button')
.click('#icon-panel div[plugin="fileExplorers"]')
.perform(() => { callback() })
})

Loading…
Cancel
Save