Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
8c6afc23
Unverified
Commit
8c6afc23
authored
Jul 27, 2021
by
David Zagi
Committed by
GitHub
Jul 27, 2021
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into remixd_terminal
parents
e03258a1
37a2071a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
12 deletions
+16
-12
app.js
apps/remix-ide/src/app.js
+13
-7
analysis-tab.js
apps/remix-ide/src/app/tabs/analysis-tab.js
+0
-2
publishToIPFS.tsx
libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx
+1
-1
remix-ui-static-analyser.tsx
...x-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+2
-2
No files found.
apps/remix-ide/src/app.js
View file @
8c6afc23
...
...
@@ -362,6 +362,9 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
settings
])
const
queryParams
=
new
QueryParams
()
const
params
=
queryParams
.
get
()
const
onAcceptMatomo
=
()
=>
{
_paq
.
push
([
'forgetUserOptOut'
])
// @TODO remove next line when https://github.com/matomo-org/matomo/commit/9e10a150585522ca30ecdd275007a882a70c6df5 is used
...
...
@@ -369,12 +372,21 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
settings
.
updateMatomoAnalyticsChoice
(
true
)
const
el
=
document
.
getElementById
(
'modal-dialog'
)
el
.
parentElement
.
removeChild
(
el
)
startWalkthroughService
()
}
const
onDeclineMatomo
=
()
=>
{
settings
.
updateMatomoAnalyticsChoice
(
false
)
_paq
.
push
([
'optUserOut'
])
const
el
=
document
.
getElementById
(
'modal-dialog'
)
el
.
parentElement
.
removeChild
(
el
)
startWalkthroughService
()
}
const
startWalkthroughService
=
()
=>
{
const
walkthroughService
=
new
WalkthroughService
(
localStorage
)
if
(
!
params
.
code
&&
!
params
.
url
&&
!
params
.
minimizeterminal
&&
!
params
.
gist
&&
!
params
.
minimizesidepanel
)
{
walkthroughService
.
start
()
}
}
// Ask to opt in to Matomo for remix, remix-alpha and remix-beta
...
...
@@ -470,9 +482,6 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
await
appManager
.
activatePlugin
([
'settings'
])
await
appManager
.
activatePlugin
([
'hiddenPanel'
,
'pluginManager'
,
'filePanel'
,
'contextualListener'
,
'terminal'
,
'fetchAndCompile'
,
'contentImport'
])
const
queryParams
=
new
QueryParams
()
const
params
=
queryParams
.
get
()
// Set workspace after initial activation
if
(
Array
.
isArray
(
workspace
))
{
appManager
.
activatePlugin
(
workspace
).
then
(
async
()
=>
{
...
...
@@ -507,8 +516,5 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
if
(
params
.
embed
)
framingService
.
embed
()
framingService
.
start
(
params
)
const
walkthroughService
=
new
WalkthroughService
(
localStorage
)
if
(
!
params
.
code
)
{
walkthroughService
.
start
()
}
startWalkthroughService
()
}
apps/remix-ide/src/app/tabs/analysis-tab.js
View file @
8c6afc23
...
...
@@ -50,9 +50,7 @@ class AnalysisTab extends ViewPlugin {
renderComponent
()
{
ReactDOM
.
render
(
<
RemixUiStaticAnalyser
analysisRunner
=
{
this
.
runner
}
registry
=
{
this
.
registry
}
staticanalysis
=
{
this
.
staticanalysis
}
analysisModule
=
{
this
}
event
=
{
this
.
event
}
/>
,
...
...
libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx
View file @
8c6afc23
import
IpfsClient
from
'ipfs-mini'
const
ipfsNodes
=
[
new
IpfsClient
({
host
:
'ipfs.
komputing
.org'
,
port
:
443
,
protocol
:
'https'
}),
new
IpfsClient
({
host
:
'ipfs.
remixproject
.org'
,
port
:
443
,
protocol
:
'https'
}),
new
IpfsClient
({
host
:
'ipfs.infura.io'
,
port
:
5001
,
protocol
:
'https'
}),
new
IpfsClient
({
host
:
'127.0.0.1'
,
port
:
5001
,
protocol
:
'http'
})
]
...
...
libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
View file @
8c6afc23
...
...
@@ -65,7 +65,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
useEffect
(()
=>
{
compilation
(
props
.
analysisModule
,
dispatch
)
},
[])
},
[
props
])
useEffect
(()
=>
{
setWarningState
({})
...
...
@@ -91,7 +91,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
if
(
currentWorkspace
&&
currentWorkspace
.
isLocalhost
===
true
)
setShowSlither
(
'visible'
)
})
return
()
=>
{
}
},
[
props
.
analysisModule
])
},
[
props
])
const
message
=
(
name
,
warning
,
more
,
fileName
,
locationString
)
:
string
=>
{
return
(
`
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment