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

fixed the bug with using vs code url to download manually (#1108)

Browse Source
This commit is contained in:
Leila Lali
2018-04-11 11:59:56 -07:00
committed by GitHub
parent bbfb68b082
commit 7833c28b7a
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
View File

@@ -114,7 +114,7 @@ class Extension implements IExtension {
return null; return null;
} }
return `${product.extensionsGallery.itemUrl}?itemName=${this.publisher}.${this.name}`; return product.extensionsGallery.itemUrl && `${product.extensionsGallery.itemUrl}?itemName=${this.publisher}.${this.name}`;
} }
get downloadUrl(): string { get downloadUrl(): string {
@@ -122,7 +122,9 @@ class Extension implements IExtension {
return null; return null;
} }
return `${product.extensionsGallery.serviceUrl}/publishers/${this.publisher}/vsextensions/${this.name}/${this.latestVersion}/vspackage`; // {{SQL CARBON EDIT}}
return this.gallery && this.gallery.assets && this.gallery.assets.download && this.gallery.assets.download.uri;
//return `${product.extensionsGallery.serviceUrl}/publishers/${this.publisher}/vsextensions/${this.name}/${this.latestVersion}/vspackage`;
} }
get iconUrl(): string { get iconUrl(): string {
@@ -612,7 +614,18 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
location: ProgressLocation.Extensions, location: ProgressLocation.Extensions,
title: nls.localize('installingMarketPlaceExtension', 'Installing extension from Marketplace....'), title: nls.localize('installingMarketPlaceExtension', 'Installing extension from Marketplace....'),
tooltip: `${extension.id}` tooltip: `${extension.id}`
}, () => this.extensionService.installFromGallery(gallery)); // {{SQL CARBON EDIT}}
}, () => this.downloadOrBrowse(ext));
}
// {{SQL CARBON EDIT}}
private downloadOrBrowse(ext: Extension): TPromise<void> {
if (ext.gallery.assets.downloadPage && ext.gallery.assets.downloadPage.uri) {
window.open(ext.gallery.assets.downloadPage.uri);
return TPromise.wrap<void>(void 0);
} else {
return this.extensionService.installFromGallery(ext.gallery);
}
} }
setEnablement(extension: IExtension, enablementState: EnablementState): TPromise<void> { setEnablement(extension: IExtension, enablementState: EnablementState): TPromise<void> {