From 545f2bf10aaa46a34ea4c705f43a745ded0a9ba9 Mon Sep 17 00:00:00 2001 From: Luke Childs Date: Thu, 10 Jan 2019 15:43:13 +0700 Subject: [PATCH] Don't wait for DOM --- website/index.html | 2 +- website/index.js | 57 +++++++++++++++++++------------------------- website/package.json | 3 +-- website/yarn.lock | 5 ---- 4 files changed, 27 insertions(+), 40 deletions(-) diff --git a/website/index.html b/website/index.html index 7684d26..33ecd12 100644 --- a/website/index.html +++ b/website/index.html @@ -109,6 +109,6 @@ - + diff --git a/website/index.js b/website/index.js index 7141b65..f809ae2 100644 --- a/website/index.js +++ b/website/index.js @@ -1,6 +1,5 @@ /* eslint-env browser */ import 'babel-polyfill'; -import whenDomReady from 'when-dom-ready'; import noUiSlider from 'nouislider'; import dogeSeed from '..'; import {version} from '../package'; @@ -13,41 +12,35 @@ const bitsToWords = { 256: 24 }; -const main = async () => { - await whenDomReady(); +document.querySelector('.version').innerText = `v${version}`; - document.querySelector('.version').innerText = `v${version}`; +const seedText = document.querySelector('.seed-text'); +const regenerateSeedButton = document.querySelector('.regenerate-seed'); - const seedText = document.querySelector('.seed-text'); - const regenerateSeedButton = document.querySelector('.regenerate-seed'); +const bitSlider = noUiSlider.create(document.querySelector('.bit-slider'), { + range: {min: 128, max: 256}, + step: 32, + start: 256, + pips: { + mode: 'steps', + density: 1, + format: {to: bits => bitsToWords[bits]}, + filter: (value, step) => step === 0 ? -1 : 1 + } +}); - const bitSlider = noUiSlider.create(document.querySelector('.bit-slider'), { - range: {min: 128, max: 256}, - step: 32, - start: 256, - pips: { - mode: 'steps', - density: 1, - format: {to: bits => bitsToWords[bits]}, - filter: (value, step) => step === 0 ? -1 : 1 - } - }); +const generateSeed = () => { + const bits = Number(bitSlider.get()); + const seedPhraseWords = dogeSeed(bits).split(' '); - const generateSeed = () => { - const bits = Number(bitSlider.get()); - const seedPhraseWords = dogeSeed(bits).split(' '); + const wrappedSeedPhrase = seedPhraseWords.map(word => `${word}`).join(' '); + const wordCount = seedPhraseWords.length; - const wrappedSeedPhrase = seedPhraseWords.map(word => `${word}`).join(' '); - const wordCount = seedPhraseWords.length; - - seedText.dataset.wordCount = wordCount; - seedText.innerHTML = wrappedSeedPhrase; - }; - - regenerateSeedButton.addEventListener('click', generateSeed); - bitSlider.on('update', generateSeed); - - generateSeed(); + seedText.dataset.wordCount = wordCount; + seedText.innerHTML = wrappedSeedPhrase; }; -main(); +regenerateSeedButton.addEventListener('click', generateSeed); +bitSlider.on('update', generateSeed); + +generateSeed(); diff --git a/website/package.json b/website/package.json index fea3055..1d0ad88 100644 --- a/website/package.json +++ b/website/package.json @@ -17,7 +17,6 @@ "dependencies": { "babel-polyfill": "^6.26.0", "modern-normalize": "^0.5.0", - "nouislider": "^12.1.0", - "when-dom-ready": "^1.2.12" + "nouislider": "^12.1.0" } } diff --git a/website/yarn.lock b/website/yarn.lock index 00f6093..90ac710 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -4943,11 +4943,6 @@ wcwidth@^1.0.1: dependencies: defaults "^1.0.3" -when-dom-ready@^1.2.12: - version "1.2.12" - resolved "https://registry.yarnpkg.com/when-dom-ready/-/when-dom-ready-1.2.12.tgz#99f46f02ef65dbb2bb2f4b58c44588234e724c98" - integrity sha1-mfRvAu9l27K7L0tYxEWII05yTJg= - whet.extend@~0.9.9: version "0.9.9" resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"