Refactor window bootstrapping

tropy · Jun 7, 2016 · 4c850d8 · 4c850d8
1 parent 5791279
commit 4c850d8
Show file tree

Hide file tree

Showing 19 changed files with 83 additions and 82 deletions.
diff --git a/src/bootstrap.js b/src/bootstrap.js
@@ -3,38 +3,63 @@
 global.START_TIME = Date.now()
 global.__REACT_DEVTOOLS_GLOBAL_HOOK__ = {}
 
-const decode = decodeURIComponent
-const hash = window.location.hash.slice(1)
+{
+  const decode = decodeURIComponent
+  const hash = window.location.hash.slice(1)
 
-if (process.env.NODE_ENV !== 'test') {
-  global.args = Object.freeze(JSON.parse(decode(hash)))
+  if (process.env.NODE_ENV !== 'test') {
+    global.args = Object.freeze(JSON.parse(decode(hash)))
 
-  process.env.NODE_ENV = global.args.environment
-  process.env.DEBUG = global.args.debug
+    process.env.NODE_ENV = global.args.environment
+    process.env.DEBUG = global.args.debug
 
-} else {
-  global.args = {
-    environment: 'test',
-    debug: process.env.DEBUG
+  } else {
+    global.args = {
+      environment: 'test',
+      debug: process.env.DEBUG
+    }
   }
 }
 
+
+const { verbose } = require('./common/log')(global.args.home)
+const { basename } = require('path')
+const { release } = require('os')
+const { ready, append, stylesheet, toggle } = require('./dom')
+
+const PAGE = basename(window.location.pathname, '.html')
+
+ready(() => {
+  verbose('%s ready after %dms', PAGE, Date.now() - global.START_TIME)
+
+  append(
+    stylesheet(`../lib/stylesheets/${process.platform}/${PAGE}.css`),
+    document.head)
+
+  if (!global.args.frame) {
+    toggle(document.body, 'frameless', true)
+  }
+
+  if (process.platform === 'darwin' && release() > '15') {
+    toggle(document.body, 'hidden-inset', true)
+  }
+})
+
+
 if (global.args.environment === 'development') {
   if (process.platform !== 'linux') {
-    const props = Object.defineProperties
     const { remote } = require('electron')
+    const props = Object.defineProperties
 
     props(process, {
       stdout: { value: remote.process.stdout },
       stderr: { value: remote.process.stderr }
     })
   }
 
-  try {
-    require('devtron').install()
-  } catch (_) {
-    // ignore
-  }
+  // try {
+  //   require('devtron').install()
+  // } catch (_) {
+  //   // ignore
+  // }
 }
-
-require('./common/log')(global.args.home)
diff --git a/src/browser/tropy.js b/src/browser/tropy.js
@@ -48,16 +48,16 @@ module.exports = class Tropy extends EventEmitter {
 
     this.win = new Window()
       .once('closed', () => { this.win = undefined })
-      .open('index.html', this.hash)
+      .open('project.html', this.hash)
 
-    this.dummy()
-    this.dummy(true)
+    this.dummy(os.platform() !== 'darwin')
 
     return this
   }
 
   dummy(frame = false) {
-    this.dummies = this.dummies || []
+    if (this.dum) return this.dum.show(), this
+
     const options = { width: 1440, height: 878 }
 
     if (!frame) {
@@ -69,12 +69,10 @@ module.exports = class Tropy extends EventEmitter {
       }
     }
 
-    const idx = this.dummies.length
-    const dum = new Window(options)
-      .once('closed', () => { this.dummies.splice(idx, 1) })
+    this.dum = new Window(options)
+      .once('closed', () => { this.dum = undefined })
       .open('dummy.html', { frame, ...this.hash })
 
-    this.dummies.push(dum)
     return this
   }
 

diff --git a/src/stylesheets/darwin.scss b/src/stylesheets/darwin.scss
diff --git a/src/stylesheets/darwin/dummy.scss b/src/stylesheets/darwin/dummy.scss
@@ -0,0 +1,3 @@
+$platform: "darwin";
+@import "../common";
+@import "../dummy";
diff --git a/src/stylesheets/darwin/project.scss b/src/stylesheets/darwin/project.scss
@@ -0,0 +1,2 @@
+$platform: "darwin";
+@import "../common";
diff --git a/src/stylesheets/dummy-darwin.scss b/src/stylesheets/dummy-darwin.scss
diff --git a/src/stylesheets/dummy-linux.scss b/src/stylesheets/dummy-linux.scss
diff --git a/src/stylesheets/dummy-win32.scss b/src/stylesheets/dummy-win32.scss
diff --git a/src/stylesheets/linux.scss b/src/stylesheets/linux.scss
diff --git a/src/stylesheets/linux/dummy.scss b/src/stylesheets/linux/dummy.scss
@@ -0,0 +1,3 @@
+$platform: "linux";
+@import "../common";
+@import "../dummy";
diff --git a/src/stylesheets/linux/project.scss b/src/stylesheets/linux/project.scss
@@ -0,0 +1,2 @@
+$platform: "linux";
+@import "../common";
diff --git a/src/stylesheets/win32.scss b/src/stylesheets/win32.scss
diff --git a/src/stylesheets/win32/dummy.scss b/src/stylesheets/win32/dummy.scss
@@ -0,0 +1,3 @@
+$platform: "win32";
+@import "../common";
+@import "../dummy";
diff --git a/src/stylesheets/win32/project.scss b/src/stylesheets/win32/project.scss
@@ -0,0 +1,2 @@
+$platform: "win32";
+@import "../common";
diff --git a/static/dummy.html b/static/dummy.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <script src="dummy.js"></script>
 </head>
 <body tabindex="-1">
   <div class="container">
@@ -18,6 +19,5 @@
       --><button tabindex="-1" class="maximize no-drag"></button>
     </div>
   </div>
-  <script src="dummy.js"></script>
 </body>
 </html>
diff --git a/static/dummy.js b/static/dummy.js
@@ -1,27 +1,12 @@
 'use strict'
 
 {
-  const { ready, append, stylesheet, $, on, toggle } = require('../lib/dom')
-  const { info } = require('../lib/common/log')
-  const { release } = require('os')
+  const { ready, $, on, toggle } = require('../lib/dom')
 
   ready(() => {
-    info('dummy ready after %sms', Date.now() - global.START_TIME)
+    on($('.container'), 'click', function () {
+      toggle(this, 'item')
+    })
   })
 
-  append(
-    stylesheet(`../lib/stylesheets/dummy-${process.platform}.css`),
-      document.head)
-
-  on($('.container'), 'click', function () {
-    toggle(this, 'item')
-  })
-
-  if (!global.args.frame) {
-    toggle(document.body, 'frameless', true)
-
-    if (process.platform === 'darwin' && release() > '10.10') {
-      toggle(document.body, 'hidden-inset', true)
-    }
-  }
 }
diff --git a/static/index.js b/static/index.js
diff --git a/static/index.html → static/project.html b/static/index.html → static/project.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <script src="index.js"></script>
+  <script src="project.js"></script>
 </head>
 <body tabindex="-1">
 </body>

diff --git a/static/project.js b/static/project.js
@@ -0,0 +1,13 @@
+'use strict'
+
+{
+  const { name } = require('../package')
+  const { ready } = require('../lib/dom')
+  const v = process.versions
+
+  ready(() => {
+    document.body.innerHTML =
+      `${name} ${process.env.NODE_ENV} ${v.electron} / ${v.node}`
+
+  })
+}