mirror of
https://github.com/Qortal/qortal-ui.git
synced 2025-02-14 11:15:50 +00:00
Merge remote-tracking branch 'origin/master' into feature/tab-notification-q-chat-sockets
This commit is contained in:
commit
942cda5596
@ -432,7 +432,7 @@ class AppView extends connect(store)(LitElement) {
|
||||
return html`
|
||||
<app-drawer-layout fullbleed force-narrow>
|
||||
<app-drawer swipe-open slot="drawer" id="appdrawer">
|
||||
<app-header-layout>
|
||||
<app-header-layout id="appsidebar">
|
||||
<div id="sideBar">
|
||||
<wallet-profile></wallet-profile>
|
||||
<div class="sideBarMenu">
|
||||
@ -513,11 +513,16 @@ class AppView extends connect(store)(LitElement) {
|
||||
parentEpml.imReady()
|
||||
|
||||
var drawerTog = this.shadowRoot.getElementById("mb")
|
||||
var drawerOut = this.shadowRoot.getElementById("appsidebar")
|
||||
|
||||
drawerTog.addEventListener('mouseover', function() {
|
||||
drawerTog.click()
|
||||
})
|
||||
|
||||
drawerOut.addEventListener('mouseleave', function() {
|
||||
drawerTog.click()
|
||||
})
|
||||
|
||||
this.getNodeType()
|
||||
|
||||
const myAppNode = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node]
|
||||
|
@ -198,7 +198,7 @@ class ShowPlugin extends connect(store)(LitElement) {
|
||||
|
||||
async addTab(tab) {
|
||||
this.tabs = [...this.tabs, tab]
|
||||
await this.getUpdateComplete();
|
||||
await this.getUpdateComplete()
|
||||
|
||||
// add the new tab to the tabs array
|
||||
const newIndex = this.tabs.length - 1
|
||||
@ -299,7 +299,11 @@ class ShowPlugin extends connect(store)(LitElement) {
|
||||
class=${!tab.myPlugObj ? "hideIframe" : ""}
|
||||
>
|
||||
</iframe>
|
||||
<nav-bar class=${!tab.myPlugObj ? "showIframe" : "hideIframe"} .registeredUrls=${this.registeredUrls} .changePage=${(val) => this.changePage(val)}>
|
||||
<nav-bar
|
||||
class=${!tab.myPlugObj ? "showIframe" : "hideIframe"}
|
||||
.registeredUrls=${this.registeredUrls}
|
||||
.changePage=${(val) => this.changePage(val)}
|
||||
>
|
||||
</nav-bar>
|
||||
</div>
|
||||
`)}
|
||||
@ -453,7 +457,6 @@ class ShowPlugin extends connect(store)(LitElement) {
|
||||
store.dispatch(setNewTab(null))
|
||||
//clear newTab
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -623,11 +626,6 @@ class NavBar extends connect(store)(LitElement) {
|
||||
}
|
||||
|
||||
async getQuery(value) {
|
||||
try {
|
||||
|
||||
} catch (error) {
|
||||
|
||||
}
|
||||
let newQuery = value
|
||||
if (newQuery.endsWith('/')) {
|
||||
newQuery = newQuery.slice(0, -1)
|
||||
@ -697,7 +695,7 @@ class NavBar extends connect(store)(LitElement) {
|
||||
return html`
|
||||
<div class="parent">
|
||||
<div class="navbar">
|
||||
<input @keydown=${this._handleKeyDown} id="linkInput" type="text" placeholder="qortal://" />
|
||||
<input @keydown=${this._handleKeyDown} id="linkInput" type="text" placeholder="qortal://">
|
||||
<button @click="${this.handlePasteLink}">Go</button>
|
||||
</div>
|
||||
<div>
|
||||
|
@ -41,7 +41,7 @@ parentEpml.ready().then(() => {
|
||||
url: 'wallet',
|
||||
domain: 'core',
|
||||
page: 'wallet/index.html',
|
||||
title: 'Wallet',
|
||||
title: 'Wallets',
|
||||
icon: 'vaadin:wallet',
|
||||
mwcicon: 'account_balance_wallet',
|
||||
menus: [],
|
||||
|
Loading…
x
Reference in New Issue
Block a user