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
21836221
Commit
21836221
authored
Mar 13, 2018
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
standard
parent
dc10b21b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
txRunner.js
src/app/execution/txRunner.js
+1
-1
universal-dapp.js
src/universal-dapp.js
+9
-8
No files found.
src/app/execution/txRunner.js
View file @
21836221
...
...
@@ -188,7 +188,7 @@ function sendTransaction (sendTx, tx, pass, callback) {
function
run
(
self
,
tx
,
stamp
,
confirmationCb
,
gasEstimationForceSend
,
callback
)
{
if
(
!
self
.
runAsync
&&
Object
.
keys
(
self
.
pendingTxs
).
length
)
{
self
.
queusTxs
.
push
({
tx
,
stamp
,
callback
})
self
.
queusTxs
.
push
({
tx
,
stamp
,
callback
})
}
else
{
self
.
pendingTxs
[
stamp
]
=
tx
self
.
execute
(
tx
,
confirmationCb
,
gasEstimationForceSend
,
(
error
,
result
)
=>
{
...
...
src/universal-dapp.js
View file @
21836221
...
...
@@ -316,15 +316,16 @@ UniversalDApp.prototype.runTx = function (args, cb) {
The transaction execution will likely fail. Do you want to force sending? <br>
${
msg
}
</div>`
,
{
label
:
'Send Transaction'
,
fn
:
()
=>
{
continueTxExecution
()
}},
{
label
:
'Cancel Transaction'
,
{
label
:
'Send Transaction'
,
fn
:
()
=>
{
cancelCb
()
}
})
continueTxExecution
()
}},
{
label
:
'Cancel Transaction'
,
fn
:
()
=>
{
cancelCb
()
}
})
}
else
{
continueTxExecution
()
}
...
...
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