Commit f562758c authored by LianaHus's avatar LianaHus Committed by ioedeveloper

treview indent

remixD error report
parent 0d7c6edc
...@@ -20,6 +20,7 @@ var css = csjs` ...@@ -20,6 +20,7 @@ var css = csjs`
const profile = { const profile = {
name: 'remixd', name: 'remixd',
displayName: 'RemixD',
url: 'ws://127.0.0.1:65520', url: 'ws://127.0.0.1:65520',
methods: ['folderIsReadOnly', 'resolveDirectory', 'get', 'exists', 'isFile', 'set', 'rename', 'remove', 'isDirectory', 'list'], methods: ['folderIsReadOnly', 'resolveDirectory', 'get', 'exists', 'isFile', 'set', 'rename', 'remove', 'isDirectory', 'list'],
events: [], events: [],
...@@ -83,7 +84,13 @@ export class RemixdHandle extends WebsocketPlugin { ...@@ -83,7 +84,13 @@ export class RemixdHandle extends WebsocketPlugin {
fn: () => { fn: () => {
try { try {
super.activate() super.activate()
setTimeout(() => { connection() }, 2000) setTimeout(() => {
if (!super.socket) {
connection(new Error('Connection with daemon failed.'))
} else {
connection()
}
}, 3000)
} catch (error) { } catch (error) {
connection(error) connection(error)
} }
......
...@@ -65,7 +65,7 @@ module.exports = class Filepanel extends ViewPlugin { ...@@ -65,7 +65,7 @@ module.exports = class Filepanel extends ViewPlugin {
const explorers = yo` const explorers = yo`
<div> <div>
<div class="pl-2 ${css.treeview}" data-id="filePanelFileExplorerTree">${fileExplorer.init()}</div> <div class="pl-2 ${css.treeview}" data-id="filePanelFileExplorerTree">${fileExplorer.init()}</div>
<div class="filesystemexplorer ${css.treeview}">${fileSystemExplorer.init()}</div> <div class="pl-2 filesystemexplorer ${css.treeview}">${fileSystemExplorer.init()}</div>
</div> </div>
` `
......
...@@ -80,13 +80,13 @@ class TreeView { ...@@ -80,13 +80,13 @@ class TreeView {
var children = Object.keys(json).map((innerkey) => { var children = Object.keys(json).map((innerkey) => {
return this.renderObject(json[innerkey], json, innerkey, expand, innerkey) return this.renderObject(json[innerkey], json, innerkey, expand, innerkey)
}) })
return yo`<ul key=${key} data-id="treeViewUl${key}" class="${css.ul_tv} ml-0 pr-2">${children}</ul>` return yo`<ul key=${key} data-id="treeViewUl${key}" class="${css.ul_tv} ml-0 px-2">${children}</ul>`
} }
formatData (key, data, children, expand, keyPath) { formatData (key, data, children, expand, keyPath) {
var self = this var self = this
var li = yo`<li key=${keyPath} data-id="treeViewLi${keyPath}" class=${css.li_tv}></li>` var li = yo`<li key=${keyPath} data-id="treeViewLi${keyPath}" class=${css.li_tv}></li>`
var caret = yo`<div class="fas fa-caret-right caret ${css.caret_tv}"></div>` var caret = yo`<div class="px-1 fas fa-caret-right caret ${css.caret_tv}"></div>`
var label = yo` var label = yo`
<div key=${keyPath} data-id="treeViewDiv${keyPath}" class="d-flex flex-row align-items-center"> <div key=${keyPath} data-id="treeViewDiv${keyPath}" class="d-flex flex-row align-items-center">
${caret} ${caret}
...@@ -95,7 +95,7 @@ class TreeView { ...@@ -95,7 +95,7 @@ class TreeView {
const expanded = self.expandPath.includes(keyPath) const expanded = self.expandPath.includes(keyPath)
li.appendChild(label) li.appendChild(label)
if (data.children) { if (data.children) {
var list = yo`<ul key=${keyPath} data-id="treeViewUlList${keyPath}" class=${css.ul_tv}>${children}</ul>` var list = yo`<ul key=${keyPath} data-id="treeViewUlList${keyPath}" class="pl-2 ${css.ul_tv}">${children}</ul>`
list.style.display = expanded ? 'block' : 'none' list.style.display = expanded ? 'block' : 'none'
caret.className = list.style.display === 'none' ? `fas fa-caret-right caret ${css.caret_tv}` : `fas fa-caret-down caret ${css.caret_tv}` caret.className = list.style.display === 'none' ? `fas fa-caret-right caret ${css.caret_tv}` : `fas fa-caret-down caret ${css.caret_tv}`
caret.setAttribute('data-id', `treeViewToggle${keyPath}`) caret.setAttribute('data-id', `treeViewToggle${keyPath}`)
......
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