Skip to content

Commit

Permalink
platform: Use node.js compatible bergie/emitter
Browse files Browse the repository at this point in the history
  • Loading branch information
jonnor committed Jun 9, 2016
1 parent 697b141 commit ddfe5b7
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"noflo/noflo": "*",
"microflo/microflo": "*",
"microflo/microflo-emscripten": "*",
"component/emitter": "*"
"bergie/emitter": "*"
},
"remotes": [
"https://raw.githubusercontent.com"
Expand Down
5 changes: 1 addition & 4 deletions helpers/platform.coffee
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@

isBrowser = () ->
return !(typeof(process) != 'undefined' && process.execPath && process.execPath.indexOf('node') != -1)
try
EventEmitter = require 'emitter'
catch e
EventEmitter = require('events').EventEmitter

EventEmitter = require('events').EventEmitter

if not isBrowser()
# Simple compatibility layer between node.js WebSocket client and native browser APIs
Expand Down
2 changes: 1 addition & 1 deletion spec/utils.coffee
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
isBrowser = () ->
return !(typeof(process) != 'undefined' && process.execPath && process.execPath.indexOf('node') != -1)
EventEmitter = if isBrowser() then require('emitter') else require('events').EventEmitter
EventEmitter = require('events').EventEmitter

WebSocketServer = require('websocket').server
http = require 'http'
Expand Down
3 changes: 1 addition & 2 deletions spec/webrtc.coffee
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
noflo = require 'noflo'

EventEmitter = require('events').EventEmitter
unless noflo.isBrowser()
chai = require 'chai' unless chai
# WebRtcRuntime = require '../src/runtimes/webrtc'
Base = require '../src/base'
utils = require './utils'
connection = require '../helpers/connection'
EventEmitter = require('events').EventEmitter
else
WebRtcRuntime = require 'fbp-protocol-client/src/webrtc'
Base = require 'fbp-protocol-client/src/base'
connection = require 'fbp-protocol-client/helpers/connection'
EventEmitter = require('emitter')

describeIfBrowser = if noflo.isBrowser() then describe else describe.skip

Expand Down

0 comments on commit ddfe5b7

Please sign in to comment.