From 4871ff9fda480a091019c2d6bc7cf1dcd3ebb1ac Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 11 Nov 2016 15:50:53 -0800
Subject: [PATCH] Start getting helpurl and tooltip in

---
 demos/blockfactory/blocks.js        |  6 ++++++
 demos/blockfactory/factory.js       |  6 ++++++
 demos/blockfactory/factory_utils.js | 17 +++++++++++++++--
 demos/code/index.html               |  2 +-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/demos/blockfactory/blocks.js b/demos/blockfactory/blocks.js
index d4ea11652..6dcd00617 100644
--- a/demos/blockfactory/blocks.js
+++ b/demos/blockfactory/blocks.js
@@ -52,6 +52,12 @@ Blockly.Blocks['factory_base'] = {
         });
     this.appendDummyInput()
         .appendField(dropdown, 'CONNECTIONS');
+    this.appendValueInput('TOOLTIP')
+        .setCheck('String')
+        .appendField('tooltip');
+    this.appendValueInput('HELPURL')
+        .setCheck('String')
+        .appendField('help url');
     this.appendValueInput('COLOUR')
         .setCheck('Colour')
         .appendField('colour');
diff --git a/demos/blockfactory/factory.js b/demos/blockfactory/factory.js
index e565d566f..974cd8a7e 100644
--- a/demos/blockfactory/factory.js
+++ b/demos/blockfactory/factory.js
@@ -66,6 +66,12 @@ BlockFactory.oldDir = null;
  */
 BlockFactory.STARTER_BLOCK_XML_TEXT = '<xml><block type="factory_base" ' +
     'deletable="false" movable="false">' +
+    '<value name="TOOLTIP">' +
+    '<block type="text" deletable="false" movable="false">' +
+    '<field name="TEXT"></field></block></value>' +
+    '<value name="HELPURL">' +
+    '<block type="text" deletable="false" movable="false">' +
+    '<field name="TEXT"></field></block></value>' +
     '<value name="COLOUR">' +
     '<block type="colour_hue">' +
     '<mutation colour="#5b67a5"></mutation>' +
diff --git a/demos/blockfactory/factory_utils.js b/demos/blockfactory/factory_utils.js
index bdfdeee56..5c6f7137e 100644
--- a/demos/blockfactory/factory_utils.js
+++ b/demos/blockfactory/factory_utils.js
@@ -250,8 +250,20 @@ FactoryUtils.formatJson_ = function(blockType, rootBlock) {
     var hue = parseInt(colourBlock.getFieldValue('HUE'), 10);
     JS.colour = hue;
   }
-  JS.tooltip = '';
-  JS.helpUrl = 'http://www.example.com/';
+  // Tooltip.
+  var tooltipBlock = rootBlock.getInputTargetBlock('TOOLTIP');
+  if (tooltipBlock && !tooltipBlock.disabled) {
+    JS.tooltip = tooltipBlock.getFieldValue('TEXT');
+  } else {
+    JS.tooltip = '';
+  }
+  // Help URL.
+  var helpUrlBlock = rootBlock.getInputTargetBlock('HELPURL');
+  if (helpUrlBlock && !helpUrlBlock.disabled) {
+    JS.helpUrl = helpUrlBlock.getFieldValue('TEXT');
+  } else {
+    JS.helpUrl = 'http://www.example.com/';
+  }
   return JSON.stringify(JS, null, '  ');
 };
 
@@ -334,6 +346,7 @@ FactoryUtils.formatJavaScript_ = function(blockType, rootBlock, workspace) {
       code.push('    this.setColour(' + hue + ');');
     }
   }
+  // TODO: Rachel: tooltip and helpurl
   code.push("    this.setTooltip('');");
   code.push("    this.setHelpUrl('http://www.example.com/');");
   code.push('  }');
diff --git a/demos/code/index.html b/demos/code/index.html
index 3878ec074..7da79ed61 100644
--- a/demos/code/index.html
+++ b/demos/code/index.html
@@ -6,7 +6,7 @@
   <title>Blockly Demo:</title>
   <link rel="stylesheet" href="style.css">
   <script src="/storage.js"></script>
-  <script src="../../blockly_compressed.js"></script>
+  <script src="../../blockly_uncompressed.js"></script>
   <script src="../../blocks_compressed.js"></script>
   <script src="../../javascript_compressed.js"></script>
   <script src="../../python_compressed.js"></script>