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
6781c5ea
Unverified
Commit
6781c5ea
authored
May 15, 2019
by
yann300
Committed by
GitHub
May 15, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1974 from ethereum/yann300-patch-34
Fix error message
parents
253b5cc1
715414cd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
settings.js
src/app/tabs/runTab/model/settings.js
+2
-2
tooltip.js
src/app/ui/tooltip.js
+4
-1
No files found.
src/app/tabs/runTab/model/settings.js
View file @
6781c5ea
...
@@ -93,7 +93,7 @@ class Settings {
...
@@ -93,7 +93,7 @@ class Settings {
const
hashedMsg
=
executionContext
.
web3
().
sha3
(
message
)
const
hashedMsg
=
executionContext
.
web3
().
sha3
(
message
)
try
{
try
{
executionContext
.
web3
().
eth
.
sign
(
account
,
hashedMsg
,
(
error
,
signedData
)
=>
{
executionContext
.
web3
().
eth
.
sign
(
account
,
hashedMsg
,
(
error
,
signedData
)
=>
{
cb
(
error
,
hashedMsg
,
signedData
)
cb
(
error
.
message
,
hashedMsg
,
signedData
)
})
})
}
catch
(
e
)
{
}
catch
(
e
)
{
cb
(
e
.
message
)
cb
(
e
.
message
)
...
@@ -105,7 +105,7 @@ class Settings {
...
@@ -105,7 +105,7 @@ class Settings {
try
{
try
{
var
personal
=
new
Personal
(
executionContext
.
web3
().
currentProvider
)
var
personal
=
new
Personal
(
executionContext
.
web3
().
currentProvider
)
personal
.
sign
(
hashedMsg
,
account
,
passphrase
,
(
error
,
signedData
)
=>
{
personal
.
sign
(
hashedMsg
,
account
,
passphrase
,
(
error
,
signedData
)
=>
{
cb
(
error
,
hashedMsg
,
signedData
)
cb
(
error
.
message
,
hashedMsg
,
signedData
)
})
})
}
catch
(
e
)
{
}
catch
(
e
)
{
cb
(
e
.
message
)
cb
(
e
.
message
)
...
...
src/app/ui/tooltip.js
View file @
6781c5ea
var
yo
=
require
(
'yo-yo'
)
var
yo
=
require
(
'yo-yo'
)
var
css
=
require
(
'./styles/tooltip-styles'
)
var
css
=
require
(
'./styles/tooltip-styles'
)
var
modal
=
require
(
'./modal-dialog-custom'
)
/**
/**
* Open a tooltip
* Open a tooltip
...
@@ -25,9 +26,11 @@ class Toaster {
...
@@ -25,9 +26,11 @@ class Toaster {
opts
=
defaultOptions
(
opts
)
opts
=
defaultOptions
(
opts
)
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
const
shortTooltipText
=
tooltipText
.
length
>
201
?
tooltipText
.
substring
(
0
,
200
)
+
'...'
:
tooltipText
this
.
tooltip
=
yo
`
this
.
tooltip
=
yo
`
<div class="
${
css
.
tooltip
}
bg-secondary" onmouseenter=
${()
=>
{
over
()
}}
onmouseleave
=
$
{()
=>
{
out
()
}}
>
<div class="
${
css
.
tooltip
}
bg-secondary" onmouseenter=
${()
=>
{
over
()
}}
onmouseleave
=
$
{()
=>
{
out
()
}}
>
<
span
>
$
{
tooltipText
}
</span>
<
span
>
$
{
shortTooltipText
}
<button class="btn btn-secondary btn-sm" onclick=
${()
=>
{
modal
.
alert
(
tooltipText
)
}}
>
show
full
message
<
/button>
</
span
>
$
{
action
}
$
{
action
}
</div>`
</div>`
let
timeOut
=
()
=>
{
let
timeOut
=
()
=>
{
...
...
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