diff options
| author | kumavis <aaron@kumavis.me> | 2016-07-01 12:46:31 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2016-07-01 12:46:31 +0800 |
| commit | 9a46988ea8983e963b532618a05788d9772947a4 (patch) | |
| tree | d7f50430ff63267e2ee7146d18c8b380b486ee44 /development | |
| parent | 5a917431d8ce2587284d938b6135a62bff6e17d1 (diff) | |
| parent | a95b5c4a96d5b850d4b61f1cf61d02b3f97a8f12 (diff) | |
| download | tangerine-wallet-browser-9a46988ea8983e963b532618a05788d9772947a4.tar.gz tangerine-wallet-browser-9a46988ea8983e963b532618a05788d9772947a4.tar.zst tangerine-wallet-browser-9a46988ea8983e963b532618a05788d9772947a4.zip | |
Merge branch 'FrankieDisclaimer' of github.com:MetaMask/metamask-plugin into FrankieDisclaimer
Diffstat (limited to 'development')
| -rw-r--r-- | development/index.html | 23 | ||||
| -rw-r--r-- | development/mocker.js | 4 |
2 files changed, 2 insertions, 25 deletions
diff --git a/development/index.html b/development/index.html index 02fd01b03..deb3dc690 100644 --- a/development/index.html +++ b/development/index.html @@ -10,28 +10,5 @@ <div id="app-content" style="height: 100%"></div> <script src="./bundle.js" type="text/javascript" charset="utf-8"></script> - <!-- design reference --> - <link rel="stylesheet" type="text/css" href="../ui/app/css/debug.css"> - <div id="design-container"> - <!-- persist scroll position on refresh --> - <script type="text/javascript"> - var scrollElement = document.getElementById('design-container') - function getScrollPosition () { - var scrollTop = scrollElement.scrollTop, scrollLeft = scrollElement.scrollLeft - window.location.hash = 'scrollTop='+scrollTop+'&scrollLeft='+scrollLeft - } - window.onload = function () { - setInterval(getScrollPosition, 1000) - var hashLocation = window.location.hash.split('#')[1] - if (!hashLocation) return - var sections = hashLocation.split('&') - var scrollTop = sections[0].split('=')[1] - var scrollLeft = sections[1].split('=')[1] - scrollElement.scrollTop = scrollTop - scrollElement.scrollLeft = scrollLeft - } - </script> - </div> - </body> </html> diff --git a/development/mocker.js b/development/mocker.js index 098d46c75..593037f2e 100644 --- a/development/mocker.js +++ b/development/mocker.js @@ -9,13 +9,13 @@ const Selector = require('./selector') const qs = require('qs') let queryString = qs.parse(window.location.href.split('#')[1]) let selectedView = queryString.view || 'account detail' +const firstState = states[selectedView] +updateQueryParams(selectedView) // CSS const MetaMaskUiCss = require('../ui/css') const injectCss = require('inject-css') -const firstState = states[selectedView] -updateQueryParams() function updateQueryParams(newView) { queryString.view = newView |