ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-13 03:28:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.23.1 (#1520)

Browse Source
This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/vs/workbench/services/progress/browser/progressService.ts
View File

@@ -3,9 +3,9 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import lifecycle = require('vs/base/common/lifecycle');
import * as lifecycle from 'vs/base/common/lifecycle';
import { TPromise } from 'vs/base/common/winjs.base';
import types = require('vs/base/common/types');
import * as types from 'vs/base/common/types';
import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
@@ -102,17 +102,17 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
// Replay Infinite Progress
else if (this.progressState.infinite) {
this.progressbar.infinite().getContainer().show();
this.progressbar.infinite().show();
}
// Replay Finite Progress (Total & Worked)
else {
if (this.progressState.total) {
this.progressbar.total(this.progressState.total).getContainer().show();
this.progressbar.total(this.progressState.total).show();
}
if (this.progressState.worked) {
this.progressbar.worked(this.progressState.worked).getContainer().show();
this.progressbar.worked(this.progressState.worked).show();
}
}
}
@@ -152,20 +152,12 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
// Infinite: Start Progressbar and Show after Delay
if (!types.isUndefinedOrNull(infinite)) {
if (types.isUndefinedOrNull(delay)) {
this.progressbar.infinite().getContainer().show();
} else {
this.progressbar.infinite().getContainer().showDelayed(delay);
}
this.progressbar.infinite().show(delay);
}
// Finite: Start Progressbar and Show after Delay
else if (!types.isUndefinedOrNull(total)) {
if (types.isUndefinedOrNull(delay)) {
this.progressbar.total(total).getContainer().show();
} else {
this.progressbar.total(total).getContainer().showDelayed(delay);
}
this.progressbar.total(total).show(delay);
}
}
@@ -200,7 +192,7 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
this.progressState.infinite = true;
this.progressState.worked = void 0;
this.progressState.total = void 0;
this.progressbar.infinite().getContainer().show();
this.progressbar.infinite().show();
}
},
@@ -209,7 +201,7 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
this.progressState.done = true;
if (this.isActive) {
this.progressbar.stop().getContainer().hide();
this.progressbar.stop().hide();
}
}
};
@@ -244,7 +236,7 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
this.clearProgressState();
if (this.isActive) {
this.progressbar.stop().getContainer().hide();
this.progressbar.stop().hide();
}
};
@@ -257,11 +249,7 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
// Show Progress when active
if (this.isActive) {
if (types.isUndefinedOrNull(delay)) {
this.progressbar.infinite().getContainer().show();
} else {
this.progressbar.infinite().getContainer().showDelayed(delay);
}
this.progressbar.infinite().show(delay);
}
}