wip #35

Author: previ

conversation.py

@@ -55,9 +55,11 @@ def get_action(self, query, locale):
 
     data = json.load(response)
     retval = {}
-    retval["action"] = data["result"]["action"]
-    retval["parameters"] = data["result"]["parameters"]
-    retval["contexts"] = data["result"]["contexts"]
-    retval["response"] = data["result"]["fulfillment"]["speech"]
+    retval["action"] = data.get("result", {}).get("action")
+    retval["parameters"] = data.get("result", {}).get("parameters", {})
+    retval["contexts"] = data.get("result", {}).get("contexts", [])
+    retval["response"] = data.get("result", {}).get("fulfillment", {}).get("speech")
 
+    retval["action"] = retval["action"].encode("utf-8") if retval["action"] else None
+    retval["response"] = retval["response"].encode("utf-8") if retval["response"] else None
     return retval

static/js/blockly/blockly_compressed.js

@@ -5,7 +5,14 @@ $(document).on( "pageshow", '#page-program', function( event, ui ) {
         inject_once=false;
         Blockly.inject(document.getElementById('blocklyDiv'),
             {path: '../../', toolbox: document.getElementById('toolbox'),
-             scrollbars:CODERBOT_PROG_SCROLLBARS, maxBlocks:CODERBOT_PROG_MAXBLOCKS});
+             scrollbars:CODERBOT_PROG_SCROLLBARS, maxBlocks:CODERBOT_PROG_MAXBLOCKS,
+             zoom:
+              {controls: true,
+               wheel: true,
+               startScale: 1.0, //you can change this accorting to your needs.
+               maxScale: 1.5,
+               minScale: 0.2
+              }});
       }
 
       $('[href="#page-program"]').addClass( "ui-btn-active" );

static/js/blockly/blocks_compressed.js

@@ -4,6 +4,7 @@
 var CODERBOT_MOV_TR_DEF_SPEED={{config.move_tr_speed}};
 var CODERBOT_MOV_TR_DEF_ELAPSE={{config.move_tr_elapse}};
 var CODERBOT_PROG_MOVE_MOTION="{{config.prog_move_motion}}"=="yes";
+var CODERBOT_PROG_MOVE_MPU="{{config.prog_move_mpu}}"=="yes";
 var CODERBOT_STREAM_URL="http://{{host}}:{{stream_port}}/stream"
 var CODERBOT_PROG_LEVEL="{{config.prog_level}}";
 var CODERBOT_PROG_SCROLLBARS="{{config.prog_scrollbars}}"=="true";