提交 7db472ba 编写于 作者: J Johannes Rieken

eng - don't use TPromise in dialogs api

上级 73ebe0df
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
'use strict'; 'use strict';
import { TPromise } from 'vs/base/common/winjs.base';
import { isFalsyOrEmpty } from 'vs/base/common/arrays'; import { isFalsyOrEmpty } from 'vs/base/common/arrays';
import { MainThreadDiaglogsShape, MainContext, IExtHostContext, MainThreadDialogOpenOptions, MainThreadDialogSaveOptions } from '../node/extHost.protocol'; import { MainThreadDiaglogsShape, MainContext, IExtHostContext, MainThreadDialogOpenOptions, MainThreadDialogSaveOptions } from '../node/extHost.protocol';
import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
...@@ -25,12 +24,12 @@ export class MainThreadDialogs implements MainThreadDiaglogsShape { ...@@ -25,12 +24,12 @@ export class MainThreadDialogs implements MainThreadDiaglogsShape {
// //
} }
$showOpenDialog(options: MainThreadDialogOpenOptions): TPromise<string[]> { $showOpenDialog(options: MainThreadDialogOpenOptions): Promise<string[]> {
// TODO@joh what about remote dev setup? // TODO@joh what about remote dev setup?
if (options.defaultUri && options.defaultUri.scheme !== 'file') { if (options.defaultUri && options.defaultUri.scheme !== 'file') {
return TPromise.wrapError(new Error('Not supported - Open-dialogs can only be opened on `file`-uris.')); return Promise.reject(new Error('Not supported - Open-dialogs can only be opened on `file`-uris.'));
} }
return new TPromise<string[]>(resolve => { return new Promise<string[]>(resolve => {
const filenames = this._windowService.showOpenDialog( const filenames = this._windowService.showOpenDialog(
MainThreadDialogs._convertOpenOptions(options) MainThreadDialogs._convertOpenOptions(options)
); );
...@@ -39,12 +38,12 @@ export class MainThreadDialogs implements MainThreadDiaglogsShape { ...@@ -39,12 +38,12 @@ export class MainThreadDialogs implements MainThreadDiaglogsShape {
}); });
} }
$showSaveDialog(options: MainThreadDialogSaveOptions): TPromise<string> { $showSaveDialog(options: MainThreadDialogSaveOptions): Promise<string> {
// TODO@joh what about remote dev setup? // TODO@joh what about remote dev setup?
if (options.defaultUri && options.defaultUri.scheme !== 'file') { if (options.defaultUri && options.defaultUri.scheme !== 'file') {
return TPromise.wrapError(new Error('Not supported - Save-dialogs can only be opened on `file`-uris.')); return Promise.reject(new Error('Not supported - Save-dialogs can only be opened on `file`-uris.'));
} }
return new TPromise<string>(resolve => { return new Promise<string>(resolve => {
const filename = this._windowService.showSaveDialog( const filename = this._windowService.showSaveDialog(
MainThreadDialogs._convertSaveOptions(options) MainThreadDialogs._convertSaveOptions(options)
); );
......
...@@ -144,8 +144,8 @@ export interface MainThreadDialogSaveOptions { ...@@ -144,8 +144,8 @@ export interface MainThreadDialogSaveOptions {
} }
export interface MainThreadDiaglogsShape extends IDisposable { export interface MainThreadDiaglogsShape extends IDisposable {
$showOpenDialog(options: MainThreadDialogOpenOptions): TPromise<string[]>; $showOpenDialog(options: MainThreadDialogOpenOptions): Thenable<string[]>;
$showSaveDialog(options: MainThreadDialogSaveOptions): TPromise<string>; $showSaveDialog(options: MainThreadDialogSaveOptions): Thenable<string>;
} }
export interface MainThreadDecorationsShape extends IDisposable { export interface MainThreadDecorationsShape extends IDisposable {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册