Merge google/develop, recompile (scratchfoundation#617)

* Check result of window.confirm before deleting variables. * Create CONTRIBUTING.md * Localisation updates from https://translatewiki.net. * Cherrypick fixes made directly to master back into develop (scratchfoundation#619) * Check result of window.confirm before deleting variables. * Create CONTRIBUTING.md * rebuild * Localisation updates from https://translatewiki.net. * Minor wording change. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Simplify the handling of the active desc for a toolbox without categories. * Remove tables from the HTML. Move the toolbar buttons to the end so that they don't impede switching between the toolbox and workspace. * When cutting or copying a block, do not include blocks joined to it. * Add shadow to flyout buttons. * Move 'create new group' button to the bottom of each toolbox block, and remove other buttons if there is nothing in the workspace. * Add keyboard shortcuts for cut, copy and paste operations. * Remove clipboard buttons to simplify UI. * Prevent setting a number value to NaN. Select the field value on entry to an input field. State the contents of the input field when describing the field. * Add aria-level and aria-selected attrs to dropdowns. * routine recompile * Update demo to latest interpreter. * Move 'move to marked spot' button to the top of the block options list. * Fix incorrect aria-levels in toolbox tree component. * Add new fields to toolbarButtonConfig. * Recompile * Remove CONTRIBUTING
BlockScript · Sep 22, 2016 · a6f34ae · a6f34ae
1 parent a9c9f92
commit a6f34ae
Show file tree

Hide file tree

Showing 10 changed files with 1,140 additions and 442 deletions.
diff --git a/blockly_compressed_horizontal.js b/blockly_compressed_horizontal.js
diff --git a/blockly_compressed_vertical.js b/blockly_compressed_vertical.js
diff --git a/blockly_uncompressed_horizontal.js b/blockly_uncompressed_horizontal.js
diff --git a/blockly_uncompressed_vertical.js b/blockly_uncompressed_vertical.js
diff --git a/blocks_compressed_vertical.js b/blocks_compressed_vertical.js
diff --git a/core/css.js b/core/css.js
@@ -423,11 +423,15 @@ Blockly.Css.CONTENT = [
 
   '.blocklyFlyoutButton {',
     'fill: #888;',
-    'cursor: default',
+    'cursor: default;',
+  '}',
+
+  '.blocklyFlyoutButtonShadow {',
+    'fill: #666;',
   '}',
 
   '.blocklyFlyoutButton:hover {',
-    'fill: #ccc;',
+    'fill: #aaa;',
   '}',
 
   /*

diff --git a/core/flyout_button.js b/core/flyout_button.js
@@ -58,7 +58,7 @@ Blockly.FlyoutButton = function(workspace, targetWorkspace, text) {
   this.text_ = text;
 
   /**
-   * @type {goog.math.Coordinate}
+   * @type {!goog.math.Coordinate}
    * @private
    */
   this.position_ = new goog.math.Coordinate(0, 0);
@@ -89,10 +89,14 @@ Blockly.FlyoutButton.prototype.createDom = function() {
   this.svgGroup_ = Blockly.createSvgElement('g',
       {'class': 'blocklyFlyoutButton'}, this.workspace_.getCanvas());
 
-  // Rect with rounded corners.
+  // Shadow rectangle (light source does not mirror in RTL).
+  var shadow = Blockly.createSvgElement('rect',
+      {'class': 'blocklyFlyoutButtonShadow',
+       'rx': 4, 'ry': 4, 'x': 1, 'y': 1},
+       this.svgGroup_);
+  // Background rectangle.
   var rect = Blockly.createSvgElement('rect',
-      {'rx': 4, 'ry': 4,
-       'height': 0, 'width': 0},
+      {'class': 'blocklyFlyoutButtonBackground', 'rx': 4, 'ry': 4},
        this.svgGroup_);
 
   var svgText = Blockly.createSvgElement('text',
@@ -102,8 +106,10 @@ Blockly.FlyoutButton.prototype.createDom = function() {
 
   this.width = svgText.getComputedTextLength() +
       2 * Blockly.FlyoutButton.MARGIN;
-  this.height = 20; // Can't compute it :(
+  this.height = 20;  // Can't compute it :(
 
+  shadow.setAttribute('width', this.width);
+  shadow.setAttribute('height', this.height);
   rect.setAttribute('width', this.width);
   rect.setAttribute('height', this.height);
 
@@ -124,10 +130,11 @@ Blockly.FlyoutButton.prototype.show = function() {
 
 /**
  * Update svg attributes to match internal state.
+ * @private
  */
 Blockly.FlyoutButton.prototype.updateTransform_ = function() {
-  this.svgGroup_.setAttribute('transform', 'translate(' + this.position_.x +
-      ',' + this.position_.y + ')');
+  this.svgGroup_.setAttribute('transform',
+      'translate(' + this.position_.x + ',' + this.position_.y + ')');
 };
 
 /**

diff --git a/core/workspace.js b/core/workspace.js
@@ -328,9 +328,12 @@ Blockly.Workspace.prototype.deleteVariable = function(name) {
           return;
         }
       }
-      window.confirm(
+      var ok = window.confirm(
           Blockly.Msg.DELETE_VARIABLE_CONFIRMATION.replace('%1', uses.length).
           replace('%2', name));
+      if (!ok) {
+        return;
+      }
     }
 
     Blockly.Events.setGroup(true);