Merge pull request #480 from virtual-world-framework/branch/blockly_s…

…ingle_stop_exec Blockly - single stop exec
virtual-world-framework · Mar 13, 2015 · 63de81b · 63de81b
2 parents 7bdbd14 + bc7c369
commit 63de81b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/support/client/lib/vwf/model/blockly.js b/support/client/lib/vwf/model/blockly.js
@@ -307,7 +307,7 @@ define( [ "module", "vwf/model", "vwf/utility",
 
         // -- callingMethod --------------------------------------------------------------------------
 
-        callingMethod: function( nodeID, methodName /* [, parameter1, parameter2, ... ] */ ) { // TODO: parameters
+        callingMethod: function( nodeID, methodName, methodParameters ) { 
             var node = this.state.nodes[ nodeID ];
 
             if ( this.debug.methods ) {
@@ -317,7 +317,7 @@ define( [ "module", "vwf/model", "vwf/utility",
             if ( nodeID == this.kernel.application() ) {
 
                 switch ( methodName ) {
-
+                        
                     case "stopAllExecution":
                         for ( var id in this.state.executingBlocks ) {
                             this.state.executingBlocks[ id ].interpreterStatus = "completed";
@@ -332,8 +332,6 @@ define( [ "module", "vwf/model", "vwf/utility",
                             this.kernel.fireEvent( id, "blocklyStarted", [ true ] );
                         }  
                         break;
-
-
                 }
             } else if ( node !== undefined ) {
                 switch ( methodName ) {
@@ -344,6 +342,17 @@ define( [ "module", "vwf/model", "vwf/utility",
                             this.kernel.setProperty( nodeID, "blockly_xml", '<xml></xml>' );
                         }
                         break;
+                    case "stopExecution":
+                        var currBlockly3Node = this.state.executingBlocks[ nodeID ];
+                        if ( currBlockly3Node ) {
+                            currBlockly3Node.interpreterStatus = "completed";
+                            this.kernel.setProperty( nodeID, 'blockly_executing', false );
+                            this.kernel.fireEvent( nodeID, "blocklyStopped", [ true ] );
+                        } else {
+                            this.logger.errorx("stopExecutionForNode", "Node with", nodeID, 
+                                "is not currently executing Blockly!");
+                        } 
+                        break;
                 }
             }
         },

diff --git a/support/client/lib/vwf/view/blockly.js b/support/client/lib/vwf/view/blockly.js
@@ -245,7 +245,7 @@ define( [ "module", "vwf/view", "jquery", "vwf/model/blockly/JS-Interpreter/acor
                                getBlockXML( previousActiveNode );
                                setBlocklyUIVisibility( previousActiveNode, false ); 
                                show = ( previousActiveNode.ID !== newActiveNodeId );
-                               this.state.blockly.node = undefined;                           
+                               this.state.blockly.node = undefined;
                             }
 
                             // If the new active node is different than the old,
@@ -269,7 +269,7 @@ define( [ "module", "vwf/view", "jquery", "vwf/model/blockly/JS-Interpreter/acor
                             if ( previousActiveNode !== undefined ) {
                                 getBlockXML( previousActiveNode );
                                 setBlocklyUIVisibility( previousActiveNode, false );
-                                this.state.blockly.node = undefined;                            
+                                this.state.blockly.node = undefined;
                             } 
                         }
                         break;

diff --git a/support/proxy/vwf.example.com/blockly/controller.vwf.yaml b/support/proxy/vwf.example.com/blockly/controller.vwf.yaml
@@ -55,6 +55,7 @@ properties:
 methods:
   getWorldXYVector:
   blocklyClear:
+  stopExecution:
 events:
   blocklyStarted:
   blocklyExecuted:

diff --git a/support/proxy/vwf.example.com/blockly/manager.vwf.yaml b/support/proxy/vwf.example.com/blockly/manager.vwf.yaml
@@ -29,4 +29,3 @@ methods:
   stopAllExecution:
 events:
   blocklyContentChanged:
-