From 33444b072f193cd407cf595fdfe20a33b3d4b3bb Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 13 Jul 2016 09:44:58 +0200 Subject: [PATCH] handle no readme. call super set input. fixes #8830 --- .../extensions/electron-browser/extensionEditor.ts | 10 +++++++--- .../electron-browser/media/extensionEditor.css | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts index c3b0a840d52..314f768052f 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts @@ -116,7 +116,6 @@ export class ExtensionEditor extends BaseEditor { setInput(input: ExtensionsInput, options: EditorOptions): TPromise { this.transientDisposables = dispose(this.transientDisposables); - let promise = TPromise.as(null); const extension = input.extension; this.icon.style.backgroundImage = `url("${ extension.iconUrl }")`; @@ -152,10 +151,11 @@ export class ExtensionEditor extends BaseEditor { this.transientDisposables.push(enableAction, updateAction, installAction); this.body.innerHTML = ''; - addClass(this.body, 'loading'); + let promise: TPromise = super.setInput(input, options); if (extension.readmeUrl) { - promise = super.setInput(input, options) + promise = promise + .then(() => addClass(this.body, 'loading')) .then(() => this.requestService.makeRequest({ url: extension.readmeUrl })) .then(response => response.responseText) .then(marked.parse) @@ -174,6 +174,10 @@ export class ExtensionEditor extends BaseEditor { }) .then(null, () => null) .then(() => removeClass(this.body, 'loading')); + } else { + promise = promise + .then(() => append(this.body, $('p'))) + .then(p => p.textContent = localize('noReadme', "No README available.")); } this.transientDisposables.push(toDisposable(() => promise.cancel())); diff --git a/src/vs/workbench/parts/extensions/electron-browser/media/extensionEditor.css b/src/vs/workbench/parts/extensions/electron-browser/media/extensionEditor.css index d6cb9229e90..8be8ca4ed44 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/media/extensionEditor.css +++ b/src/vs/workbench/parts/extensions/electron-browser/media/extensionEditor.css @@ -103,4 +103,8 @@ .extension-editor > .body { height: calc(100% - 168px); overflow: hidden; +} + +.extension-editor > .body > p { + margin: 20px; } \ No newline at end of file -- GitLab