fixed custom decorators, added NAME variable to generated functions because jsfunc.name is a readonly variable.

hartsantler · hartsantler · commit 9599fec285fe · 2013-10-21T23:52:56.000-07:00
diff --git a/bindings/blockly.py b/bindings/blockly.py
@@ -69,6 +69,10 @@ def setup(self, name, title=None, color=None):
 		self.external_function = None
 		self.on_click_callback = None
 
+	def callback(self, jsfunc):  ## decorator
+		self.set_external_function( jsfunc.NAME )
+		return jsfunc
+
 	def set_on_click_callback(self, callback):
 		self.on_click_callback = callback
 
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -1047,6 +1047,10 @@ def visit_FunctionDef(self, node):
             self._function_return_types[ node.name ] = self._return_type
 
         writer.pull()
+        ## note, in javascript function.name is a non-standard readonly attribute,
+        ## the compiler creates anonymous functions with name set to an empty string.
+        writer.write('%s.NAME = "%s"' %(node.name,node.name))
+
         if self._with_js and with_js_decorators:
             ## these with-js functions are assigned to a some objects prototype,
             ## here we assume that they depend on the special "this" variable,
@@ -1063,7 +1067,7 @@ def visit_FunctionDef(self, node):
         # apply decorators
         for decorator in decorators:
             assert not self._with_js
-            writer.write('%s = %s(create_array(%s))' % (node.name, self.visit(decorator), node.name))
+            writer.write('%s = get_attribute(%s,"__call__")( [%s] )' % (node.name, self.visit(decorator), node.name))
 
     def visit_Continue(self, node):
         if self._with_js:
diff --git a/tests/blockly_custom_blocks.html b/tests/blockly_custom_blocks.html
@@ -135,9 +135,10 @@
 from blockly import *
 
 myblock = StatementBlock('myblock', title='My Block', stack_input=True)
-myblock.set_external_function('testextern')
+#myblock.set_external_function('testextern')
 
-def testextern():
+@myblock.callback
+def my_extern_func():
 	print 'hello extern func'
 
 def show_code():
