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
b7330303
Commit
b7330303
authored
May 30, 2016
by
Dave Hoover
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Forgot to pull the executionContext into renderer
parent
fe1bc221
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
42 deletions
+43
-42
app.js
src/app.js
+1
-39
compiler.js
src/app/compiler.js
+2
-2
renderer.js
src/app/renderer.js
+40
-1
No files found.
src/app.js
View file @
b7330303
...
@@ -100,44 +100,6 @@ var run = function() {
...
@@ -100,44 +100,6 @@ var run = function() {
}
}
});
});
// ----------------- execution context -------------
var
$vmToggle
=
$
(
'#vm'
);
var
$web3Toggle
=
$
(
'#web3'
);
var
$web3endpoint
=
$
(
'#web3Endpoint'
);
if
(
web3
.
providers
&&
web3
.
currentProvider
instanceof
web3
.
providers
.
IpcProvider
)
$web3endpoint
.
val
(
'ipc'
);
var
executionContext
=
'vm'
;
$vmToggle
.
get
(
0
).
checked
=
true
;
$vmToggle
.
on
(
'change'
,
executionContextChange
);
$web3Toggle
.
on
(
'change'
,
executionContextChange
);
$web3endpoint
.
on
(
'change'
,
function
()
{
setProviderFromEndpoint
();
if
(
executionContext
==
'web3'
)
compiler
.
compile
();
});
function
executionContextChange
(
ev
)
{
if
(
ev
.
target
.
value
==
'web3'
&&
!
confirm
(
"Are you sure you want to connect to a local ethereum node?"
)
)
{
$vmToggle
.
get
(
0
).
checked
=
true
;
executionContext
=
'vm'
;
}
else
{
executionContext
=
ev
.
target
.
value
;
setProviderFromEndpoint
();
}
compiler
.
compile
();
}
function
setProviderFromEndpoint
()
{
var
endpoint
=
$web3endpoint
.
val
();
if
(
endpoint
==
'ipc'
)
web3
.
setProvider
(
new
web3
.
providers
.
IpcProvider
());
else
web3
.
setProvider
(
new
web3
.
providers
.
HttpProvider
(
endpoint
));
}
// ------------------ gist publish --------------
// ------------------ gist publish --------------
...
@@ -453,7 +415,7 @@ var run = function() {
...
@@ -453,7 +415,7 @@ var run = function() {
return
$
.
getJSON
(
'https://api.github.com/repos/'
+
root
+
'/contents/'
+
path
,
cb
);
return
$
.
getJSON
(
'https://api.github.com/repos/'
+
root
+
'/contents/'
+
path
,
cb
);
}
}
var
compiler
=
new
Compiler
(
editor
,
handleGithubCall
,
$
(
'#output'
),
getHidingRHP
,
updateFiles
);
var
compiler
=
new
Compiler
(
web3
,
editor
,
handleGithubCall
,
$
(
'#output'
),
getHidingRHP
,
updateFiles
);
function
setVersionText
(
text
)
{
function
setVersionText
(
text
)
{
$
(
'#version'
).
text
(
text
);
$
(
'#version'
).
text
(
text
);
...
...
src/app/compiler.js
View file @
b7330303
...
@@ -4,8 +4,8 @@ var Renderer = require('./renderer');
...
@@ -4,8 +4,8 @@ var Renderer = require('./renderer');
var
Base64
=
require
(
'js-base64'
).
Base64
;
var
Base64
=
require
(
'js-base64'
).
Base64
;
function
Compiler
(
editor
,
handleGithubCall
,
outputField
,
hidingRHP
,
updateFiles
)
{
function
Compiler
(
web3
,
editor
,
handleGithubCall
,
outputField
,
hidingRHP
,
updateFiles
)
{
var
renderer
=
new
Renderer
(
editor
,
this
,
updateFiles
);
var
renderer
=
new
Renderer
(
web3
,
editor
,
this
,
updateFiles
);
var
compileJSON
;
var
compileJSON
;
var
compilerAcceptsMultipleFiles
;
var
compilerAcceptsMultipleFiles
;
...
...
src/app/renderer.js
View file @
b7330303
...
@@ -4,9 +4,48 @@ var UniversalDApp = require('../universal-dapp.js');
...
@@ -4,9 +4,48 @@ var UniversalDApp = require('../universal-dapp.js');
var
utils
=
require
(
'./utils'
);
var
utils
=
require
(
'./utils'
);
function
Renderer
(
editor
,
compiler
,
updateFiles
)
{
function
Renderer
(
web3
,
editor
,
compiler
,
updateFiles
)
{
var
detailsOpen
=
{};
var
detailsOpen
=
{};
var
executionContext
=
'vm'
;
// Forcing all of this setup into its own scope.
(
function
(){
function
executionContextChange
(
ev
)
{
if
(
ev
.
target
.
value
==
'web3'
&&
!
confirm
(
"Are you sure you want to connect to a local ethereum node?"
)
)
{
$vmToggle
.
get
(
0
).
checked
=
true
;
executionContext
=
'vm'
;
}
else
{
executionContext
=
ev
.
target
.
value
;
setProviderFromEndpoint
();
}
compiler
.
compile
();
}
function
setProviderFromEndpoint
()
{
var
endpoint
=
$web3endpoint
.
val
();
if
(
endpoint
==
'ipc'
)
web3
.
setProvider
(
new
web3
.
providers
.
IpcProvider
());
else
web3
.
setProvider
(
new
web3
.
providers
.
HttpProvider
(
endpoint
));
}
var
$vmToggle
=
$
(
'#vm'
);
var
$web3Toggle
=
$
(
'#web3'
);
var
$web3endpoint
=
$
(
'#web3Endpoint'
);
if
(
web3
.
providers
&&
web3
.
currentProvider
instanceof
web3
.
providers
.
IpcProvider
)
$web3endpoint
.
val
(
'ipc'
);
$vmToggle
.
get
(
0
).
checked
=
true
;
$vmToggle
.
on
(
'change'
,
executionContextChange
);
$web3Toggle
.
on
(
'change'
,
executionContextChange
);
$web3endpoint
.
on
(
'change'
,
function
()
{
setProviderFromEndpoint
();
if
(
executionContext
==
'web3'
)
compiler
.
compile
();
});
})();
function
renderError
(
message
)
{
function
renderError
(
message
)
{
var
type
=
utils
.
errortype
(
message
);
var
type
=
utils
.
errortype
(
message
);
...
...
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