scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-08-28 22:10:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Separators specified in toolbox XML should replace, not add to, previous gaps.

Browse source
This commit is contained in:
Rachel Fenichel 2016-08-09 17:51:50 -07:00
parent 3998ecec3a
commit dc02dfb8ff
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/flyout.js
View file

@ -637,12 +637,10 @@ Blockly.Flyout.prototype.show = function(xmlList) {
// Create the blocks to be shown in this flyout.
var blocks = [];
var gaps = [];
var lastBlock = null;
this.permanentlyDisabled_.length = 0;
for (var i = 0, xml; xml = xmlList[i]; i++) {
if (xml.tagName) {
if (xml.tagName.toUpperCase() == 'BLOCK') {
lastBlock = xml;
var curBlock = Blockly.Xml.domToBlock(xml, this.workspace_);
if (curBlock.disabled) {
// Record blocks that were initially disabled.
@ -656,14 +654,13 @@ Blockly.Flyout.prototype.show = function(xmlList) {
// Change the gap between two blocks.
// <sep gap="36"></sep>
// The default gap is 24, can be set larger or smaller.
// This overwrites the gap attribute on the previous block.
// Note that a deprecated method is to add a gap to a block.
// <block type="math_arithmetic" gap="8"></block>
var newGap = parseInt(xml.getAttribute('gap'), 10);
// Ignore gaps before the first block.
if (!isNaN(newGap) && lastBlock) {
var oldGap = parseInt(lastBlock.getAttribute('gap'));
var gap = isNaN(oldGap) ? newGap : oldGap + newGap;
gaps[gaps.length - 1] = gap;
if (!isNaN(newGap) && gaps.length > 0) {
gaps[gaps.length - 1] = newGap;
} else {
gaps.push(this.MARGIN * 3);
}

6
core/toolbox.js
View file

@ -333,10 +333,8 @@ Blockly.Toolbox.prototype.syncTrees_ = function(treeIn, treeOut, pathToMedia) {
// Note that a deprecated method is to add a gap to a block.
// <block type="math_arithmetic" gap="8"></block>
var newGap = parseFloat(childIn.getAttribute('gap'));
if (!isNaN(newGap)) {
var oldGap = parseFloat(lastElement.getAttribute('gap'));
var gap = isNaN(oldGap) ? newGap : oldGap + newGap;
lastElement.setAttribute('gap', gap);
if (!isNaN(newGap) && lastElement) {
lastElement.setAttribute('gap', newGap);
}
}
}