consolidate channel code

wearefractal · Jul 25, 2012 · 503a2b4 · 503a2b4
1 parent d44679b
commit 503a2b4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 48 deletions.
diff --git a/client/Channel.coffee b/client/Channel.coffee
diff --git a/client/Pulsar.coffee b/client/Pulsar.coffee
@@ -1,6 +1,6 @@
 isBrowser = typeof window isnt 'undefined'
 eio = require (if isBrowser then 'node_modules/engine.io-client/lib/engine.io-client' else 'engine.io-client')
-Channel = require './Channel'
+Channel = require '../lib/Channel'
 
 class Pulsar extends eio.EventEmitter
   constructor: (@options={}) ->

diff --git a/lib/Channel.coffee b/lib/Channel.coffee
@@ -1,19 +1,30 @@
 class Channel
-  constructor: (@name) ->
+  constructor: (@name, @socket) ->
     @listeners = []
     @events = {}
+    if @socket?
+      @socket.send JSON.stringify
+        channel: @name
+        action: 'join'
 
   realEmit: (event, args...) =>
     return false unless @events[event]
     l args... for l in @events[event]
     return true
 
   emit: (event, args...) =>
-    for socket in @listeners
-      socket.send JSON.stringify
+    return false unless @socket? or @listeners?
+    if @socket?
+      @socket.send JSON.stringify
         channel: @name
         event: event
         args: args
+    else
+      for socket in @listeners
+        socket.send JSON.stringify
+          channel: @name
+          event: event
+          args: args
     return true
 
   addListener: (event, listener) =>