diff --git a/src/vs/base/browser/ui/countBadge/countBadge.ts b/src/vs/base/browser/ui/countBadge/countBadge.ts index 1f6825c5a90b3cf9bf74aa61fd7dac6546a8d95e..36031fb9a1e79b8d57c2277ec182649aad80fa9b 100644 --- a/src/vs/base/browser/ui/countBadge/countBadge.ts +++ b/src/vs/base/browser/ui/countBadge/countBadge.ts @@ -6,42 +6,33 @@ 'use strict'; import 'vs/css!./countBadge'; -import { Builder, $ } from 'vs/base/browser/builder'; -import strings = require('vs/base/common/strings'); +import { $, append } from 'vs/base/browser/dom'; +import { format } from 'vs/base/common/strings'; export class CountBadge { - private $el: Builder; + private element: HTMLElement; private count: number; private titleFormat: string; - constructor(container: Builder, count?: number, titleFormat?: string); - constructor(container: HTMLElement, count?: number, titleFormat?: string); - constructor(container: any, count?: number, titleFormat?: string) { - this.$el = $('.monaco-count-badge').appendTo(container); + constructor(container: HTMLElement, count?: number, titleFormat?: string) { + this.element = append(container, $('.monaco-count-badge')); this.titleFormat = titleFormat || ''; this.setCount(count || 0); } - public setCount(count: number) { + setCount(count: number) { this.count = count; this.render(); } - public setTitleFormat(titleFormat: string) { + setTitleFormat(titleFormat: string) { this.titleFormat = titleFormat; this.render(); } private render() { - this.$el.text('' + this.count); - this.$el.title(strings.format(this.titleFormat, this.count)); - } - - public dispose() { - if (this.$el) { - this.$el.destroy(); - this.$el = null; - } + this.element.textContent = '' + this.count; + this.element.title = format(this.titleFormat, this.count); } } diff --git a/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts index 9d0d3e7e8f806cd30654070f2efa31a57c27c8ff..213110eaaa48a1746599a32ea520a6d2bcadbc6d 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts +++ b/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts @@ -379,7 +379,7 @@ class Renderer extends LegacyRenderer { badge.setTitleFormat(nls.localize('referenceCount', "{0} reference", len)); } - return badge; + return null; }); /* tslint:enable:no-unused-expression */ diff --git a/src/vs/workbench/parts/search/browser/searchResultsView.ts b/src/vs/workbench/parts/search/browser/searchResultsView.ts index 10b3a248a12489dffd2c86ac6d9e526bc24565f1..55d78f31d42376ce7fa5bc2c1dd68c1389222e10 100644 --- a/src/vs/workbench/parts/search/browser/searchResultsView.ts +++ b/src/vs/workbench/parts/search/browser/searchResultsView.ts @@ -149,7 +149,8 @@ export class SearchRenderer extends ActionsRenderer { rightRenderer = (right: HTMLElement) => { let len = fileMatch.count(); - return new CountBadge(right, len, len > 1 ? nls.localize('searchMatches', "{0} matches found", len) : nls.localize('searchMatch', "{0} match found", len)); + new CountBadge(right, len, len > 1 ? nls.localize('searchMatches', "{0} matches found", len) : nls.localize('searchMatch', "{0} match found", len)); + return null; }; widget = new LeftRightWidget(container, leftRenderer, rightRenderer);