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

Fix adding an icon in xml definition (#4336)

Browse Source
This commit is contained in:
alschmiedt
2020-09-29 18:04:41 -07:00
committed by GitHub
parent 311167bdc5
commit e9f46aea28
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/toolbox/category.js
View File

@@ -123,11 +123,12 @@ Blockly.utils.object.inherits(Blockly.ToolboxCategory, Blockly.ToolboxItem);
* @typedef {{
* container:?string,
* row:?string,
* rowcontentcontainer:?string,
* icon:?string,
* label:?string,
* selected:?string,
* openIcon:?string,
* closedIcon:?string
* openicon:?string,
* closedicon:?string
* }}
*/
Blockly.ToolboxCategory.CssConfig;
@@ -167,13 +168,13 @@ Blockly.ToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
return {
'container': 'blocklyToolboxCategory',
'row': 'blocklyTreeRow',
'rowContentContainer': 'blocklyTreeRowContentContainer',
'rowcontentcontainer': 'blocklyTreeRowContentContainer',
'icon': 'blocklyTreeIcon',
'label': 'blocklyTreeLabel',
'contents': 'blocklyToolboxContents',
'selected': 'blocklyTreeSelected',
'openIcon': 'blocklyTreeIconOpen',
'closedIcon': 'blocklyTreeIconClosed',
'openicon': 'blocklyTreeIconOpen',
'closedicon': 'blocklyTreeIconClosed',
};
};
@@ -278,7 +279,7 @@ Blockly.ToolboxCategory.prototype.createRowContainer_ = function() {
*/
Blockly.ToolboxCategory.prototype.createRowContentsContainer_ = function() {
var contentsContainer = document.createElement('div');
Blockly.utils.dom.addClass(contentsContainer, this.cssConfig_['rowContentContainer']);
Blockly.utils.dom.addClass(contentsContainer, this.cssConfig_['rowcontentcontainer']);
return contentsContainer;
};
@@ -422,8 +423,8 @@ Blockly.ToolboxCategory.prototype.openIcon_ = function(iconDiv) {
if (!iconDiv) {
return;
}
Blockly.utils.dom.removeClasses(iconDiv, this.cssConfig_['closedIcon']);
Blockly.utils.dom.addClass(iconDiv, this.cssConfig_['openIcon']);
Blockly.utils.dom.removeClasses(iconDiv, this.cssConfig_['closedicon']);
Blockly.utils.dom.addClass(iconDiv, this.cssConfig_['openicon']);
};
/**
@@ -435,8 +436,8 @@ Blockly.ToolboxCategory.prototype.closeIcon_ = function(iconDiv) {
if (!iconDiv) {
return;
}
Blockly.utils.dom.removeClasses(iconDiv, this.cssConfig_['openIcon']);
Blockly.utils.dom.addClass(iconDiv, this.cssConfig_['closedIcon']);
Blockly.utils.dom.removeClasses(iconDiv, this.cssConfig_['openicon']);
Blockly.utils.dom.addClass(iconDiv, this.cssConfig_['closedicon']);
};
/**

5
core/toolbox/collapsible_category.js
View File

@@ -71,11 +71,12 @@ Blockly.utils.object.inherits(Blockly.CollapsibleToolboxCategory, Blockly.Toolbo
* @typedef {{
* container:?string,
* row:?string,
* rowcontentcontainer:?string,
* icon:?string,
* label:?string,
* selected:?string,
* openIcon:?string,
* closedIcon:?string,
* openicon:?string,
* closedicon:?string,
* contents:?string
* }}
*/