[pypy-svn] r29401 - in pypy/dist/pypy/translator/js: . demo/jsdemo modules tools

[fijal at codespeak.net]

Author: fijal
Date: Tue Jun 27 13:22:45 2006
New Revision: 29401

Modified:
   pypy/dist/pypy/translator/js/commproxy.py
   pypy/dist/pypy/translator/js/demo/jsdemo/bnb.py
   pypy/dist/pypy/translator/js/modules/dom.py
   pypy/dist/pypy/translator/js/tools/start_bnb.py
Log:
Fixed stupid trick.


Modified: pypy/dist/pypy/translator/js/commproxy.py
==============================================================================
--- pypy/dist/pypy/translator/js/commproxy.py	(original)
+++ pypy/dist/pypy/translator/js/commproxy.py	Tue Jun 27 13:22:45 2006
@@ -16,6 +16,7 @@
             str += i + "=" + data[i].toString() + ";";
         }
     }
+    logDebug('%(call)s'+str);
     x.open("GET", '%(call)s' + str, true);
     //x.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
     x.onreadystatechange = function () { %(real_callback)s(callback) };
@@ -45,10 +46,11 @@
     data = %(data)s;
     str = "?"
     for(i in data) {
-        if (data[i]) {
+        //if (data[i]) {
             str += i + "=" + data[i].toString() + ";";
-        }
+        //}
     }
+    //logDebug('%(call)s'+str);
     loadJSONDoc('%(call)s' + str).addCallback(callback);
 }
 """

Modified: pypy/dist/pypy/translator/js/demo/jsdemo/bnb.py
==============================================================================
--- pypy/dist/pypy/translator/js/demo/jsdemo/bnb.py	(original)
+++ pypy/dist/pypy/translator/js/demo/jsdemo/bnb.py	Tue Jun 27 13:22:45 2006
@@ -87,12 +87,12 @@
     
     _methods = {
         'get_message'  : MethodDesc( [('callback', (lambda : None))] , {'aa':[{'aa':'bb'}]}),
-        'add_player'   : MethodDesc( [('player_id', '0'), ('callback', (lambda : None))] , {'aa':[{'aa':'bb'}]}),
-        'remove_player': MethodDesc( [('player_id', '0'), ('callback', (lambda : None))] , {'aa':[{'aa':'bb'}]}),
-        'key'          : MethodDesc( [('player_id', '0'), ('keynum', '0'), ('callback', (lambda : None))] , {'aa':[{'aa':'bb'}]}),
+        'add_player'   : MethodDesc( [('player_id', 0), ('callback', (lambda : None))] , {'aa':[{'aa':'bb'}]}),
+        'remove_player': MethodDesc( [('player_id', 0), ('callback', (lambda : None))] , {'aa':[{'aa':'bb'}]}),
+        'key'          : MethodDesc( [('player_id', 0), ('keynum', '0'), ('callback', (lambda : None))] , {'aa':[{'aa':'bb'}]}),
         
-        'add_player0'   : MethodDesc( [('callback', (lambda : None))] , {'aa':[{'aa':'bb'}]}),
-        'remove_player0': MethodDesc( [('callback', (lambda : None))] , {'aa':[{'aa':'bb'}]}),
+#        'add_player0'   : MethodDesc( [('callback', (lambda : None))] , {'aa':[{'aa':'bb'}]}),
+#        'remove_player0': MethodDesc( [('callback', (lambda : None))] , {'aa':[{'aa':'bb'}]}),
         'key0'         : MethodDesc( [('callback', (lambda : None))] , {'aa':[{'aa':'bb'}]}),
         'key1'         : MethodDesc( [('callback', (lambda : None))] , {'aa':[{'aa':'bb'}]}),
         'key2'         : MethodDesc( [('callback', (lambda : None))] , {'aa':[{'aa':'bb'}]}),
@@ -144,23 +144,18 @@
 
     @turbogears.expose(format='json')
     def add_player(self, player_id):
+        print "Adding player"
+        print player_id
         self.sessionSocket().send(message(CMSG_ADD_PLAYER, int(player_id)))
         return self.get_message()
 
     @turbogears.expose(format='json')
-    def add_player0(self):
-        return self.add_player(0)
-
-    @turbogears.expose(format='json')
     def remove_player(self, player_id):
+        print player_id
         self.sessionSocket().send(message(CMSG_REMOVE_PLAYER, int(player_id)))
         return self.get_message()
 
     @turbogears.expose(format='json')
-    def remove_player0(self):
-        return self.remove_player(0)
-
-    @turbogears.expose(format='json')
     def key(self, player_id, keynum):
         self.sessionSocket().send(message(CMSG_KEY, int(player_id), int(keynum)))
         return self.get_message()

Modified: pypy/dist/pypy/translator/js/modules/dom.py
==============================================================================
--- pypy/dist/pypy/translator/js/modules/dom.py	(original)
+++ pypy/dist/pypy/translator/js/modules/dom.py	Tue Jun 27 13:22:45 2006
@@ -49,6 +49,10 @@
         self.style = None
         self.subnodes = {}
         self.parent = parent
+        if one():
+            self.value = "blah"
+        else:
+            self.value = "sth"
     
     def getElementById(self, id):
         try:
@@ -67,14 +71,20 @@
             self.id = style_str
         elif name == 'src':
             self.src = style_str
+        elif name == 'value':
+            self.value = style_str
     
     def appendChild(self, elem):
         self.subnodes[elem.id] = elem
 
+class Form(Node):
+    pass
+
 class Document(Node):
     def __init__(self):
         Node.__init__(self)
         self.body = Node()
+        self.forms = [Form(), Form()]
     
 
 def get_document():

Modified: pypy/dist/pypy/translator/js/tools/start_bnb.py
==============================================================================
--- pypy/dist/pypy/translator/js/tools/start_bnb.py	(original)
+++ pypy/dist/pypy/translator/js/tools/start_bnb.py	Tue Jun 27 13:22:45 2006
@@ -137,11 +137,12 @@
     #c = int(key.keyCode)
     c = key.keyCode
     if c == '65': #ord('A'):
-        BnbRootInstance.add_player0(bnb_dispatcher)
-        #BnbRootInstance.add_player(0, bnb_dispatcher)
+        #BnbRootInstance.add_player0(bnb_dispatcher)
+        log("adding player")
+        BnbRootInstance.add_player(0, bnb_dispatcher)
     elif c == '82': #ord('R'):
-        BnbRootInstance.remove_player0(bnb_dispatcher)
-        #BnbRootInstance.remove_player(0, bnb_dispatcher)
+        #BnbRootInstance.remove_player0(bnb_dispatcher)
+        BnbRootInstance.remove_player(0, bnb_dispatcher)
     elif c == '68': #ord('D'):  #right
         BnbRootInstance.key0(bnb_dispatcher)
         log('start right')