Merge branch 'FrankieDisclaimer' of github.com:MetaMask/metamask-plugin into FrankieDisclaimer

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>

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