m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-22 17:33:23 +01:00
Code

Rewritten to react standards. Way easier.

Browse Source
This commit is contained in:
Kevin Serrano 2016-10-05 02:42:19 -07:00
parent a59422c01d
commit c0d6dcff00
No known key found for this signature in database
GPG Key ID: 7CC862A58D2889B4
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/tests.js
View File

@ -11,7 +11,7 @@ QUnit.test('agree to terms', function (assert) {
wait().then(function() { wait().then(function() {
var title = app.find('h1').text() var title = app.find('h1').text()
assert.equal(title, 'MetaMask', 'title screen') assert.equal(title, 'Terms of Use Version 1', 'title screen')
var buttons = app.find('button') var buttons = app.find('button')
assert.equal(buttons.length, 2, 'two buttons: create and restore') assert.equal(buttons.length, 2, 'two buttons: create and restore')

17
ui/app/first-time/disclaimer.js
View File

@ -19,6 +19,9 @@ function DisclaimerScreen () {
} }
DisclaimerScreen.prototype.render = function () { DisclaimerScreen.prototype.render = function () {
const state = this.state || {disclaimerDisabled: true}
const disabled = state.disclaimerDisabled
return ( return (
h('.flex-column.flex-center.flex-grow', [ h('.flex-column.flex-center.flex-grow', [
@ -67,15 +70,11 @@ DisclaimerScreen.prototype.render = function () {
h('div.markdown', { h('div.markdown', {
onScroll: (e) => { onScroll: (e) => {
var object = e.currentTarget var object = e.currentTarget
var button = document.getElementById('agree') if (object.offsetHeight + object.scrollTop + 100 >= object.scrollHeight) {
if ((object.offsetHeight + object.scrollTop + 100 >= object.scrollHeight) && button.disabled) { this.setState({disclaimerDisabled: false})
button.disabled = false
button.innerHTML = 'I Agree'
button.addEventListener('click', () => this.props.dispatch(actions.agreeToDisclaimer()))
} }
}, },
style: { style: {
// whiteSpace: 'pre-line',
background: 'rgb(235, 235, 235)', background: 'rgb(235, 235, 235)',
height: '310px', height: '310px',
padding: '6px', padding: '6px',
@ -91,11 +90,11 @@ DisclaimerScreen.prototype.render = function () {
]), ]),
h('button#agree', { h('button', {
style: { marginTop: '18px' }, style: { marginTop: '18px' },
disabled: true, disabled: disabled,
onClick: () => this.props.dispatch(actions.agreeToDisclaimer()), onClick: () => this.props.dispatch(actions.agreeToDisclaimer()),
}, 'Scroll Down to Enable'), }, disabled ? 'Scroll Down to Enable' : 'I Agree'),
]) ])
) )
} }