mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into refactoring-static-analyser

Browse Source
pull/1104/head
David Zagi 4 years ago committed by GitHub
parent 6ff9baa113 273d85b56e
commit 05698e2d56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      apps/debugger/src/index.html
  2. 2
      apps/remix-ide/src/app/files/remixd-handle.js
  3. 3
      libs/remix-ui/file-explorer/src/lib/file-explorer.tsx

2
apps/debugger/src/index.html
Unescape View File

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Debugger</title> <title>Debugger</title>
<base href="/" /> <base href="./" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" type="image/x-icon" href="favicon.ico" /> <link rel="icon" type="image/x-icon" href="favicon.ico" />

2
apps/remix-ide/src/app/files/remixd-handle.js
Unescape View File

@ -135,7 +135,7 @@ function remixdDialog () {
<div class=${css.dialogParagraph}>If you have looked at the Remixd docs and just need remixd command, <br> here it is: <div class=${css.dialogParagraph}>If you have looked at the Remixd docs and just need remixd command, <br> here it is:
<br><b>remixd -s absolute-path-to-the-shared-folder --remix-ide your-remix-ide-URL-instance</b> <br><b>remixd -s absolute-path-to-the-shared-folder --remix-ide your-remix-ide-URL-instance</b>
</div> </div>
<div class=${css.dialogParagraph}>Connection will start a session between <em>${window.location.href}</em> and your local file system <i>ws://127.0.0.1:65520</i> <div class=${css.dialogParagraph}>Connection will start a session between <em>${window.location.origin}</em> and your local file system <i>ws://127.0.0.1:65520</i>
so please make sure your system is secured enough (port 65520 neither opened nor forwarded). so please make sure your system is secured enough (port 65520 neither opened nor forwarded).
</div> </div>
<div class=${css.dialogParagraph}> <div class=${css.dialogParagraph}>

3
libs/remix-ui/file-explorer/src/lib/file-explorer.tsx
Unescape View File

@ -261,8 +261,7 @@ export const FileExplorer = (props: FileExplorerProps) => {
const fetchDirectoryContent = async (folderPath: string): Promise<File[]> => { const fetchDirectoryContent = async (folderPath: string): Promise<File[]> => {
return new Promise((resolve) => { return new Promise((resolve) => {
filesProvider.resolveDirectory(folderPath, (error, fileTree) => { filesProvider.resolveDirectory(folderPath, (_error, fileTree) => {
if (error) console.error(error)
const files = normalize(fileTree) const files = normalize(fileTree)
resolve(files) resolve(files)

Write Preview
Loading…
Cancel
Save