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

Update component names (#3549)

Browse Source
This commit is contained in:
alschmiedt
2020-01-06 13:18:15 -08:00
committed by GitHub
parent 8d6ff39e64
commit a1ed9ab791
7 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/flyout_base.js
View File

@@ -228,7 +228,7 @@ Blockly.Flyout.prototype.createDom = function(tagName) {
{'class': 'blocklyFlyoutBackground'}, this.svgGroup_);
this.svgGroup_.appendChild(this.workspace_.createDom());
this.workspace_.getThemeManager().subscribe(
this.svgBackground_, 'flyout', 'fill');
this.svgBackground_, 'flyoutBackgroundColour', 'fill');
this.workspace_.getThemeManager().subscribe(
this.svgBackground_, 'flyoutOpacity', 'fill-opacity');
this.workspace_.getMarkerManager().setCursor(new Blockly.FlyoutCursor());

3
core/flyout_button.js
View File

@@ -160,7 +160,8 @@ Blockly.FlyoutButton.prototype.createDom = function() {
svgText.textContent = text;
if (this.isLabel_) {
this.svgText_ = svgText;
this.workspace_.getThemeManager().subscribe(this.svgText_, 'flyoutText', 'fill');
this.workspace_.getThemeManager().subscribe(this.svgText_,
'flyoutForegroundColour', 'fill');
}
this.width = Blockly.utils.dom.getTextWidth(svgText);

3
core/inject.js
View File

@@ -182,7 +182,8 @@ Blockly.createMainWorkspace_ = function(svg, options, blockDragSurface,
mainWorkspace.addZoomControls();
}
// Register the workspace svg as a UI component.
mainWorkspace.getThemeManager().subscribe(svg, 'workspace', 'background-color');
mainWorkspace.getThemeManager().subscribe(svg, 'workspaceBackgroundColour',
'background-color');
// A null translation will also apply the correct initial scale.
mainWorkspace.translate(0, 0);

2
core/scrollbar.js
View File

@@ -628,7 +628,7 @@ Blockly.Scrollbar.prototype.createDom_ = function(opt_class) {
},
this.svgGroup_);
this.workspace_.getThemeManager().subscribe(
this.svgHandle_, 'scrollbar', 'fill');
this.svgHandle_, 'scrollbarColour', 'fill');
this.workspace_.getThemeManager().subscribe(
this.svgHandle_, 'scrollbarOpacity', 'fill-opacity');
Blockly.utils.dom.insertAfter(this.outerSvg_,

12
core/theme/dark.js
View File

@@ -119,13 +119,13 @@ Blockly.Themes.Dark =
new Blockly.Theme('dark', Blockly.Themes.Dark.defaultBlockStyles,
Blockly.Themes.Dark.categoryStyles);
Blockly.Themes.Dark.setComponentStyle('workspace', '#1e1e1e');
Blockly.Themes.Dark.setComponentStyle('toolbox', '#333');
Blockly.Themes.Dark.setComponentStyle('toolboxText', '#fff');
Blockly.Themes.Dark.setComponentStyle('flyout', '#252526');
Blockly.Themes.Dark.setComponentStyle('flyoutText', '#ccc');
Blockly.Themes.Dark.setComponentStyle('workspaceBackgroundColour', '#1e1e1e');
Blockly.Themes.Dark.setComponentStyle('toolboxBackgroundColour', '#333');
Blockly.Themes.Dark.setComponentStyle('toolboxForegroundColour', '#fff');
Blockly.Themes.Dark.setComponentStyle('flyoutBackgroundColour', '#252526');
Blockly.Themes.Dark.setComponentStyle('flyoutForegroundColour', '#ccc');
Blockly.Themes.Dark.setComponentStyle('flyoutOpacity', 1);
Blockly.Themes.Dark.setComponentStyle('scrollbar', '#797979');
Blockly.Themes.Dark.setComponentStyle('scrollbarColour', '#797979');
Blockly.Themes.Dark.setComponentStyle('scrollbarOpacity', 0.4);
/**

5
core/toolbox.js
View File

@@ -163,8 +163,9 @@ Blockly.Toolbox.prototype.init = function() {
this.HtmlDiv.setAttribute('dir', workspace.RTL ? 'RTL' : 'LTR');
svg.parentNode.insertBefore(this.HtmlDiv, svg);
var themeManager = workspace.getThemeManager();
themeManager.subscribe(this.HtmlDiv, 'toolbox', 'background-color');
themeManager.subscribe(this.HtmlDiv, 'toolboxText', 'color');
themeManager.subscribe(this.HtmlDiv, 'toolboxBackgroundColour',
'background-color');
themeManager.subscribe(this.HtmlDiv, 'toolboxForegroundColour', 'color');
// Clicking on toolbox closes popups.
Blockly.bindEventWithChecks_(this.HtmlDiv, 'mousedown', this,

3
core/workspace_svg.js
View File

@@ -717,7 +717,8 @@ Blockly.WorkspaceSvg.prototype.createDom = function(opt_backgroundClass) {
this.svgBackground_.style.fill =
'url(#' + this.grid_.getPatternId() + ')';
} else {
this.themeManager_.subscribe(this.svgBackground_, 'workspace', 'fill');
this.themeManager_.subscribe(this.svgBackground_,
'workspaceBackgroundColour', 'fill');
}
}
/** @type {SVGElement} */