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
61003c00
Commit
61003c00
authored
May 16, 2019
by
LianaHus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
personal mode restyleing in settings tab
parent
346c0c10
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
13 deletions
+20
-13
settings.js
src/app/tabs/runTab/settings.js
+8
-5
settings-tab.js
src/app/tabs/settings-tab.js
+12
-8
No files found.
src/app/tabs/runTab/settings.js
View file @
61003c00
...
@@ -87,7 +87,9 @@ class SettingsUI {
...
@@ -87,7 +87,9 @@ class SettingsUI {
<div class="
${
css
.
crow
}
">
<div class="
${
css
.
crow
}
">
<div class="
${
css
.
col1_1
}
">
<div class="
${
css
.
col1_1
}
">
Account
Account
<i id="remixRunPlus" class="fas fa-plus-circle
${
css
.
icon
}
" aria-hidden="true" onclick=
${
this
.
newAccount
.
bind
(
this
)}
title="Create a new account"></i>
<span id="remixRunPlusWraper" title="Create a new account">
<i id="remixRunPlus" class="fas fa-plus-circle
${
css
.
icon
}
" aria-hidden="true" onclick=
${
this
.
newAccount
.
bind
(
this
)}
"></i>
</span>
</div>
</div>
<div class=
${
css
.
account
}
>
<div class=
${
css
.
account
}
>
<select name="txorigin" class="form-control
${
css
.
select
}
" id="txorigin"></select>
<select name="txorigin" class="form-control
${
css
.
select
}
" id="txorigin"></select>
...
@@ -200,24 +202,25 @@ class SettingsUI {
...
@@ -200,24 +202,25 @@ class SettingsUI {
updatePlusButton
()
{
updatePlusButton
()
{
// enable/disable + button
// enable/disable + button
let
plusBtn
=
document
.
getElementById
(
"remixRunPlus"
)
let
plusBtn
=
document
.
getElementById
(
"remixRunPlus"
)
let
plusTitle
=
document
.
getElementById
(
"remixRunPlusWraper"
)
switch
(
this
.
selectExEnv
.
value
)
{
switch
(
this
.
selectExEnv
.
value
)
{
case
"injected"
:
{
case
"injected"
:
{
plusBtn
.
classList
.
add
(
css
.
disableMouseEvents
)
plusBtn
.
classList
.
add
(
css
.
disableMouseEvents
)
plus
Btn
.
title
=
"Unfortnately it's not possible to create an account for injected web3, please use the Metamask or other providers"
plus
Title
.
title
=
"Unfortnately it's not possible to create an account for injected web3, please use the Metamask or other providers"
}
}
break
;
break
;
case
"vm"
:
{
case
"vm"
:
{
plusBtn
.
classList
.
remove
(
css
.
disableMouseEvents
)
plusBtn
.
classList
.
remove
(
css
.
disableMouseEvents
)
plus
Btn
.
title
=
"Create a new account"
plus
Title
.
title
=
"Create a new account"
}
}
break
;
break
;
case
"web3"
:
{
case
"web3"
:
{
if
(
!
this
.
_components
.
registry
.
get
(
'config'
).
api
.
get
(
"settings/personal-mode"
))
{
if
(
!
this
.
_components
.
registry
.
get
(
'config'
).
api
.
get
(
"settings/personal-mode"
))
{
plusBtn
.
classList
.
add
(
css
.
disableMouseEvents
)
plusBtn
.
classList
.
add
(
css
.
disableMouseEvents
)
plus
Btn
.
title
=
"Creating an account is possible only in Personal mode. Please go to Settings to enable it."
plus
Title
.
title
=
"Creating an account is possible only in Personal mode. Please go to Settings to enable it."
}
else
{
}
else
{
plusBtn
.
classList
.
remove
(
css
.
disableMouseEvents
)
plusBtn
.
classList
.
remove
(
css
.
disableMouseEvents
)
plus
Btn
.
title
=
"Create a new account"
plus
Title
.
title
=
"Create a new account"
}
}
}
}
default
:
default
:
...
...
src/app/tabs/settings-tab.js
View file @
61003c00
...
@@ -29,7 +29,10 @@ module.exports = class SettingsTab extends BaseApi {
...
@@ -29,7 +29,10 @@ module.exports = class SettingsTab extends BaseApi {
}
}
this
.
_view
=
{
/* eslint-disable */
this
.
_view
=
{
/* eslint-disable */
el
:
null
,
el
:
null
,
optionVM
:
null
,
personal
:
null
,
warnPersonalMode
:
null
,
generateContractMetadata
:
null
,
optionVM
:
null
,
personal
:
null
,
warnPersonalMode
:
null
,
generateContractMetadata
:
null
,
config
:
{
config
:
{
general
:
null
,
themes
:
null
general
:
null
,
themes
:
null
}
}
...
@@ -72,12 +75,6 @@ module.exports = class SettingsTab extends BaseApi {
...
@@ -72,12 +75,6 @@ module.exports = class SettingsTab extends BaseApi {
if
(
this
.
config
.
get
(
'settings/always-use-vm'
))
this
.
_view
.
optionVM
.
setAttribute
(
'checked'
,
''
)
if
(
this
.
config
.
get
(
'settings/always-use-vm'
))
this
.
_view
.
optionVM
.
setAttribute
(
'checked'
,
''
)
this
.
_view
.
personal
=
yo
`<input onchange=
${
onchangePersonal
}
id="personal" type="checkbox" class="align-middle form-check-input">`
this
.
_view
.
personal
=
yo
`<input onchange=
${
onchangePersonal
}
id="personal" type="checkbox" class="align-middle form-check-input">`
if
(
this
.
config
.
get
(
'settings/personal-mode'
))
this
.
_view
.
personal
.
setAttribute
(
'checked'
,
''
)
if
(
this
.
config
.
get
(
'settings/personal-mode'
))
this
.
_view
.
personal
.
setAttribute
(
'checked'
,
''
)
var
warnText
=
`Transaction sent over Web3 will use the web3.personal API - be sure the endpoint is opened before enabling it.
This mode allows to provide the passphrase in the Remix interface without having to unlock the account.
Although this is very convenient, you should completely trust the backend you are connected to (Geth, Parity, ...).
It is not recommended (and also most likely not relevant) to use this mode with an injected provider (Mist, Metamask, ...) or with JavaScript VM.
Remix never persist any passphrase.`
.
split
(
'
\
n'
).
map
(
s
=>
s
.
trim
()).
join
(
' '
)
this
.
_view
.
warnPersonalMode
=
yo
`<i title=
${
warnText
}
class="
${
css
.
icon
}
fas fa-exclamation-triangle text-warning" aria-hidden="true"></i>`
this
.
_view
.
generateContractMetadata
=
yo
`<input onchange=
${
onchangeGenerateContractMetadata
}
id="generatecontractmetadata" type="checkbox" class="form-check-input">`
this
.
_view
.
generateContractMetadata
=
yo
`<input onchange=
${
onchangeGenerateContractMetadata
}
id="generatecontractmetadata" type="checkbox" class="form-check-input">`
if
(
this
.
config
.
get
(
'settings/generate-contract-metadata'
))
this
.
_view
.
generateContractMetadata
.
setAttribute
(
'checked'
,
''
)
if
(
this
.
config
.
get
(
'settings/generate-contract-metadata'
))
this
.
_view
.
generateContractMetadata
.
setAttribute
(
'checked'
,
''
)
...
@@ -94,6 +91,13 @@ module.exports = class SettingsTab extends BaseApi {
...
@@ -94,6 +91,13 @@ module.exports = class SettingsTab extends BaseApi {
<button class="btn btn-primary sm-1" onclick="
${()
=>
{
window
.
open
(
'https://gitter.im/ethereum/remix'
)
}}
">Gitter Channel</button>
<button class="btn btn-primary sm-1" onclick="
${()
=>
{
window
.
open
(
'https://gitter.im/ethereum/remix'
)
}}
">Gitter Channel</button>
</div>
</div>
</div>`
</div>`
var warnText = `Transaction sent over Web3 will use the web3.personal API - be sure the endpoint is opened before enabling it.
This mode allows to provide the passphrase in the Remix interface without having to unlock the account.
Although this is very convenient, you should completely trust the backend you are connected to (Geth, Parity, ...).
Remix never persist any passphrase.`.split('
\
n').map(s => s.trim()).join(' ')
this._view.warnPersonalMode = yo`<i class="
$
{
css
.
icon
}
fas fa-exclamation-triangle text-warning" aria-hidden="true"></i>`
this
.
_view
.
config
.
general
=
yo
`
this
.
_view
.
config
.
general
=
yo
`
<div class="
${
css
.
info
}
card">
<div class="
${
css
.
info
}
card">
<div class="card-body">
<div class="card-body">
...
@@ -112,7 +116,7 @@ module.exports = class SettingsTab extends BaseApi {
...
@@ -112,7 +116,7 @@ module.exports = class SettingsTab extends BaseApi {
</div>
</div>
<div class="form-check
${
css
.
frow
}
">
<div class="form-check
${
css
.
frow
}
">
<div>
${
this
.
_view
.
personal
}
></div>
<div>
${
this
.
_view
.
personal
}
></div>
<label class="form-check-label align-middle" for="personal">
Enable Personal Mode
${
this
.
_view
.
warnPersonalMode
}
></label>
<label class="form-check-label align-middle" for="personal">
${
this
.
_view
.
warnPersonalMode
}
Enable Personal Mode for web3 provider.
${
warnText
}
></label>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
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