add args to function

orun/examples/cp.py

@@ -15,7 +15,7 @@ class MyApplication(cp.ExtApplication):
         wnd = Ext.create('widget.window', {'title': 'My Window', 'width': 300, 'height': 250,
             'items': [{'xtype': 'button', 'text': 'Click Here', 'handler': button_click}],
             'buttons': [
-                {'text': 'OK', 'handler': js.FuncWithParams(ok_click, {'arg1': 1, 'arg2': 'val2', 'arg3': js.cli.this.id})},
+                {'text': 'OK', 'handler': js.FuncWithParams(ok_click, params = {'arg1': 1, 'arg2': 'val2', 'arg3': js.cli.this.id})},
                 {'text': 'Close', 'handler': js.function('this.up(\'window\').close()')}]})
         wnd.show()
         wnd.setHeight(200)

orun/extjs/base.py

@@ -1,4 +1,3 @@
-
 from . import js
 
 

orun/js.py

@@ -1,4 +1,3 @@
-
 import types
 import json
 
@@ -14,9 +13,10 @@ class STUB:
 stub_class = STUB()
 
 class FuncWithParams:
-    def __init__(self, func, params):
+    def __init__(self, func, args = [], params = {}):
         self.func = func
         self.params = params
+        self.args = args
 
 def list2extjs(l):
     return '[ %s ]' % ', '.join([encode(v) for v in l])
@@ -43,7 +43,7 @@ def encode(o):
     elif isinstance(o, types.MethodType):
         return str(function(js_ajax(o)))
     elif isinstance(o, FuncWithParams):
-        return str(function(js_ajax(o.func, o.params)))
+        return str(function(js_ajax(o.func, o.params), o.args))
     elif isinstance(o, JsFunction):
         return str(o)
     elif isinstance(o, dict):
@@ -56,13 +56,14 @@ def encode(o):
 class JsBlock:
     def __init__(self, *args, **kwargs):
         self.code = args[0]
+        self.args = args[1] if len(args) > 1 else []
         
     def __str__(self):
         return self.code
     
 class JsFunction(JsBlock):
     def __str__(self):
-        return 'function () { %s }' % self.code
+        return 'function (%s) { %s }' % (','.join(self.args), self.code)
 
 block = JsBlock
 func = function = JsFunction