do not require internal modules

poooi · Dec 22, 2015 · 68b6bca · 68b6bca
1 parent 0fdc347
commit 68b6bca
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/env-loader.js b/env-loader.js
@@ -1,7 +1,6 @@
-window.remote = require('remote');
 
+window.remote = require('electron').remote;
 window.ROOT = remote.getGlobal('ROOT');
-
 window.MODULE_PATH = remote.getGlobal('MODULE_PATH');
 
 require('module').globalPaths.push(MODULE_PATH);

diff --git a/index.cjsx b/index.cjsx
@@ -1,6 +1,6 @@
-{React, ReactBootstrap, FontAwesome} = window
+
 {Button} = ReactBootstrap
-remote = require 'remote'
+{remote} = require 'electron'
 windowManager = remote.require './lib/window'
 
 path = require 'path'

diff --git a/item-info.coffee b/item-info.coffee
@@ -18,5 +18,6 @@ try
 document.title = __ 'Equipment Info'
 
 loadTheme config.get('poi.theme', '__default__')
+$('#font-awesome').setAttribute 'href', "#{ROOT}/components/font-awesome/css/font-awesome.min.css"
 
 require './views'
diff --git a/views/index.cjsx b/views/index.cjsx
@@ -1,6 +1,4 @@
 
-$('#font-awesome')?.setAttribute 'href', "#{ROOT}/components/font-awesome/css/font-awesome.min.css"
-
 ItemInfoTableArea = require './item-info-table-area'
 ItemInfoCheckboxArea = require './item-info-checkbox-area'