Qortal/qortal-ui
1
0
Fork 0
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-04-24 20:07:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/tab-notification-q-chat-sockets

Browse Source
This commit is contained in:
Phillip 2023-06-13 13:31:48 +03:00
commit 942cda5596
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/components/app-view.js
View File

@ -432,7 +432,7 @@ class AppView extends connect(store)(LitElement) {
return html` return html`
<app-drawer-layout fullbleed force-narrow> <app-drawer-layout fullbleed force-narrow>
<app-drawer swipe-open slot="drawer" id="appdrawer"> <app-drawer swipe-open slot="drawer" id="appdrawer">
<app-header-layout> <app-header-layout id="appsidebar">
<div id="sideBar"> <div id="sideBar">
<wallet-profile></wallet-profile> <wallet-profile></wallet-profile>
<div class="sideBarMenu"> <div class="sideBarMenu">
@ -513,11 +513,16 @@ class AppView extends connect(store)(LitElement) {
parentEpml.imReady() parentEpml.imReady()
var drawerTog = this.shadowRoot.getElementById("mb") var drawerTog = this.shadowRoot.getElementById("mb")
var drawerOut = this.shadowRoot.getElementById("appsidebar")
drawerTog.addEventListener('mouseover', function() { drawerTog.addEventListener('mouseover', function() {
drawerTog.click() drawerTog.click()
}) })
drawerOut.addEventListener('mouseleave', function() {
drawerTog.click()
})
this.getNodeType() this.getNodeType()
const myAppNode = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node] const myAppNode = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node]

16
core/src/components/show-plugin.js
View File

@ -198,7 +198,7 @@ class ShowPlugin extends connect(store)(LitElement) {
async addTab(tab) { async addTab(tab) {
this.tabs = [...this.tabs, tab] this.tabs = [...this.tabs, tab]
await this.getUpdateComplete(); await this.getUpdateComplete()
// add the new tab to the tabs array // add the new tab to the tabs array
const newIndex = this.tabs.length - 1 const newIndex = this.tabs.length - 1
@ -299,7 +299,11 @@ class ShowPlugin extends connect(store)(LitElement) {
class=${!tab.myPlugObj ? "hideIframe" : ""} class=${!tab.myPlugObj ? "hideIframe" : ""}
> >
</iframe> </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> </nav-bar>
</div> </div>
`)} `)}
@ -453,7 +457,6 @@ class ShowPlugin extends connect(store)(LitElement) {
store.dispatch(setNewTab(null)) store.dispatch(setNewTab(null))
//clear newTab //clear newTab
} }
} }
} }
} }
@ -623,11 +626,6 @@ class NavBar extends connect(store)(LitElement) {
} }
async getQuery(value) { async getQuery(value) {
try {
} catch (error) {
}
let newQuery = value let newQuery = value
if (newQuery.endsWith('/')) { if (newQuery.endsWith('/')) {
newQuery = newQuery.slice(0, -1) newQuery = newQuery.slice(0, -1)
@ -697,7 +695,7 @@ class NavBar extends connect(store)(LitElement) {
return html` return html`
<div class="parent"> <div class="parent">
<div class="navbar"> <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> <button @click="${this.handlePasteLink}">Go</button>
</div> </div>
<div> <div>

2
plugins/plugins/core/main.src.js
View File

@ -41,7 +41,7 @@ parentEpml.ready().then(() => {
url: 'wallet', url: 'wallet',
domain: 'core', domain: 'core',
page: 'wallet/index.html', page: 'wallet/index.html',
title: 'Wallet', title: 'Wallets',
icon: 'vaadin:wallet', icon: 'vaadin:wallet',
mwcicon: 'account_balance_wallet', mwcicon: 'account_balance_wallet',
menus: [], menus: [],