Skip to content

Commit 40cd3b8

Browse files
jriekenjrieken
committed
update search file, remove unused functions, microsoft#103454 
1 parent b89ace7 commit 40cd3b8

3 files changed

Lines changed: 38 additions & 63 deletions

File tree

‎.vscode/searches/es6.code-search‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,20 @@
22
# Flags: CaseSensitive WordMatch
33
# ContextLines: 2
44

5-
7 results - 2 files
5+
5 results - 2 files
66

77
src/vs/base/browser/dom.ts:
8-
74 };
9-
75
10-
76: /** @deprecated ES6 - use classList*/
11-
77 export function hasClass(node: HTMLElement | SVGElement, className: string): boolean { return _classList.hasClass(node, className); }
8+
76 };
9+
77
1210
78: /** @deprecated ES6 - use classList*/
1311
79 export function addClass(node: HTMLElement | SVGElement, className: string): void { return _classList.addClass(node, className); }
1412
80: /** @deprecated ES6 - use classList*/
1513
81 export function addClasses(node: HTMLElement | SVGElement, ...classNames: string[]): void { return _classList.addClasses(node, ...classNames); }
1614
82: /** @deprecated ES6 - use classList*/
17-
83 export function removeClass(node: HTMLElement | SVGElement, className: string): void { return _classList.removeClass(node, className); }
15+
83 export function removeClasses(node: HTMLElement | SVGElement, ...classNames: string[]): void { return _classList.removeClasses(node, ...classNames); }
1816
84: /** @deprecated ES6 - use classList*/
19-
85 export function removeClasses(node: HTMLElement | SVGElement, ...classNames: string[]): void { return _classList.removeClasses(node, ...classNames); }
20-
86: /** @deprecated ES6 - use classList*/
21-
87 export function toggleClass(node: HTMLElement | SVGElement, className: string, shouldHaveIt?: boolean): void { return _classList.toggleClass(node, className, shouldHaveIt); }
22-
88
17+
85 export function toggleClass(node: HTMLElement | SVGElement, className: string, shouldHaveIt?: boolean): void { return _classList.toggleClass(node, className, shouldHaveIt); }
18+
86
2319

2420
src/vs/base/common/strings.ts:
2521
15

‎src/vs/base/browser/dom.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,13 @@ export function isInDOM(node: Node | null): boolean {
4040
}
4141

4242
interface IDomClassList {
43-
hasClass(node: HTMLElement | SVGElement, className: string): boolean;
4443
addClass(node: HTMLElement | SVGElement, className: string): void;
4544
addClasses(node: HTMLElement | SVGElement, ...classNames: string[]): void;
46-
removeClass(node: HTMLElement | SVGElement, className: string): void;
4745
removeClasses(node: HTMLElement | SVGElement, ...classNames: string[]): void;
4846
toggleClass(node: HTMLElement | SVGElement, className: string, shouldHaveIt?: boolean): void;
4947
}
5048

5149
const _classList: IDomClassList = new class implements IDomClassList {
52-
hasClass(node: HTMLElement, className: string): boolean {
53-
return Boolean(className) && node.classList && node.classList.contains(className);
54-
}
5550

5651
addClasses(node: HTMLElement, ...classNames: string[]): void {
5752
classNames.forEach(nameValue => nameValue.split(' ').forEach(name => this.addClass(node, name)));
@@ -80,15 +75,11 @@ const _classList: IDomClassList = new class implements IDomClassList {
8075
}
8176
};
8277

83-
/** @deprecated ES6 - use classList*/
84-
export function hasClass(node: HTMLElement | SVGElement, className: string): boolean { return _classList.hasClass(node, className); }
8578
/** @deprecated ES6 - use classList*/
8679
export function addClass(node: HTMLElement | SVGElement, className: string): void { return _classList.addClass(node, className); }
8780
/** @deprecated ES6 - use classList*/
8881
export function addClasses(node: HTMLElement | SVGElement, ...classNames: string[]): void { return _classList.addClasses(node, ...classNames); }
8982
/** @deprecated ES6 - use classList*/
90-
export function removeClass(node: HTMLElement | SVGElement, className: string): void { return _classList.removeClass(node, className); }
91-
/** @deprecated ES6 - use classList*/
9283
export function removeClasses(node: HTMLElement | SVGElement, ...classNames: string[]): void { return _classList.removeClasses(node, ...classNames); }
9384
/** @deprecated ES6 - use classList*/
9485
export function toggleClass(node: HTMLElement | SVGElement, className: string, shouldHaveIt?: boolean): void { return _classList.toggleClass(node, className, shouldHaveIt); }

‎src/vs/base/test/browser/dom.test.ts‎

Lines changed: 32 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -13,77 +13,65 @@ suite('dom', () => {
1313
let element = document.createElement('div');
1414
element.className = 'foobar boo far';
1515

16-
assert(dom.hasClass(element, 'foobar'));
17-
assert(dom.hasClass(element, 'boo'));
18-
assert(dom.hasClass(element, 'far'));
19-
assert(!dom.hasClass(element, 'bar'));
20-
assert(!dom.hasClass(element, 'foo'));
21-
assert(!dom.hasClass(element, ''));
16+
assert(element.classList.contains('foobar'));
17+
assert(element.classList.contains('boo'));
18+
assert(element.classList.contains('far'));
19+
assert(!element.classList.contains('bar'));
20+
assert(!element.classList.contains('foo'));
21+
assert(!element.classList.contains(''));
2222
});
2323

2424
test('removeClass', () => {
2525

2626
let element = document.createElement('div');
2727
element.className = 'foobar boo far';
2828

29-
dom.removeClass(element, 'boo');
30-
assert(dom.hasClass(element, 'far'));
31-
assert(!dom.hasClass(element, 'boo'));
32-
assert(dom.hasClass(element, 'foobar'));
29+
element.classList.remove('boo');
30+
assert(element.classList.contains('far'));
31+
assert(!element.classList.contains('boo'));
32+
assert(element.classList.contains('foobar'));
3333
assert.equal(element.className, 'foobar far');
3434

3535
element = document.createElement('div');
3636
element.className = 'foobar boo far';
3737

38-
dom.removeClass(element, 'far');
39-
assert(!dom.hasClass(element, 'far'));
40-
assert(dom.hasClass(element, 'boo'));
41-
assert(dom.hasClass(element, 'foobar'));
38+
element.classList.remove('far');
39+
assert(!element.classList.contains('far'));
40+
assert(element.classList.contains('boo'));
41+
assert(element.classList.contains('foobar'));
4242
assert.equal(element.className, 'foobar boo');
4343

44-
dom.removeClass(element, 'boo');
45-
assert(!dom.hasClass(element, 'far'));
46-
assert(!dom.hasClass(element, 'boo'));
47-
assert(dom.hasClass(element, 'foobar'));
44+
element.classList.remove('boo');
45+
assert(!element.classList.contains('far'));
46+
assert(!element.classList.contains('boo'));
47+
assert(element.classList.contains('foobar'));
4848
assert.equal(element.className, 'foobar');
4949

50-
dom.removeClass(element, 'foobar');
51-
assert(!dom.hasClass(element, 'far'));
52-
assert(!dom.hasClass(element, 'boo'));
53-
assert(!dom.hasClass(element, 'foobar'));
50+
element.classList.remove('foobar');
51+
assert(!element.classList.contains('far'));
52+
assert(!element.classList.contains('boo'));
53+
assert(!element.classList.contains('foobar'));
5454
assert.equal(element.className, '');
5555
});
5656

5757
test('removeClass should consider hyphens', function () {
5858
let element = document.createElement('div');
5959

60-
dom.addClass(element, 'foo-bar');
61-
dom.addClass(element, 'bar');
60+
element.classList.add('foo-bar');
61+
element.classList.add('bar');
6262

63-
assert(dom.hasClass(element, 'foo-bar'));
64-
assert(dom.hasClass(element, 'bar'));
63+
assert(element.classList.contains('foo-bar'));
64+
assert(element.classList.contains('bar'));
6565

66-
dom.removeClass(element, 'bar');
67-
assert(dom.hasClass(element, 'foo-bar'));
68-
assert(!dom.hasClass(element, 'bar'));
66+
element.classList.remove('bar');
67+
assert(element.classList.contains('foo-bar'));
68+
assert(!element.classList.contains('bar'));
6969

70-
dom.removeClass(element, 'foo-bar');
71-
assert(!dom.hasClass(element, 'foo-bar'));
72-
assert(!dom.hasClass(element, 'bar'));
70+
element.classList.remove('foo-bar');
71+
assert(!element.classList.contains('foo-bar'));
72+
assert(!element.classList.contains('bar'));
7373
});
7474

75-
//test('[perf] hasClass * 100000', () => {
76-
//
77-
// for (let i = 0; i < 100000; i++) {
78-
// let element = document.createElement('div');
79-
// element.className = 'foobar boo far';
80-
//
81-
// assert(dom.hasClass(element, 'far'));
82-
// assert(dom.hasClass(element, 'boo'));
83-
// assert(dom.hasClass(element, 'foobar'));
84-
// }
85-
//});
86-
8775
suite('$', () => {
8876
test('should build simple nodes', () => {
8977
const div = $('div');

0 commit comments

Comments
 (0)