From ffd60c5eda6452882294aa82f9ca303a97122dc1 Mon Sep 17 00:00:00 2001
From: Boris 'billiob' Faure <billiob@gmail.com>
Date: Tue, 27 Jul 2010 22:20:45 +0200
Subject: [PATCH] web: add send_javascript method to tinyhttpserver

---
 amsn2/ui/front_ends/web/bend.py           | 12 +-----------
 amsn2/ui/front_ends/web/tinyhttpserver.py |  8 ++++++++
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/amsn2/ui/front_ends/web/bend.py b/amsn2/ui/front_ends/web/bend.py
index a3924d42..d479e6a6 100644
--- a/amsn2/ui/front_ends/web/bend.py
+++ b/amsn2/ui/front_ends/web/bend.py
@@ -61,20 +61,10 @@ def on_accept(self, s, c):
         self._workers.append(t)
         return True
 
-    def emit_event(self, event, *args, **kwargs):
-        """
-        if event in self.listeners.keys():
-            for func in self.listeners[event]:
-                try:
-                    func(*args, **kwargs)
-                except:
-                    pass
-        """
-
     def out(self, w, uri, headers, body = None):
         if len(self._q):
             print ">>> %s" % (self._q,)
-        w._200(self._q)
+        w.send_javascript(self._q)
         self._q = ""
 
     def _args2JS(self, *args):
diff --git a/amsn2/ui/front_ends/web/tinyhttpserver.py b/amsn2/ui/front_ends/web/tinyhttpserver.py
index fc355cd6..fc52f442 100644
--- a/amsn2/ui/front_ends/web/tinyhttpserver.py
+++ b/amsn2/ui/front_ends/web/tinyhttpserver.py
@@ -183,6 +183,14 @@ def send_file(self, path):
                    % (len(r), r))
         self.close()
 
+    def send_javascript(self, code):
+        if code:
+            self.write("HTTP/1.1 200 OK\r\nContent-Type: text/javascript; charset=UTF-8\r\nContent-Length: %d\r\n\r\n%s"
+                       % (len(code), code))
+        else:
+            self.write("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n")
+        self.close()
+
     def _200(self, body = None):
         if body:
             self.write("HTTP/1.1 200 OK\r\nContent-Length: %d\r\n\r\n%s"