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
a3f43f0a
Commit
a3f43f0a
authored
May 26, 2016
by
Alex Beregszaszi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Define undefined/redefined variables
parent
682f8af6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
11 deletions
+15
-11
app.js
src/app.js
+3
-3
compiler.js
src/app/compiler.js
+1
-0
renderer.js
src/app/renderer.js
+4
-3
universal-dapp.js
src/universal-dapp.js
+7
-5
No files found.
src/app.js
View file @
a3f43f0a
...
...
@@ -241,9 +241,9 @@ var run = function() {
return
$
(
'<li class="file"><span class="name">'
+
name
+
'</span><span class="remove"><i class="fa fa-close"></i></span></li>'
);
}
$filesWrapper
=
$
(
'.files-wrapper'
);
$scrollerRight
=
$
(
'.scroller-right'
);
$scrollerLeft
=
$
(
'.scroller-left'
);
var
$filesWrapper
=
$
(
'.files-wrapper'
);
var
$scrollerRight
=
$
(
'.scroller-right'
);
var
$scrollerLeft
=
$
(
'.scroller-left'
);
function
widthOfList
(){
var
itemsWidth
=
0
;
...
...
src/app/compiler.js
View file @
a3f43f0a
...
...
@@ -161,6 +161,7 @@ function Compiler(web3, editor, handleGithubCall, outputField, hidingRHP, update
}
var
importRegex
=
/^
\s
*import
\s
*
[\'\"]([^\'\"]
+
)[\'\"]
;/g
;
var
reloop
=
false
;
var
githubMatch
;
do
{
reloop
=
false
;
for
(
var
fileName
in
files
)
{
...
...
src/app/renderer.js
View file @
a3f43f0a
...
...
@@ -121,7 +121,7 @@ function Renderer(web3, editor, compiler, updateFiles) {
var
$contractOutput
=
dapp
.
render
();
$txOrigin
=
$
(
'#txorigin'
);
var
$txOrigin
=
$
(
'#txorigin'
);
function
renderAccounts
(
err
,
accounts
)
{
if
(
err
)
...
...
@@ -188,13 +188,14 @@ function Renderer(web3, editor, compiler, updateFiles) {
var
formatGasEstimates
=
function
(
data
)
{
var
gasToText
=
function
(
g
)
{
return
g
===
null
?
'unknown'
:
g
;
}
var
text
=
''
;
var
fun
;
if
(
'creation'
in
data
)
text
+=
'Creation: '
+
gasToText
(
data
.
creation
[
0
])
+
' + '
+
gasToText
(
data
.
creation
[
1
])
+
'
\
n'
;
text
+=
'External:
\
n'
;
for
(
var
fun
in
data
.
external
)
for
(
fun
in
data
.
external
)
text
+=
' '
+
fun
+
': '
+
gasToText
(
data
.
external
[
fun
])
+
'
\
n'
;
text
+=
'Internal:
\
n'
;
for
(
var
fun
in
data
.
internal
)
for
(
fun
in
data
.
internal
)
text
+=
' '
+
fun
+
': '
+
gasToText
(
data
.
internal
[
fun
])
+
'
\
n'
;
return
text
;
};
...
...
src/universal-dapp.js
View file @
a3f43f0a
...
...
@@ -97,7 +97,7 @@ UniversalDApp.prototype.render = function () {
this
.
$el
.
append
(
this
.
renderOutputModifier
(
this
.
contracts
[
c
].
name
,
$contractEl
));
}
}
$legend
=
$
(
'<div class="legend" />'
)
var
$legend
=
$
(
'<div class="legend" />'
)
.
append
(
$
(
'<div class="attach"/>'
).
text
(
'Attach'
)
)
.
append
(
$
(
'<div class="transact"/>'
).
text
(
'Transact'
)
)
.
append
(
$
(
'<div class="call"/>'
).
text
(
'Call'
)
);
...
...
@@ -183,13 +183,14 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar
$instance
.
toggleClass
(
'hide'
);
});
$events
=
$
(
'<div class="events"/>'
);
var
$events
=
$
(
'<div class="events"/>'
);
var
parseLogs
=
function
(
err
,
response
)
{
if
(
err
)
return
;
$event
=
$
(
'<div class="event" />'
);
var
$event
=
$
(
'<div class="event" />'
);
var
$close
=
$
(
'<div class="udapp-close" />'
);
$close
.
click
(
function
(){
$event
.
remove
();
}
);
...
...
@@ -562,8 +563,9 @@ UniversalDApp.prototype.runTx = function( data, args, cb) {
}
}
var
tx
;
if
(
!
this
.
vm
)
{
var
tx
=
{
tx
=
{
from
:
self
.
options
.
getAddress
?
self
.
options
.
getAddress
()
:
web3
.
eth
.
accounts
[
0
],
to
:
to
,
data
:
data
,
...
...
@@ -583,7 +585,7 @@ UniversalDApp.prototype.runTx = function( data, args, cb) {
try
{
var
address
=
this
.
options
.
getAddress
?
this
.
options
.
getAddress
()
:
this
.
getAccounts
()[
0
];
var
account
=
this
.
accounts
[
address
];
var
tx
=
new
EthJSTX
({
tx
=
new
EthJSTX
({
nonce
:
new
Buffer
([
account
.
nonce
++
]),
//@todo count beyond 255
gasPrice
:
1
,
gasLimit
:
3000000000
,
//plenty
...
...
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