From 92e92cdeaff228b3fce21cc88934df7fb3596bdf Mon Sep 17 00:00:00 2001 From: Neil Fraser Date: Fri, 14 Oct 2016 01:56:55 -0700 Subject: [PATCH] Fix race condition when loading. --- demos/blockfactory/block_exporter_view.js | 15 ---- demos/blockfactory/index.html | 93 ++++++++++++----------- 2 files changed, 47 insertions(+), 61 deletions(-) diff --git a/demos/blockfactory/block_exporter_view.js b/demos/blockfactory/block_exporter_view.js index 011fc2bf5..198598c14 100644 --- a/demos/blockfactory/block_exporter_view.js +++ b/demos/blockfactory/block_exporter_view.js @@ -53,21 +53,6 @@ BlockExporterView.prototype.setBlockOptions = function(blockOptions) { this.blockOptions = blockOptions; }; -/** - * Updates the helper text. - * @param {string} newText New helper text. - * @param {boolean} opt_append True if appending to helper Text, false if - * replacing. - */ -BlockExporterView.prototype.updateHelperText = function(newText, opt_append) { - if (opt_append) { - document.getElementById('helperText').textContent = - document.getElementById('helperText').textContent + newText; - } else { - document.getElementById('helperText').textContent = newText; - } -}; - /** * Updates the helper text to show list of currently selected blocks. */ diff --git a/demos/blockfactory/index.html b/demos/blockfactory/index.html index 881cbc333..6725fc906 100644 --- a/demos/blockfactory/index.html +++ b/demos/blockfactory/index.html @@ -6,19 +6,18 @@ Blockly Demo: Blockly Factory - + - + + + + - - - - @@ -29,6 +28,7 @@ + @@ -42,33 +42,34 @@ -

Blockly > - Demos > Blockly Developer Tools - -

-
-
Block Factory
-
Block Exporter
-
Workspace Factory
+

Blockly > + Demos > Blockly Developer Tools + +

+
+
Block Factory
+
Block Exporter
+
Workspace Factory

-

First, select blocks from your block library by clicking on them. Then, use the Export Settings form to download starter code for selected blocks. +

+ First, select blocks from your block library by clicking on them. Then, use the Export Settings form to download starter code for selected blocks.


-

Block Selector

+

Block Selector

All Stored in Block Library All Used in Workspace Factory
-
@@ -96,7 +97,7 @@
-
+
Generator Stub(s)
Language: @@ -112,21 +113,21 @@

-
+
- +

Export Preview

-
-

Block Definitions:

- 

-        

-        

-          
Generator Stubs:

-          

-        

+      

+        
Block Definitions:

+        

+      

+      

+        
Generator Stubs:

+        

+      

     

   

 
@@ -166,7 +167,6 @@
         
 
         
-
       

     
 
@@ -176,8 +176,10 @@
         
Drag blocks into the workspace to configure the toolbox in your custom workspace.

       
       
-        
-        
+        
+          
+          
+        
ToolboxWorkspace
ToolboxWorkspace

       

       

         

@@ -189,13 +191,13 @@
         
 

 
         

-        
-        

-          New Category
-          Standard Category
-          Separator
-          Standard Toolbox
-        

+          
+          

+            New Category
+            Standard Category
+            Separator
+            Standard Toolbox
+          

         

 
         
@@ -204,12 +206,12 @@
         
 
         

-        
-        

-          Name
-          Color
-        

         

+          
+          

+            Name
+            Color
+          

         

 
       
@@ -259,7 +261,6 @@
         
       
 
-