From 5eb3d5d485b17b98b19443d8def2f03dec9b38ef Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 3 Jul 2017 15:39:25 -0700
Subject: Make folder for responsive UI

---
 app/scripts/popup-core.js      |  2 +-
 app/scripts/responsive-core.js | 54 ++++++++++++++++++++++++++++++++++++++++++
 app/scripts/responsive.js      | 33 ++++++++++++++++++++++++++
 app/scripts/send-token.js      | 33 --------------------------
 4 files changed, 88 insertions(+), 34 deletions(-)
 create mode 100644 app/scripts/responsive-core.js
 create mode 100644 app/scripts/responsive.js
 delete mode 100644 app/scripts/send-token.js

(limited to 'app/scripts')

diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js
index f1eb394d7..156be795a 100644
--- a/app/scripts/popup-core.js
+++ b/app/scripts/popup-core.js
@@ -2,7 +2,7 @@ const EventEmitter = require('events').EventEmitter
 const async = require('async')
 const Dnode = require('dnode')
 const EthQuery = require('eth-query')
-const launchMetamaskUi = require('../../ui')
+const launchMetamaskUi = require('../../ui/classic')
 const StreamProvider = require('web3-stream-provider')
 const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex
 
diff --git a/app/scripts/responsive-core.js b/app/scripts/responsive-core.js
new file mode 100644
index 000000000..3760facfa
--- /dev/null
+++ b/app/scripts/responsive-core.js
@@ -0,0 +1,54 @@
+const EventEmitter = require('events').EventEmitter
+const async = require('async')
+const Dnode = require('dnode')
+const EthQuery = require('eth-query')
+const launchMetamaskUi = require('../../ui/responsive')
+const StreamProvider = require('web3-stream-provider')
+const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex
+
+
+module.exports = initializePopup
+
+
+function initializePopup ({ container, connectionStream }, cb) {
+  // setup app
+  async.waterfall([
+    (cb) => connectToAccountManager(connectionStream, cb),
+    (accountManager, cb) => launchMetamaskUi({ container, accountManager }, cb),
+  ], cb)
+}
+
+function connectToAccountManager (connectionStream, cb) {
+  // setup communication with background
+  // setup multiplexing
+  var mx = setupMultiplex(connectionStream)
+  // connect features
+  setupControllerConnection(mx.createStream('controller'), cb)
+  setupWeb3Connection(mx.createStream('provider'))
+}
+
+function setupWeb3Connection (connectionStream) {
+  var providerStream = new StreamProvider()
+  providerStream.pipe(connectionStream).pipe(providerStream)
+  connectionStream.on('error', console.error.bind(console))
+  providerStream.on('error', console.error.bind(console))
+  global.ethereumProvider = providerStream
+  global.ethQuery = new EthQuery(providerStream)
+}
+
+function setupControllerConnection (connectionStream, cb) {
+  // this is a really sneaky way of adding EventEmitter api
+  // to a bi-directional dnode instance
+  var eventEmitter = new EventEmitter()
+  var accountManagerDnode = Dnode({
+    sendUpdate: function (state) {
+      eventEmitter.emit('update', state)
+    },
+  })
+  connectionStream.pipe(accountManagerDnode).pipe(connectionStream)
+  accountManagerDnode.once('remote', function (accountManager) {
+    // setup push events
+    accountManager.on = eventEmitter.on.bind(eventEmitter)
+    cb(null, accountManager)
+  })
+}
diff --git a/app/scripts/responsive.js b/app/scripts/responsive.js
new file mode 100644
index 000000000..512065309
--- /dev/null
+++ b/app/scripts/responsive.js
@@ -0,0 +1,33 @@
+const startPopup = require('./responsive-core')
+const PortStream = require('./lib/port-stream.js')
+const ExtensionPlatform = require('./platforms/extension')
+const extension = require('extensionizer')
+const NotificationManager = require('./lib/notification-manager')
+const notificationManager = new NotificationManager()
+
+// create platform global
+global.platform = new ExtensionPlatform()
+
+// inject css
+const css = MetaMaskUiCss()
+injectCss(css)
+
+// setup stream to background
+const extensionPort = extension.runtime.connect({ name: 'ui' })
+const connectionStream = new PortStream(extensionPort)
+
+// start ui
+const container = document.getElementById('app-content')
+startPopup({ container, connectionStream }, (err, store) => {
+  if (err) return displayCriticalError(err)
+  store.subscribe(() => {
+    const state = store.getState()
+  })
+})
+
+function displayCriticalError (err) {
+  container.innerHTML = '<div class="critical-error">The MetaMask app failed to load: please open and close MetaMask again to restart.</div>'
+  container.style.height = '80px'
+  log.error(err.stack)
+  throw err
+}
diff --git a/app/scripts/send-token.js b/app/scripts/send-token.js
deleted file mode 100644
index 9e6868884..000000000
--- a/app/scripts/send-token.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const startPopup = require('./popup-core')
-const PortStream = require('./lib/port-stream.js')
-const ExtensionPlatform = require('./platforms/extension')
-const extension = require('extensionizer')
-const NotificationManager = require('./lib/notification-manager')
-const notificationManager = new NotificationManager()
-
-// create platform global
-global.platform = new ExtensionPlatform()
-
-// inject css
-const css = MetaMaskUiCss()
-injectCss(css)
-
-// setup stream to background
-const extensionPort = extension.runtime.connect({ name: 'ui' })
-const connectionStream = new PortStream(extensionPort)
-
-// start ui
-const container = document.getElementById('app-content')
-startPopup({ container, connectionStream }, (err, store) => {
-  if (err) return displayCriticalError(err)
-  store.subscribe(() => {
-    const state = store.getState()
-  })
-})
-
-function displayCriticalError (err) {
-  container.innerHTML = '<div class="critical-error">The MetaMask app failed to load: please open and close MetaMask again to restart.</div>'
-  container.style.height = '80px'
-  log.error(err.stack)
-  throw err
-}
-- 
cgit