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

fix!: Replace Closure UI CSS classes with Blockly CSS classes (#8339)

Browse Source 
* fix!: Replace Closure UI CSS classes with Blockly CSS classes

* chore: remove comments about deprecated goog-x class

* chore: remove deprecated goog-x classes

* fix: correct coding format to pass CI checks
This commit is contained in:
Arun Chandran
2024-07-17 22:48:14 +05:30
committed by GitHub
parent 33b53718eb
commit ae80adfe9c
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/menu.ts
View File

@@ -85,8 +85,7 @@ export class Menu {
*/
render(container: Element): HTMLDivElement {
const element = document.createElement('div');
// goog-menu is deprecated, use blocklyMenu. May 2020.
element.className = 'blocklyMenu goog-menu blocklyNonSelectable';
element.className = 'blocklyMenu blocklyNonSelectable';
element.tabIndex = 0;
if (this.roleName) {
aria.setRole(element, this.roleName);

23
core/menuitem.ts
View File

@@ -64,22 +64,19 @@ export class MenuItem {
this.element = element;
// Set class and style
// goog-menuitem* is deprecated, use blocklyMenuItem*. May 2020.
element.className =
'blocklyMenuItem goog-menuitem ' +
(this.enabled ? '' : 'blocklyMenuItemDisabled goog-menuitem-disabled ') +
(this.checked ? 'blocklyMenuItemSelected goog-option-selected ' : '') +
(this.highlight
? 'blocklyMenuItemHighlight goog-menuitem-highlight '
: '') +
(this.rightToLeft ? 'blocklyMenuItemRtl goog-menuitem-rtl ' : '');
'blocklyMenuItem ' +
(this.enabled ? '' : 'blocklyMenuItemDisabled ') +
(this.checked ? 'blocklyMenuItemSelected ' : '') +
(this.highlight ? 'blocklyMenuItemHighlight ' : '') +
(this.rightToLeft ? 'blocklyMenuItemRtl ' : '');
const content = document.createElement('div');
content.className = 'blocklyMenuItemContent goog-menuitem-content';
content.className = 'blocklyMenuItemContent';
// Add a checkbox for checkable menu items.
if (this.checkable) {
const checkbox = document.createElement('div');
checkbox.className = 'blocklyMenuItemCheckbox goog-menuitem-checkbox';
checkbox.className = 'blocklyMenuItemCheckbox ';
content.appendChild(checkbox);
}
@@ -188,19 +185,13 @@ export class MenuItem {
*/
setHighlighted(highlight: boolean) {
this.highlight = highlight;
const el = this.getElement();
if (el && this.isEnabled()) {
// goog-menuitem-highlight is deprecated, use blocklyMenuItemHighlight.
// May 2020.
const name = 'blocklyMenuItemHighlight';
const nameDep = 'goog-menuitem-highlight';
if (highlight) {
dom.addClass(el, name);
dom.addClass(el, nameDep);
} else {
dom.removeClass(el, name);
dom.removeClass(el, nameDep);
}
}
}