Rewritten to react standards. Way easier.

feature/default_network_editable
Kevin Serrano 8 years ago
parent a59422c01d
commit c0d6dcff00
No known key found for this signature in database
GPG Key ID: 7CC862A58D2889B4
  1. 2
      test/integration/tests.js
  2. 17
      ui/app/first-time/disclaimer.js

@ -11,7 +11,7 @@ QUnit.test('agree to terms', function (assert) {
wait().then(function() {
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')
assert.equal(buttons.length, 2, 'two buttons: create and restore')

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

Loading…
Cancel
Save