From bced4811e4da870aead88613fae02cf1ea279046 Mon Sep 17 00:00:00 2001
From: acidhax <mail@matbee.com>
Date: Fri, 15 Jun 2012 16:54:51 -0400
Subject: [PATCH] Client/Server event binding fix.

---
 client/test.js            |  7 ++++++-
 client/test.template.html |  2 +-
 server.js                 | 23 ++++-------------------
 server/appserver.js       | 31 ++++++++++++++++---------------
 4 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/client/test.js b/client/test.js
index e0e55e7..d4d0e0c 100644
--- a/client/test.js
+++ b/client/test.js
@@ -1,4 +1,9 @@
 var i = 0;
 (function() {
-	console.log(i);
+	window.server.Execute("Hello", ["one","two","three"], function (fail, one, two, three) {
+		console.log(one);
+		console.log(two);
+		console.log(three);
+		i++;
+	});
 })();
\ No newline at end of file
diff --git a/client/test.template.html b/client/test.template.html
index 4ceec2f..039983f 100644
--- a/client/test.template.html
+++ b/client/test.template.html
@@ -1,5 +1,5 @@
 <script type="text/html" id="TestTemplate">
 	<div>
-		<span>This is a sss.</span>
+		<span>This is a test.</span>
 	</div>
 </script>
\ No newline at end of file
diff --git a/server.js b/server.js
index af207fb..0cda45e 100644
--- a/server.js
+++ b/server.js
@@ -15,9 +15,9 @@ app.use(express.session({
     key: 'express.sid'
 }));
 
-io.configure('development', function () {
-    io.set('log level', 2);
-})
+// io.configure('development', function () {
+//     io.set('log level', 2);
+// })
 
 app.get('/*', function (req, res) {
     req.session.visitCount = req.session.visitCount ? req.session.visitCount + 1 : 1;
@@ -50,6 +50,7 @@ appServer.Hook('change', '#inputElement', function (event) {
     this.get(
         // Function executed on the client...
         function () {
+            // alert("wtf");
             return $('#inputElement').val();
         },
         // Server-side callback.
@@ -58,18 +59,6 @@ appServer.Hook('change', '#inputElement', function (event) {
         }
     );
 });
-appServer.WatchFiles(__dirname + '/client/index.html', function() {
-    // this.get(
-    //     function() {
-
-    //     },
-    //     function () {
-
-    //     }
-    // );
-    // this(function(){}, parameters, parameters, parameters, parameters...);
-    
-});
 
 appServer.WatchFiles(__dirname + '/client/test.css', function() {
 
@@ -79,10 +68,6 @@ appServer.WatchFiles(__dirname + '/client/test.js', function() {
     
 });
 
-appServer.WatchFiles(__dirname + '/client/clientserver.js', function() {
-
-});
-
 appServer.WatchFiles(__dirname + '/client/test.template.html', function() {
 
 });
\ No newline at end of file
diff --git a/server/appserver.js b/server/appserver.js
index 5c8d7a8..473c5d8 100644
--- a/server/appserver.js
+++ b/server/appserver.js
@@ -13,24 +13,25 @@ var Server = function (io) {
 
     self.__io = io;
     self.__io.sockets.on('connection', function (socket) {
-      socket.on('Server.Methods', function (data) {
-        if (self.serverMethodQueue[data.callbackId]) {
-            socket.emit(data.callbackId, {duplicate: true});
+        for (var k in _hooks) {
+            var serverCallbackId = __randomString();
+            socket.emit('hook', {event: _hooks[k].event, element: _hooks[k].element, callbackId: serverCallbackId});
+            
+            socket.on(serverCallbackId, function() {
+                var hook = new methodClass(socket);
+                _hooks[k].callback.apply(hook, [].slice.call(arguments));
+            });
         }
-        else {
-            self.serverMethodQueue[data.callbackId] = {socket: socket, method: data.method, parameters: data.parameters};
-            self.Execute(data.method, data.parameters, data.callbackId);
-            for (var k in _hooks) {
-                var serverCallbackId = __randomString();
-                socket.emit('hook', {event: _hooks[k].event, element: _hooks[k].element, callbackId: serverCallbackId});
+        socket.on('Server.Methods', function (data) {
+            if (self.serverMethodQueue[data.callbackId]) {
+                socket.emit(data.callbackId, {duplicate: true});
+            }
+            else {
+                self.serverMethodQueue[data.callbackId] = {socket: socket, method: data.method, parameters: data.parameters};
+                self.Execute(data.method, data.parameters, data.callbackId);
                 
-                socket.on(serverCallbackId, function() {
-                    var hook = new methodClass(socket);
-                    _hooks[k].callback.apply(hook, [].slice.call(arguments));
-                });
             }
-        }
-      });
+        });
     });
 
     self.serverMethodQueue = [];