ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-09 09:42:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 2b0b9136329c181a9e381463a1f7dc3a2d105a34 (#4880)

Browse Source
This commit is contained in:
Karl Burtram
2019-04-05 10:09:18 -07:00
committed by GitHub
parent 9bd7e30d18
commit cb5bcf2248
433 changed files with 8915 additions and 8361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/base/browser/ui/progressbar/progressbar.ts
View File

@@ -10,6 +10,7 @@ import { Color } from 'vs/base/common/color';
import { mixin } from 'vs/base/common/objects';
import { removeClasses, addClass, hasClass, addClasses, removeClass, hide, show } from 'vs/base/browser/dom';
import { RunOnceScheduler } from 'vs/base/common/async';
import { isNumber } from 'vs/base/common/types';
const css_done = 'done';
const css_active = 'active';
@@ -146,7 +147,7 @@ export class ProgressBar extends Disposable {
* Finds out if this progress bar is configured with total work
*/
hasTotal(): boolean {
return !isNaN(this.totalWork as number);
return isNumber(this.totalWork);
}
/**
@@ -172,10 +173,11 @@ export class ProgressBar extends Disposable {
}
private doSetWorked(value: number): ProgressBar {
assert.ok(!isNaN(this.totalWork as number), 'Total work not set');
assert.ok(isNumber(this.totalWork), 'Total work not set');
const totalWork = this.totalWork!;
this.workedVal = value;
this.workedVal = Math.min(this.totalWork as number, this.workedVal);
this.workedVal = Math.min(totalWork, this.workedVal);
if (hasClass(this.element, css_infinite)) {
removeClass(this.element, css_infinite);
@@ -193,7 +195,7 @@ export class ProgressBar extends Disposable {
addClass(this.element, css_discrete);
}
this.bit.style.width = 100 * (this.workedVal / (this.totalWork as number)) + '%';
this.bit.style.width = 100 * (this.workedVal / (totalWork)) + '%';
return this;
}