Skip to content

Commit e8572c0

Browse files
sbattensbatten
committed
remove dom deprecated refs
refs microsoft#103454
1 parent 84dbc21 commit e8572c0

12 files changed

Lines changed: 58 additions & 60 deletions

File tree

‎src/vs/base/browser/ui/actionbar/actionViewItems.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { EventType as TouchEventType, Gesture } from 'vs/base/browser/touch';
1414
import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
1515
import { DataTransfers } from 'vs/base/browser/dnd';
1616
import { isFirefox } from 'vs/base/browser/browser';
17-
import { $, addClasses, addDisposableListener, append, EventHelper, EventLike, EventType, removeClasses, removeTabIndexAndUpdateFocus } from 'vs/base/browser/dom';
17+
import { $, addDisposableListener, append, EventHelper, EventLike, EventType, removeTabIndexAndUpdateFocus } from 'vs/base/browser/dom';
1818

1919
export interface IBaseActionViewItemOptions {
2020
draggable?: boolean;
@@ -294,7 +294,7 @@ export class ActionViewItem extends BaseActionViewItem {
294294

295295
updateClass(): void {
296296
if (this.cssClass && this.label) {
297-
removeClasses(this.label, this.cssClass);
297+
this.label.classList.remove(...this.cssClass.split(' '));
298298
}
299299

300300
if (this.options.icon) {
@@ -303,7 +303,7 @@ export class ActionViewItem extends BaseActionViewItem {
303303
if (this.label) {
304304
this.label.classList.add('codicon');
305305
if (this.cssClass) {
306-
addClasses(this.label, this.cssClass);
306+
this.label.classList.add(...this.cssClass.split(' '));
307307
}
308308
}
309309

‎src/vs/base/browser/ui/contextview/contextview.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,10 @@ export class ContextView extends Disposable {
295295

296296
const left = layout(window.innerWidth, viewSizeWidth, horizontalAnchor);
297297

298-
DOM.removeClasses(this.view, 'top', 'bottom', 'left', 'right');
299-
DOM.addClass(this.view, anchorPosition === AnchorPosition.BELOW ? 'bottom' : 'top');
300-
DOM.addClass(this.view, anchorAlignment === AnchorAlignment.LEFT ? 'left' : 'right');
301-
DOM.toggleClass(this.view, 'fixed', this.useFixedPosition);
298+
this.view.classList.remove('top', 'bottom', 'left', 'right');
299+
this.view.classList.add(anchorPosition === AnchorPosition.BELOW ? 'bottom' : 'top');
300+
this.view.classList.add(anchorAlignment === AnchorAlignment.LEFT ? 'left' : 'right');
301+
this.view.classList.toggle('fixed', this.useFixedPosition);
302302

303303
const containerPosition = DOM.getDomNodePagePosition(this.container!);
304304
this.view.style.top = `${top - (this.useFixedPosition ? DOM.getDomNodePagePosition(this.view).top : containerPosition.top)}px`;

‎src/vs/base/browser/ui/dialog/dialog.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import 'vs/css!./dialog';
77
import * as nls from 'vs/nls';
88
import { Disposable } from 'vs/base/common/lifecycle';
9-
import { $, hide, show, EventHelper, clearNode, removeClasses, addClasses, removeNode, isAncestor, addDisposableListener, EventType } from 'vs/base/browser/dom';
9+
import { $, hide, show, EventHelper, clearNode, isAncestor, addDisposableListener, EventType } from 'vs/base/browser/dom';
1010
import { domEvent } from 'vs/base/browser/event';
1111
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
1212
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
@@ -234,23 +234,23 @@ export class Dialog extends Disposable {
234234
}
235235
}));
236236

237-
removeClasses(this.iconElement, dialogErrorIcon.classNames, dialogWarningIcon.classNames, dialogInfoIcon.classNames, Codicon.loading.classNames);
237+
this.iconElement.classList.remove(...dialogErrorIcon.classNamesArray, ...dialogWarningIcon.classNamesArray, ...dialogInfoIcon.classNamesArray, ...Codicon.loading.classNamesArray);
238238

239239
switch (this.options.type) {
240240
case 'error':
241-
addClasses(this.iconElement, dialogErrorIcon.classNames);
241+
this.iconElement.classList.add(...dialogErrorIcon.classNamesArray);
242242
break;
243243
case 'warning':
244-
addClasses(this.iconElement, dialogWarningIcon.classNames);
244+
this.iconElement.classList.add(...dialogWarningIcon.classNamesArray);
245245
break;
246246
case 'pending':
247-
addClasses(this.iconElement, Codicon.loading.classNames, 'codicon-animation-spin');
247+
this.iconElement.classList.add(...Codicon.loading.classNamesArray, 'codicon-animation-spin');
248248
break;
249249
case 'none':
250250
case 'info':
251251
case 'question':
252252
default:
253-
addClasses(this.iconElement, dialogInfoIcon.classNames);
253+
this.iconElement.classList.add(...dialogInfoIcon.classNamesArray);
254254
break;
255255
}
256256

@@ -334,7 +334,7 @@ export class Dialog extends Disposable {
334334
dispose(): void {
335335
super.dispose();
336336
if (this.modal) {
337-
removeNode(this.modal);
337+
this.modal.remove();
338338
this.modal = undefined;
339339
}
340340

‎src/vs/base/browser/ui/menu/menu.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as strings from 'vs/base/common/strings';
88
import { IActionRunner, IAction, SubmenuAction, Separator, IActionViewItemProvider } from 'vs/base/common/actions';
99
import { ActionBar, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
1010
import { ResolvedKeybinding, KeyCode } from 'vs/base/common/keyCodes';
11-
import { addClass, EventType, EventHelper, EventLike, removeTabIndexAndUpdateFocus, isAncestor, hasClass, addDisposableListener, removeClass, append, $, addClasses, removeClasses, clearNode, createStyleSheet, isInShadowDOM, getActiveElement, Dimension, IDomNodePagePosition } from 'vs/base/browser/dom';
11+
import { EventType, EventHelper, EventLike, removeTabIndexAndUpdateFocus, isAncestor, addDisposableListener, append, $, clearNode, createStyleSheet, isInShadowDOM, getActiveElement, Dimension, IDomNodePagePosition } from 'vs/base/browser/dom';
1212
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
1313
import { RunOnceScheduler } from 'vs/base/common/async';
1414
import { DisposableStore } from 'vs/base/common/lifecycle';
@@ -73,10 +73,10 @@ export class Menu extends ActionBar {
7373
protected styleSheet: HTMLStyleElement | undefined;
7474

7575
constructor(container: HTMLElement, actions: ReadonlyArray<IAction>, options: IMenuOptions = {}) {
76-
addClass(container, 'monaco-menu-container');
76+
container.classList.add('monaco-menu-container');
7777
container.setAttribute('role', 'presentation');
7878
const menuElement = document.createElement('div');
79-
addClass(menuElement, 'monaco-menu');
79+
menuElement.classList.add('monaco-menu');
8080
menuElement.setAttribute('role', 'presentation');
8181

8282
super(menuElement, {
@@ -171,7 +171,7 @@ export class Menu extends ActionBar {
171171
target = target.parentElement;
172172
}
173173

174-
if (hasClass(target, 'action-item')) {
174+
if (target.classList.contains('action-item')) {
175175
const lastFocusedItem = this.focusedItem;
176176
this.setFocusedItem(target);
177177

@@ -597,37 +597,37 @@ class BaseMenuActionViewItem extends BaseActionViewItem {
597597

598598
updateClass(): void {
599599
if (this.cssClass && this.item) {
600-
removeClasses(this.item, this.cssClass);
600+
this.item.classList.remove(...this.cssClass.split(' '));
601601
}
602602
if (this.options.icon && this.label) {
603603
this.cssClass = this.getAction().class || '';
604-
addClass(this.label, 'icon');
604+
this.label.classList.add('icon');
605605
if (this.cssClass) {
606-
addClasses(this.label, this.cssClass);
606+
this.label.classList.add(...this.cssClass.split(' '));
607607
}
608608
this.updateEnabled();
609609
} else if (this.label) {
610-
removeClass(this.label, 'icon');
610+
this.label.classList.remove('icon');
611611
}
612612
}
613613

614614
updateEnabled(): void {
615615
if (this.getAction().enabled) {
616616
if (this.element) {
617-
removeClass(this.element, 'disabled');
617+
this.element.classList.remove('disabled');
618618
}
619619

620620
if (this.item) {
621-
removeClass(this.item, 'disabled');
621+
this.item.classList.remove('disabled');
622622
this.item.tabIndex = 0;
623623
}
624624
} else {
625625
if (this.element) {
626-
addClass(this.element, 'disabled');
626+
this.element.classList.add('disabled');
627627
}
628628

629629
if (this.item) {
630-
addClass(this.item, 'disabled');
630+
this.item.classList.add('disabled');
631631
removeTabIndexAndUpdateFocus(this.item);
632632
}
633633
}
@@ -639,11 +639,11 @@ class BaseMenuActionViewItem extends BaseActionViewItem {
639639
}
640640

641641
if (this.getAction().checked) {
642-
addClass(this.item, 'checked');
642+
this.item.classList.add('checked');
643643
this.item.setAttribute('role', 'menuitemcheckbox');
644644
this.item.setAttribute('aria-checked', 'true');
645645
} else {
646-
removeClass(this.item, 'checked');
646+
this.item.classList.remove('checked');
647647
this.item.setAttribute('role', 'menuitem');
648648
this.item.setAttribute('aria-checked', 'false');
649649
}
@@ -658,7 +658,7 @@ class BaseMenuActionViewItem extends BaseActionViewItem {
658658
return;
659659
}
660660

661-
const isSelected = this.element && hasClass(this.element, 'focused');
661+
const isSelected = this.element && this.element.classList.contains('focused');
662662
const fgColor = isSelected && this.menuStyle.selectionForegroundColor ? this.menuStyle.selectionForegroundColor : this.menuStyle.foregroundColor;
663663
const bgColor = isSelected && this.menuStyle.selectionBackgroundColor ? this.menuStyle.selectionBackgroundColor : undefined;
664664
const border = isSelected && this.menuStyle.selectionBorderColor ? `thin solid ${this.menuStyle.selectionBorderColor}` : '';
@@ -726,7 +726,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem {
726726
}
727727

728728
if (this.item) {
729-
addClass(this.item, 'monaco-submenu-item');
729+
this.item.classList.add('monaco-submenu-item');
730730
this.item.setAttribute('aria-haspopup', 'true');
731731
this.updateAriaExpanded('false');
732732
this.submenuIndicator = append(this.item, $('span.submenu-indicator' + menuSubmenuIcon.cssSelector));
@@ -841,7 +841,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem {
841841
if (!this.parentData.submenu) {
842842
this.updateAriaExpanded('true');
843843
this.submenuContainer = append(this.element, $('div.monaco-submenu'));
844-
addClasses(this.submenuContainer, 'menubar-menu-items-holder', 'context-view');
844+
this.submenuContainer.classList.add('menubar-menu-items-holder', 'context-view');
845845

846846
// Set the top value of the menu container before construction
847847
// This allows the menu constructor to calculate the proper max height
@@ -919,7 +919,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem {
919919
return;
920920
}
921921

922-
const isSelected = this.element && hasClass(this.element, 'focused');
922+
const isSelected = this.element && this.element.classList.contains('focused');
923923
const fgColor = isSelected && this.menuStyle.selectionForegroundColor ? this.menuStyle.selectionForegroundColor : this.menuStyle.foregroundColor;
924924

925925
if (this.submenuIndicator) {

‎src/vs/base/browser/ui/menu/menubar.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export class MenuBar extends Disposable {
100100

101101
this.container.setAttribute('role', 'menubar');
102102
if (this.options.compactMode !== undefined) {
103-
DOM.addClass(this.container, 'compact');
103+
this.container.classList.add('compact');
104104
}
105105

106106
this.menuCache = [];
@@ -425,12 +425,12 @@ export class MenuBar extends Disposable {
425425
super.dispose();
426426

427427
this.menuCache.forEach(menuBarMenu => {
428-
DOM.removeNode(menuBarMenu.titleElement);
429-
DOM.removeNode(menuBarMenu.buttonElement);
428+
menuBarMenu.titleElement.remove();
429+
menuBarMenu.buttonElement.remove();
430430
});
431431

432-
DOM.removeNode(this.overflowMenu.titleElement);
433-
DOM.removeNode(this.overflowMenu.buttonElement);
432+
this.overflowMenu.titleElement.remove();
433+
this.overflowMenu.buttonElement.remove();
434434

435435
dispose(this.overflowLayoutScheduled);
436436
this.overflowLayoutScheduled = undefined;
@@ -509,7 +509,7 @@ export class MenuBar extends Disposable {
509509
}
510510

511511
if (this.overflowMenu.buttonElement.nextElementSibling !== this.menuCache[this.numMenusShown].buttonElement) {
512-
DOM.removeNode(this.overflowMenu.buttonElement);
512+
this.overflowMenu.buttonElement.remove();
513513
this.container.insertBefore(this.overflowMenu.buttonElement, this.menuCache[this.numMenusShown].buttonElement);
514514
this.overflowMenu.buttonElement.style.visibility = 'visible';
515515
}
@@ -520,7 +520,7 @@ export class MenuBar extends Disposable {
520520
this.overflowMenu.actions.push(...compactMenuActions);
521521
}
522522
} else {
523-
DOM.removeNode(this.overflowMenu.buttonElement);
523+
this.overflowMenu.buttonElement.remove();
524524
this.container.appendChild(this.overflowMenu.buttonElement);
525525
this.overflowMenu.buttonElement.style.visibility = 'hidden';
526526
}
@@ -923,7 +923,7 @@ export class MenuBar extends Disposable {
923923

924924
if (this.focusedMenu.holder) {
925925
if (this.focusedMenu.holder.parentElement) {
926-
DOM.removeClass(this.focusedMenu.holder.parentElement, 'open');
926+
this.focusedMenu.holder.parentElement.classList.remove('open');
927927
}
928928

929929
this.focusedMenu.holder.remove();
@@ -947,7 +947,7 @@ export class MenuBar extends Disposable {
947947

948948
const menuHolder = $('div.menubar-menu-items-holder', { 'title': '' });
949949

950-
DOM.addClass(customMenu.buttonElement, 'open');
950+
customMenu.buttonElement.classList.add('open');
951951

952952
if (this.options.compactMode === Direction.Right) {
953953
menuHolder.style.top = `0px`;

‎src/vs/platform/actions/browser/menuEntryActionViewItem.ts‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { addClasses, createCSSRule, removeClasses, asCSSUrl } from 'vs/base/browser/dom';
6+
import { createCSSRule, asCSSUrl } from 'vs/base/browser/dom';
77
import { domEvent } from 'vs/base/browser/event';
88
import { IAction, Separator } from 'vs/base/common/actions';
99
import { Emitter } from 'vs/base/common/event';
@@ -237,10 +237,10 @@ export class MenuEntryActionViewItem extends ActionViewItem {
237237
// theme icons
238238
const iconClass = ThemeIcon.asClassName(icon);
239239
if (this.label && iconClass) {
240-
addClasses(this.label, iconClass);
240+
this.label.classList.add(...iconClass.split(' '));
241241
this._itemClassDispose.value = toDisposable(() => {
242242
if (this.label) {
243-
removeClasses(this.label, iconClass);
243+
this.label.classList.remove(...iconClass.split(' '));
244244
}
245245
});
246246
}
@@ -263,11 +263,10 @@ export class MenuEntryActionViewItem extends ActionViewItem {
263263
}
264264

265265
if (this.label) {
266-
267-
addClasses(this.label, 'icon', iconClass);
266+
this.label.classList.add('icon', ...iconClass.split(' '));
268267
this._itemClassDispose.value = toDisposable(() => {
269268
if (this.label) {
270-
removeClasses(this.label, 'icon', iconClass);
269+
this.label.classList.remove('icon', ...iconClass.split(' '));
271270
}
272271
});
273272
}

‎src/vs/platform/contextview/browser/contextMenuHandler.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
1414
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
1515
import { IThemeService } from 'vs/platform/theme/common/themeService';
1616
import { IContextMenuDelegate } from 'vs/base/browser/contextmenu';
17-
import { EventType, $, removeNode, isHTMLElement } from 'vs/base/browser/dom';
17+
import { EventType, $, isHTMLElement } from 'vs/base/browser/dom';
1818
import { attachMenuStyler } from 'vs/platform/theme/common/styler';
1919
import { domEvent } from 'vs/base/browser/event';
2020
import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
@@ -132,7 +132,7 @@ export class ContextMenuHandler {
132132
}
133133

134134
if (this.block) {
135-
removeNode(this.block);
135+
this.block.remove();
136136
this.block = null;
137137
}
138138

‎src/vs/workbench/browser/parts/compositeBarActions.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,8 @@ export class ActivityActionViewItem extends BaseActionViewItem {
299299
}
300300

301301
if (clazz) {
302-
dom.addClasses(this.badge, clazz);
303-
this.badgeDisposable.value = toDisposable(() => dom.removeClasses(this.badge, clazz));
302+
this.badge.classList.add(...clazz.split(' '));
303+
this.badgeDisposable.value = toDisposable(() => this.badge.classList.remove(...clazz.split(' ')));
304304
}
305305
}
306306

@@ -323,7 +323,7 @@ export class ActivityActionViewItem extends BaseActionViewItem {
323323
this.label.className = 'action-label';
324324

325325
if (this.activity.cssClass) {
326-
dom.addClasses(this.label, this.activity.cssClass);
326+
this.label.classList.add(...this.activity.cssClass.split(' '));
327327
}
328328

329329
if (this.options.icon && !this.activity.iconUrl) {

‎src/vs/workbench/browser/parts/compositePart.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
2828
import { IThemeService } from 'vs/platform/theme/common/themeService';
2929
import { attachProgressBarStyler } from 'vs/platform/theme/common/styler';
3030
import { INotificationService } from 'vs/platform/notification/common/notification';
31-
import { Dimension, append, $, hide, show, addClasses } from 'vs/base/browser/dom';
31+
import { Dimension, append, $, hide, show } from 'vs/base/browser/dom';
3232
import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
3333
import { assertIsDefined, withNullAsUndefined } from 'vs/base/common/types';
3434

@@ -213,7 +213,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
213213

214214
// Build Container off-DOM
215215
compositeContainer = $('.composite');
216-
addClasses(compositeContainer, this.compositeCSSClass);
216+
compositeContainer.classList.add(...this.compositeCSSClass.split(' '));
217217
compositeContainer.id = composite.getId();
218218

219219
composite.create(compositeContainer);

‎src/vs/workbench/browser/parts/titlebar/titlebarPart.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { isMacintosh, isWindows, isLinux, isWeb } from 'vs/base/common/platform'
2525
import { URI } from 'vs/base/common/uri';
2626
import { Color } from 'vs/base/common/color';
2727
import { trim } from 'vs/base/common/strings';
28-
import { EventType, EventHelper, Dimension, isAncestor, append, $, addDisposableListener, runAtThisOrScheduleAtNextAnimationFrame, removeNode } from 'vs/base/browser/dom';
28+
import { EventType, EventHelper, Dimension, isAncestor, append, $, addDisposableListener, runAtThisOrScheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
2929
import { CustomMenubarControl } from 'vs/workbench/browser/parts/titlebar/menubarControl';
3030
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
3131
import { template } from 'vs/base/common/labels';
@@ -319,7 +319,7 @@ export class TitlebarPart extends Part implements ITitleService {
319319
}
320320

321321
if (this.menubar) {
322-
removeNode(this.menubar);
322+
this.menubar.remove();
323323
this.menubar = undefined;
324324
}
325325
}

0 commit comments

Comments
 (0)