From 8f7caff30f8c65647f38a316a04da237eee9de0d Mon Sep 17 00:00:00 2001
From: antisnatchor <antisnatchor@gmail.com>
Date: Sat, 7 Apr 2012 14:19:56 +0100
Subject: [PATCH] changed websocket.js structure with closures.

---
 core/main/client/websocket.js | 38 +++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/core/main/client/websocket.js b/core/main/client/websocket.js
index 1046080b7..6add86a93 100644
--- a/core/main/client/websocket.js
+++ b/core/main/client/websocket.js
@@ -19,24 +19,36 @@
 beef.websocket = {
 
     socket: null,
+
+    init: function(){
+        var webSocketServer=beef.net.host;
+        var webSocketPort=11989;
+        if(beef.browser.isFF()){
+            this.socket = new MozWebSocket("ws://"+webSocketServer+":"+webSocketPort+"/");
+        }else{
+            this.socket = new WebSocket("ws://"+webSocketServer+":"+webSocketPort+"/");
+        }
+    },
     /*websocket send Helo to beef server and start async communication*/
     start:function(){
-        console.log("started ws \n")
+        console.log("started ws \n");
 
-           /*server is always on ws.beefServer:6666*/
-        var webSocketServer=beef.net.host; /*beefHost*/
-        console.log(webSocketServer);
-        var webSocketPort=11989;
-          if(beef.browser.isFF()){
-              this.socket = new MozWebSocket("ws://"+webSocketServer+":"+webSocketPort+"/");
-          }else{
-               this.socket = new WebSocket("ws://"+webSocketServer+":"+webSocketPort+"/");
-          }
+        new beef.websocket.init();
            /*so the server is just up we need send helo id @todo insert browser ID where can i get them?*/
 
-    this.socket.send("Helo"+"myid00");
-    console.log("Connected and Helo");
+        this.socket.onopen = function(){
+            console.log("Socket has been opened!");
+            this.send("Helo"+"myid00");
+            console.log("Connected and Helo");
+        }
+
+    },
+
+    send:function(data){
+       this.socket.send(data);
+       console.log("Sent [" + data + "]");
     }
 
+};
 
-}   /*end websocket*/
\ No newline at end of file
+beef.regCmp('beef.websocket');
\ No newline at end of file