CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-20 07:17:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve 'clean up' spacing.

Browse Source
This commit is contained in:
Neil Fraser
2015-10-12 16:14:03 -07:00
parent 879cacbb8d
commit 4dffad0dad
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/toolbox.js
View File

@@ -66,8 +66,8 @@ Blockly.Toolbox.prototype.width = 0;
Blockly.Toolbox.prototype.selectedOption_ = null;
/**
* The SVG group currently selected.
* @type {*}
* The tree node most recently selected.
* @type {goog.ui.tree.BaseNode}
* @private
*/
Blockly.Toolbox.prototype.lastCategory_ = null;
@@ -99,7 +99,7 @@ Blockly.Toolbox.prototype.init = function() {
// Create an HTML container for the Toolbox menu.
this.HtmlDiv = goog.dom.createDom('div', 'blocklyToolboxDiv');
this.HtmlDiv.setAttribute('dir', this.workspace_.RTL ? 'RTL' : 'LTR');
this.HtmlDiv.setAttribute('dir', workspace.RTL ? 'RTL' : 'LTR');
document.body.appendChild(this.HtmlDiv);
// Clicking on toolbar closes popups.
@@ -128,7 +128,7 @@ Blockly.Toolbox.prototype.init = function() {
this.CONFIG_['cleardotPath'] = workspace.options.pathToMedia + '1x1.gif';
this.CONFIG_['cssCollapsedFolderIcon'] =
'blocklyTreeIconClosed' + (this.workspace_.RTL ? 'Rtl' : 'Ltr');
'blocklyTreeIconClosed' + (workspace.RTL ? 'Rtl' : 'Ltr');
var tree = new Blockly.Toolbox.TreeControl(this, this.CONFIG_);
this.tree_ = tree;
tree.setShowRootNode(false);
@@ -148,6 +148,7 @@ Blockly.Toolbox.prototype.dispose = function() {
this.tree_.dispose();
goog.dom.removeNode(this.HtmlDiv);
this.workspace_ = null;
this.lastCategory_ = null;
};
/**
@@ -332,9 +333,9 @@ Blockly.Toolbox.TreeControl.prototype.setSelectedItem = function(node) {
if (node && node.blocks && node.blocks.length) {
toolbox.flyout_.show(node.blocks);
// Scroll the flyout to the top if the category has changed.
if (toolbox.lastCategory_ != node.blocks) {
if (toolbox.lastCategory_ != node) {
toolbox.flyout_.scrollToTop();
toolbox.lastCategory_ = node.blocks;
toolbox.lastCategory_ = node;
}
} else {
// Hide the flyout.

4
core/workspace_svg.js
View File

@@ -658,9 +658,9 @@ Blockly.WorkspaceSvg.prototype.cleanUp_ = function() {
for (var i = 0, block; block = topBlocks[i]; i++) {
var xy = block.getRelativeToSurfaceXY();
block.moveBy(-xy.x, cursorY - xy.y);
cursorY += block.getHeightWidth().height;
cursorY += Blockly.BlockSvg.MIN_BLOCK_Y;
block.snapToGrid();
cursorY = block.getRelativeToSurfaceXY().y +
block.getHeightWidth().height + Blockly.BlockSvg.MIN_BLOCK_Y;
}
// Fire an event to allow scrollbars to resize.
Blockly.fireUiEvent(window, 'resize');