GoogleBlockly: blocks can now use keyword default numbers to pre-populate the user blocks.

hartsantler · hartsantler · commit 2bf81e887dfa · 2013-10-22T20:13:21.000-07:00
diff --git a/bindings/blockly.py b/bindings/blockly.py
@@ -47,7 +47,14 @@ def initialize_blockly( blockly_id='blocklyDiv', toolbox_id='toolbox', on_change
 				v.setAttribute('name', input['name'])
 				e.appendChild(v)
 				nb = document.createElement('block')
-				nb.setAttribute('type', 'logic_null')
+				if input['default_value'] is not None:
+					nb.setAttribute('type', 'math_number')  ## TODO support other types
+					t = document.createElement('title')
+					t.setAttribute('name', 'NUM')
+					t.appendChild( document.createTextNode(input['default_value']) )
+					nb.appendChild(t)
+				else:
+					nb.setAttribute('type', 'logic_null')
 				v.appendChild(nb)
 				i += 1
 
@@ -116,15 +123,23 @@ def setup(self, block_name=None, title=None, color=None, category=None):
 	def javascript_callback(self, jsfunc):
 		print '@callback', jsfunc
 		self.set_external_function( jsfunc.NAME, javascript=True )
-		with javascript: arr = jsfunc.args_signature
-		for i in range(arr.length): self.add_input_value( arr[i] )
+		with javascript:
+			arr = jsfunc.args_signature
+			defs = jsfunc.kwargs_signature
+		for i in range(arr.length):
+			name = arr[i]
+			self.add_input_value( name, default_value=defs[name] )
 		return jsfunc
 
 	def callback(self, jsfunc):  ## decorator
 		print '@callback', jsfunc
 		self.set_external_function( jsfunc.NAME )
-		with javascript: arr = jsfunc.args_signature
-		for i in range(arr.length): self.add_input_value( arr[i] )
+		with javascript:
+			arr = jsfunc.args_signature
+			defs = jsfunc.kwargs_signature
+		for i in range(arr.length):
+			name = arr[i]
+			self.add_input_value( name, default_value=defs[name] )
 		return jsfunc
 
 	def set_on_click_callback(self, callback):
@@ -154,15 +169,15 @@ def make_statement(self, stack_input=None, stack_output=None):
 		self.stack_output = stack_output
 		self.is_statement = True
 
-	def add_input_value(self, name=None, type=None, title=None):
+	def add_input_value(self, name=None, type=None, title=None, default_value=None):
 		if name is None: raise TypeError
 		elif type == 'Number': pass
 		elif type == 'String': pass
 		elif type == 'Array': pass
 		#else: raise TypeError
 		if title is None: title = name
 		self.input_values.append(
-			{'name':name, 'type':type, 'title':title}
+			{'name':name, 'type':type, 'title':title, 'default_value':default_value}
 		)
 
 	def add_input_statement(self, name=None, title=None, callback=None):
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -1089,7 +1089,10 @@ def visit_FunctionDef(self, node):
         ## 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))
+
         writer.write( '%s.args_signature = [%s]' %(node.name, ','.join(['"%s"'%n.id for n in node.args.args])) )
+        defaults = ['%s:%s'%(self.visit(x[0]), self.visit(x[1])) for x in zip(node.args.args[-len(node.args.defaults):], node.args.defaults) ]
+        writer.write( '%s.kwargs_signature = {%s}' %(node.name, ','.join(defaults)) )
 
         if self._with_js and with_js_decorators:
             for dec in with_js_decorators:
diff --git a/tests/threejs_meets_blockly_and_ace.html b/tests/threejs_meets_blockly_and_ace.html
@@ -239,7 +239,7 @@
 
 block = StatementBlock(block_name='x', stack_input=True, category='Transform')
 @block.javascript_callback
-def vector(x,y,z):
+def vector(x=0,y=0,z=0):
 	print 'js-callback VECTOR', x,y,z
 	with javascript:
 		return [x,y,z]
