formatting

src/channel/null-presence-channel.ts

@@ -20,16 +20,16 @@ export class NullPresenceChannel extends NullChannel implements PresenceChannel
     }
 
     /**
-     * Listen for someone leaving the channel.
+     * Send a whisper event to other clients in the channel.
      */
-    leaving(callback: Function): NullPresenceChannel {
+    whisper(eventName: string, data: any): NullPresenceChannel {
         return this;
     }
 
     /**
-     * Trigger client event on the channel.
+     * Listen for someone leaving the channel.
      */
-    whisper(eventName: string, data: any): NullPresenceChannel {
+    leaving(callback: Function): NullPresenceChannel {
         return this;
     }
 }

src/channel/null-private-channel.ts

@@ -5,7 +5,7 @@ import { NullChannel } from './null-channel';
  */
 export class NullPrivateChannel extends NullChannel {
     /**
-     * Trigger client event on the channel.
+     * Send a whisper event to other clients in the channel.
      */
     whisper(eventName: string, data: any): NullPrivateChannel {
         return this;

src/channel/presence-channel.ts

@@ -15,12 +15,12 @@ export interface PresenceChannel extends Channel {
     joining(callback: Function): PresenceChannel;
 
     /**
-     * Listen for someone leaving the channel.
+     * Send a whisper event to other clients in the channel.
      */
-    leaving(callback: Function): PresenceChannel;
+    whisper(eventName: string, data: any): PresenceChannel;
 
     /**
-     * Fire a whisper event to clients present in the channel.
+     * Listen for someone leaving the channel.
      */
-    whisper(eventName: string, data: any): PresenceChannel;
+    leaving(callback: Function): PresenceChannel;
 }

src/channel/pusher-encrypted-private-channel.ts

@@ -5,7 +5,7 @@ import { PusherChannel } from './pusher-channel';
  */
 export class PusherEncryptedPrivateChannel extends PusherChannel {
     /**
-     * Trigger client event on the channel.
+     * Send a whisper event to other clients in the channel.
      */
     whisper(eventName: string, data: any): PusherEncryptedPrivateChannel {
         this.pusher.channels.channels[this.name].trigger(`client-${eventName}`, data);

src/channel/pusher-presence-channel.ts

@@ -28,21 +28,21 @@ export class PusherPresenceChannel extends PusherChannel implements PresenceChan
     }
 
     /**
-     * Listen for someone leaving the channel.
+     * Send a whisper event to other clients in the channel.
      */
-    leaving(callback: Function): PusherPresenceChannel {
-        this.on('pusher:member_removed', (member) => {
-            callback(member.info);
-        });
+    whisper(eventName: string, data: any): PusherPresenceChannel {
+        this.pusher.channels.channels[this.name].trigger(`client-${eventName}`, data);
 
         return this;
     }
 
     /**
-     * Trigger client event on the channel.
+     * Listen for someone leaving the channel.
      */
-    whisper(eventName: string, data: any): PusherPresenceChannel {
-        this.pusher.channels.channels[this.name].trigger(`client-${eventName}`, data);
+    leaving(callback: Function): PusherPresenceChannel {
+        this.on('pusher:member_removed', (member) => {
+            callback(member.info);
+        });
 
         return this;
     }

src/channel/pusher-private-channel.ts

@@ -5,7 +5,7 @@ import { PusherChannel } from './pusher-channel';
  */
 export class PusherPrivateChannel extends PusherChannel {
     /**
-     * Trigger client event on the channel.
+     * Send a whisper event to other clients in the channel.
      */
     whisper(eventName: string, data: any): PusherPrivateChannel {
         this.pusher.channels.channels[this.name].trigger(`client-${eventName}`, data);

src/channel/socketio-presence-channel.ts

@@ -26,16 +26,7 @@ export class SocketIoPresenceChannel extends SocketIoPrivateChannel implements P
     }
 
     /**
-     * Listen for someone leaving the channel.
-     */
-    leaving(callback: Function): SocketIoPresenceChannel {
-        this.on('presence:leaving', (member) => callback(member.user_info));
-
-        return this;
-    }
-
-    /**
-     * Trigger client event on the channel.
+     * Send a whisper event to other clients in the channel.
      */
     whisper(eventName: string, data: any): SocketIoPresenceChannel {
         this.socket.emit('client event', {
@@ -46,4 +37,13 @@ export class SocketIoPresenceChannel extends SocketIoPrivateChannel implements P
 
         return this;
     }
+
+    /**
+     * Listen for someone leaving the channel.
+     */
+    leaving(callback: Function): SocketIoPresenceChannel {
+        this.on('presence:leaving', (member) => callback(member.user_info));
+
+        return this;
+    }
 }

src/channel/socketio-private-channel.ts

@@ -5,7 +5,7 @@ import { SocketIoChannel } from './socketio-channel';
  */
 export class SocketIoPrivateChannel extends SocketIoChannel {
     /**
-     * Trigger client event on the channel.
+     * Send a whisper event to other clients in the channel.
      */
     whisper(eventName: string, data: any): SocketIoChannel {
         this.socket.emit('client event', {