move events to their own file as a intermediary step for further refactoring

src/app.js

@@ -7,7 +7,7 @@ var async = require('async')
 var request = require('request')
 var remixLib = require('remix-lib')
 var remixTests = require('remix-tests')
-var EventManager = remixLib.EventManager
+var EventManager = require('./lib/events')
 
 var registry = require('./global/registry')
 var UniversalDApp = require('./universal-dapp.js')

src/app/debugger/debuggerUI.js

@@ -6,8 +6,7 @@ var Debugger = require('./debugger/debugger')
 
 var SourceHighlighter = require('../editor/sourceHighlighter')
 
-var remixLib = require('remix-lib')
+var EventManager = require('../../lib/events')
-var EventManager = remixLib.EventManager
 
 var executionContext = require('../../execution-context')
 var globalRegistry = require('../../global/registry')

src/app/debugger/debuggerUI/ButtonNavigator.js

@@ -1,6 +1,5 @@
 'use strict'
-var remixLib = require('remix-lib')
+var EventManager = require('../../../lib/events')
-var EventManager = remixLib.EventManager
 var yo = require('yo-yo')
 
 var csjs = require('csjs-inject')

src/app/debugger/debuggerUI/Slider.js

@@ -1,6 +1,5 @@
 'use strict'
-var remixLib = require('remix-lib')
+var EventManager = require('../../../lib/events')
-var EventManager = remixLib.EventManager
 var yo = require('yo-yo')
 
 class Slider {

src/app/debugger/debuggerUI/StepManager.js

@@ -1,5 +1,4 @@
-var remixLib = require('remix-lib')
+var EventManager = require('../../../lib/events')
-var EventManager = remixLib.EventManager
 var yo = require('yo-yo')
 
 var ButtonNavigator = require('./ButtonNavigator')

src/app/debugger/debuggerUI/TxBrowser.js

@@ -1,5 +1,4 @@
-var remixLib = require('remix-lib')
+var EventManager = require('../../../lib/events')
-var EventManager = remixLib.EventManager
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
 var styleGuide = require('../../ui/styles-guide/theme-chooser')

src/app/debugger/debuggerUI/vmDebugger/CodeListView.js

@@ -1,9 +1,8 @@
 'use strict'
 var style = require('../styles/basicStyles')
 var yo = require('yo-yo')
-var remixLib = require('remix-lib')
 var DropdownPanel = require('./DropdownPanel')
-var EventManager = remixLib.EventManager
+var EventManager = require('../../../../lib/events')
 var csjs = require('csjs-inject')
 var styleGuide = require('../../../ui/styles-guide/theme-chooser')
 var styles = styleGuide.chooser()

src/app/debugger/debuggerUI/vmDebugger/DropdownPanel.js

@@ -1,8 +1,7 @@
 'use strict'
 var yo = require('yo-yo')
 const copy = require('clipboard-copy')
-var remixLib = require('remix-lib')
+var EventManager = require('../../../../lib/events')
-var EventManager = remixLib.EventManager
 var TreeView = require('../../../ui/TreeView') // TODO setup a direct reference to the UI components
 
 var csjs = require('csjs-inject')

src/app/debugger/debuggerUI/vmDebugger/SolidityLocals.js

@@ -1,6 +1,5 @@
 'use strict'
-var remixLib = require('remix-lib')
+var EventManager = require('../../../../lib/events')
-var EventManager = remixLib.EventManager
 var DropdownPanel = require('./DropdownPanel')
 var solidityTypeFormatter = require('./utils/SolidityTypeFormatter')
 var yo = require('yo-yo')

src/app/editor/contextualListener.js

@@ -2,7 +2,7 @@
 var remixLib = require('remix-lib')
 var SourceMappingDecoder = remixLib.SourceMappingDecoder
 var AstWalker = remixLib.AstWalker
-var EventManager = remixLib.EventManager
+var EventManager = require('../../lib/events')
 var globalRegistry = require('../../global/registry')
 
 /*

src/app/editor/editor.js

@@ -1,6 +1,5 @@
 'use strict'
-var remixLib = require('remix-lib')
+var EventManager = require('../../lib/events')
-var EventManager = remixLib.EventManager
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
 var ace = require('brace')

src/app/execution/txLogger.js

@@ -8,7 +8,7 @@ var remixLib = require('remix-lib')
 var styleGuide = require('../ui/styles-guide/theme-chooser')
 var styles = styleGuide.chooser()
 
-var EventManager = remixLib.EventManager
+var EventManager = require('../../lib/events')
 var helper = require('../../lib/helper')
 var executionContext = require('../../execution-context')
 var modalDialog = require('../ui/modal-dialog-custom')

src/app/files/basicReadOnlyExplorer.js

@@ -1,5 +1,5 @@
 'use strict'
-var EventManager = require('remix-lib').EventManager
+var EventManager = require('../../lib/events')
 
 class BasicReadOnlyExplorer {
   constructor (type) {

src/app/files/browser-files-tree.js

@@ -1,6 +1,6 @@
 'use strict'
 
-var EventManager = require('remix-lib').EventManager
+var EventManager = require('../../lib/events')
 
 function FilesTree (name, storage) {
   var self = this

src/app/files/browser-files.js

@@ -1,6 +1,6 @@
 'use strict'
 
-var EventManager = require('remix-lib').EventManager
+var EventManager = require('../../lib/events')
 
 function Files (storage) {
   var event = new EventManager()

src/app/files/file-explorer.js

@@ -2,8 +2,7 @@ var yo = require('yo-yo')
 var Treeview = require('../ui/TreeView')
 var modalDialog = require('../ui/modaldialog')
 var modalDialogCustom = require('../ui/modal-dialog-custom')
-var remixLib = require('remix-lib')
+var EventManager = require('../../lib/events')
-var EventManager = remixLib.EventManager
 var contextMenu = require('../ui/contextMenu')
 var addTooltip = require('../ui/tooltip')
 var helper = require('../../lib/helper')

src/app/files/fileManager.js

@@ -1,9 +1,8 @@
 'use strict'
 
 var $ = require('jquery')
-var remixLib = require('remix-lib')
 var yo = require('yo-yo')
-var EventManager = remixLib.EventManager
+var EventManager = require('../../lib/events')
 var globalRegistry = require('../../global/registry')
 
 /*

src/app/files/shared-folder.js

@@ -1,5 +1,5 @@
 'use strict'
-var EventManager = require('remix-lib').EventManager
+var EventManager = require('../../lib/events')
 var pathtool = require('path')
 
 module.exports = class SharedFolder {

src/app/panels/editor-panel.js

@@ -1,6 +1,5 @@
 var yo = require('yo-yo')
-var remixLib = require('remix-lib')
+var EventManager = require('../../lib/events')
-var EventManager = remixLib.EventManager
 var $ = require('jquery')
 
 var Terminal = require('./terminal')

src/app/panels/file-panel.js

@@ -3,9 +3,8 @@ var async = require('async')
 var $ = require('jquery')
 var yo = require('yo-yo')
 var CompilerMetadata = require('../files/compiler-metadata')
-var remixLib = require('remix-lib')
+var EventManager = require('../../lib/events')
 var Gists = require('gists')
-var EventManager = remixLib.EventManager
 var FileExplorer = require('../files/file-explorer')
 var modalDialog = require('../ui/modaldialog')
 var modalDialogCustom = require('../ui/modal-dialog-custom')

src/app/panels/righthand-panel.js

@@ -1,6 +1,6 @@
 const yo = require('yo-yo')
 const csjs = require('csjs-inject')
-const remixLib = require('remix-lib')
+const EventManager = require('../../lib/events')
 
 var globalRegistry = require('../../global/registry')
 
@@ -17,7 +17,6 @@ const TestTab = require('../tabs/test-tab')
 const RunTab = require('../tabs/run-tab')
 const DraggableContent = require('../ui/draggableContent')
 
-const EventManager = remixLib.EventManager
 const styles = styleguide.chooser()
 
 module.exports = class RighthandPanel {

src/app/panels/terminal.js

@@ -5,8 +5,7 @@ var jsbeautify = require('js-beautify')
 var ethers = require('ethers')
 var type = require('component-type')
 var vm = require('vm')
-var remixLib = require('remix-lib')
+var EventManager = require('../../lib/events')
-var EventManager = remixLib.EventManager
 var Web3 = require('web3')
 var swarmgw = require('swarmgw')()
 

src/app/staticanalysis/staticAnalysisView.js

@@ -11,7 +11,7 @@ var styles = styleGuide.chooser()
 var css = require('./styles/staticAnalysisView-styles')
 var globlalRegistry = require('../../global/registry')
 
-var EventManager = remixLib.EventManager
+var EventManager = require('../../lib/events')
 
 function staticAnalysisView (localRegistry) {
   var self = this

src/app/tabs/analysis-tab.js

@@ -1,10 +1,9 @@
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
-var remixLib = require('remix-lib')
 var StaticAnalysis = require('../staticanalysis/staticAnalysisView')
 
 var globalRegistry = require('../../global/registry')
-var EventManager = remixLib.EventManager
+var EventManager = require('../../lib/events')
 
 module.exports = class AnalysisTab {
   constructor (localRegistry) {

src/app/tabs/debugger-tab.js

@@ -1,11 +1,10 @@
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
-var remixLib = require('remix-lib')
 
 var DebuggerUI = require('../debugger/debuggerUI')
 
 var globalRegistry = require('../../global/registry')
-var EventManager = remixLib.EventManager
+var EventManager = require('../../lib/events')
 var styles = require('../ui/styles-guide/theme-chooser').chooser()
 
 const css = csjs`

src/app/tabs/plugin-tab.js

@@ -1,9 +1,8 @@
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
-var remixLib = require('remix-lib')
 
 var globalRegistry = require('../../global/registry')
-var EventManager = remixLib.EventManager
+var EventManager = require('../../lib/events')
 
 module.exports = class plugintab {
   constructor (json, localRegistry) {

src/app/tabs/run-tab.js

@@ -7,7 +7,7 @@ var csjs = require('csjs-inject')
 var txExecution = remixLib.execution.txExecution
 var txFormat = remixLib.execution.txFormat
 var txHelper = remixLib.execution.txHelper
-var EventManager = remixLib.EventManager
+var EventManager = require('../../lib/events')
 var globlalRegistry = require('../../global/registry')
 var helper = require('../../lib/helper.js')
 var executionContext = require('../../execution-context')

src/app/tabs/settings-tab.js

@@ -9,7 +9,7 @@ var copyToClipboard = require('../ui/copy-to-clipboard')
 var styleGuide = require('../ui/styles-guide/theme-chooser')
 var styles = styleGuide.chooser()
 var Storage = remixLib.Storage
-var EventManager = remixLib.EventManager
+var EventManager = require('../../lib/events')
 
 module.exports = class SettingsTab {
   constructor (localRegistry) {

src/app/tabs/support-tab.js

@@ -1,11 +1,10 @@
 const yo = require('yo-yo')
 const csjs = require('csjs-inject')
-const remixLib = require('remix-lib')
 
 var globalRegistry = require('../../global/registry')
 const styles = require('../ui/styles-guide/theme-chooser').chooser()
 
-const EventManager = remixLib.EventManager
+var EventManager = require('../../lib/events')
 
 module.exports = class SupportTab {
   constructor (localRegistry) {

src/app/tabs/tabbed-menu.js

@@ -1,12 +1,11 @@
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
-var remixLib = require('remix-lib')
 
 var globalRegistry = require('../../global/registry')
 var helper = require('../../lib/helper')
 var styles = require('../ui/styles-guide/theme-chooser').chooser()
 
-var EventManager = remixLib.EventManager
+var EventManager = require('../../lib/events')
 
 module.exports = class TabbedMenu {
   constructor (localRegistry) {

src/app/ui/TreeView.js

@@ -29,8 +29,7 @@ var css = csjs`
   }
 `
 
-var remixLib = require('remix-lib')
+var EventManager = require('../../lib/events')
-var EventManager = remixLib.EventManager
 
 /**
  * TreeView

src/app/ui/card.js

@@ -2,8 +2,7 @@ var yo = require('yo-yo')
 var csjs = require('csjs-inject')
 var styleGuide = require('./styles-guide/theme-chooser')
 var styles = styleGuide.chooser()
-var remixLib = require('remix-lib')
+var EventManager = require('../../lib/events')
-var EventManager = remixLib.EventManager
 
 module.exports = class Card {
   constructor (api, events, opts) {

src/app/ui/dropdown.js

@@ -1,6 +1,6 @@
 var yo = require('yo-yo')
-var remixLib = require('remix-lib')
+var EventManager = require('../../lib/events')
-var EventManager = remixLib.EventManager
+
 // -------------- styling ----------------------
 
 var css = require('./styles/dropdown-styles')

src/app/ui/styles-guide/theme-chooser.js

@@ -1,4 +1,3 @@
-// var remixLib = require('remix-lib')
 var styleGuideLight = require('./style-guide')
 var styleGuideDark = require('./styleGuideDark')
 var Storage = require('remix-lib').Storage

src/lib/cmdInterpreterAPI.js

@@ -2,7 +2,7 @@
 var yo = require('yo-yo')
 var async = require('async')
 var remixLib = require('remix-lib')
-var EventManager = remixLib.EventManager
+var EventManager = require('../lib/events')
 
 var executionContext = require('../execution-context')
 var toolTip = require('../app/ui/tooltip')

src/lib/events.js

@@ -0,0 +1,4 @@
+var remixLib = require('remix-lib')
+var EventManager = remixLib.EventManager
+
+module.exports = EventManager

src/lib/remixd.js

@@ -1,5 +1,5 @@
 'use strict'
-var EventManager = require('remix-lib').EventManager
+var EventManager = require('../lib/events')
 var modalDialog = require('../app/ui/modaldialog')
 var yo = require('yo-yo')
 

src/recorder.js

@@ -1,5 +1,5 @@
 var remixLib = require('remix-lib')
-var EventManager = remixLib.EventManager
+var EventManager = require('./lib/events')
 var ethutil = require('ethereumjs-util')
 var executionContext = require('./execution-context')
 var format = remixLib.execution.txFormat

src/universal-dapp.js

@@ -6,7 +6,7 @@ var async = require('async')
 var ethJSUtil = require('ethereumjs-util')
 var BN = ethJSUtil.BN
 var remixLib = require('remix-lib')
-var EventManager = remixLib.EventManager
+var EventManager = require('./lib/events')
 var crypto = require('crypto')
 var TxRunner = remixLib.execution.txRunner
 var txExecution = remixLib.execution.txExecution