diff --git a/product.json b/product.json index ea247a3f149c6369bd47fd3f5bac654c8a796096..49f852e2928af5eaa0a6db0c6f0babd2da96828e 100644 --- a/product.json +++ b/product.json @@ -14,10 +14,5 @@ "win32ShellNameShort": "C&ode - OSS", "darwinBundleIdentifier": "com.visualstudio.code.oss", "reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new", - "urlProtocol": "code-oss", - "extensionsGallery": { - "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", - "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", - "itemUrl": "https://marketplace.visualstudio.com/items" - } -} + "urlProtocol": "code-oss" +} \ No newline at end of file diff --git a/src/vs/editor/contrib/find/browser/simpleFindWidget.ts b/src/vs/editor/contrib/find/browser/simpleFindWidget.ts index 1dce58a710596b4133c6ff3ebba6e0878c2dcad3..bccb4e397a615a54f819b3d878c63bcc4b304e7a 100644 --- a/src/vs/editor/contrib/find/browser/simpleFindWidget.ts +++ b/src/vs/editor/contrib/find/browser/simpleFindWidget.ts @@ -112,8 +112,8 @@ export abstract class SimpleFindWidget extends Widget { this._register(this._focusTracker.addBlurListener(this.onFocusTrackerBlur.bind(this))); this._findInputFocusTracker = this._register(dom.trackFocus(this._findInput.domNode)); - this._register(this._findInputFocusTracker.addFocusListener(this.onFindInputFocusTrackerFocus.bind(this))); - this._register(this._findInputFocusTracker.addBlurListener(this.onFindInputFocusTrackerBlur.bind(this))); + this._register(this._findInputFocusTracker.addFocusListener(this._onFindInputFocusTrackerFocus.bind(this))); + this._register(this._findInputFocusTracker.addBlurListener(this._onFindInputFocusTrackerBlur.bind(this))); this._register(dom.addDisposableListener(this._domNode, 'click', (event) => { event.stopPropagation(); @@ -124,8 +124,14 @@ export abstract class SimpleFindWidget extends Widget { protected abstract find(previous: boolean); protected abstract onFocusTrackerFocus(); protected abstract onFocusTrackerBlur(); - protected abstract onFindInputFocusTrackerFocus(); - protected abstract onFindInputFocusTrackerBlur(); + + private _onFindInputFocusTrackerFocus() { + this._findInputFocused.set(true); + } + + private _onFindInputFocusTrackerBlur() { + this._findInputFocused.reset(); + } protected get inputValue() { return this._findInput.getValue(); diff --git a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts index 960f0a7857cf2107f80969a2e28b2fc2011eeb6b..f394961e4e28850160abd8b00fa2b5d95143a573 100644 --- a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts +++ b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts @@ -53,7 +53,7 @@ import { IContextKeyService, RawContextKey, ContextKeyExpr, IContextKey } from ' import { Command } from 'vs/editor/common/editorCommonExtensions'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; -import { default as WebView, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_INPUT_FOCUSED } from 'vs/workbench/parts/html/browser/webview'; +import { default as Webview, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_INPUT_FOCUSED } from 'vs/workbench/parts/html/browser/webview'; /** A context key that is set when an extension editor webview has focus. */ export const KEYBINDING_CONTEXT_EXTENSIONEDITOR_WEBVIEW_FOCUS = new RawContextKey('extensionEditorWebviewFocus', undefined); @@ -173,7 +173,7 @@ export class ExtensionEditor extends BaseEditor { private contentDisposables: IDisposable[] = []; private transientDisposables: IDisposable[] = []; private disposables: IDisposable[]; - private activeWebview: WebView; + private activeWebview: Webview; constructor( @ITelemetryService telemetryService: ITelemetryService, @@ -391,7 +391,7 @@ export class ExtensionEditor extends BaseEditor { .then(body => { const allowedBadgeProviders = this.extensionsWorkbenchService.allowedBadgeProviders; const webViewOptions = allowedBadgeProviders.length > 0 ? { allowScripts: false, allowSvgs: false, svgWhiteList: allowedBadgeProviders } : undefined; - this.activeWebview = new WebView(this.content, this.partService.getContainer(Parts.EDITOR_PART), this.contextViewService, this.contextKeyService, this.contextKey, webViewOptions); + this.activeWebview = new Webview(this.content, this.partService.getContainer(Parts.EDITOR_PART), this.contextViewService, this.contextKeyService, this.contextKey, webViewOptions); const removeLayoutParticipant = arrays.insert(this.layoutParticipants, this.activeWebview); this.contentDisposables.push(toDisposable(removeLayoutParticipant)); diff --git a/src/vs/workbench/parts/html/browser/webviewEditor.ts b/src/vs/workbench/parts/html/browser/webviewEditor.ts index f1c61fb00d0d9b830aa187b8d09511b329112525..4ed9cea9a9b3e5dd6a4772e152d7a07a6a67d0b3 100644 --- a/src/vs/workbench/parts/html/browser/webviewEditor.ts +++ b/src/vs/workbench/parts/html/browser/webviewEditor.ts @@ -14,7 +14,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import { ContextKeyExpr, IContextKey, RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; -import { default as WebView, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_INPUT_FOCUSED } from './webview'; +import { default as Webview, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_INPUT_FOCUSED } from './webview'; import { Builder } from 'vs/base/browser/builder'; export interface HtmlPreviewEditorViewState { @@ -32,7 +32,7 @@ export const KEYBINDING_CONTEXT_WEBVIEWEDITOR_NOT_FOCUSED: ContextKeyExpr = KEYB export abstract class WebviewEditor extends BaseWebviewEditor { protected _webviewFocusContextKey: IContextKey; - protected _webview: WebView; + protected _webview: Webview; protected content: HTMLElement; protected contextKey: IContextKey; diff --git a/src/vs/workbench/parts/html/browser/webviewFindWidget.ts b/src/vs/workbench/parts/html/browser/webviewFindWidget.ts index 0d95b585b41567b8e6d507c53449fe6fca4ba28a..4989018491f106b4b2f3d6fc23801ef12d565b94 100644 --- a/src/vs/workbench/parts/html/browser/webviewFindWidget.ts +++ b/src/vs/workbench/parts/html/browser/webviewFindWidget.ts @@ -6,20 +6,19 @@ import { SimpleFindWidget } from 'vs/editor/contrib/find/browser/simpleFindWidget'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey'; -import WebView from './webview'; +import Webview from './webview'; export class WebviewFindWidget extends SimpleFindWidget { constructor( @IContextViewService _contextViewService: IContextViewService, @IContextKeyService private _contextKeyService: IContextKeyService, - private webview: WebView, + private webview: Webview, private _findInputContextKey: RawContextKey ) { super(_contextViewService); this._findInputFocused = _findInputContextKey.bindTo(this._contextKeyService); - console.debug(this._findInputContextKey.keys()); this.find = this.find.bind(this); this.hide = this.hide.bind(this); this.onInputChanged = this.onInputChanged.bind(this); @@ -59,11 +58,4 @@ export class WebviewFindWidget extends SimpleFindWidget { this.webview.notifyFindWidgetFocusChanged(false); } - protected onFindInputFocusTrackerFocus() { - this._findInputFocused.set(true); - } - - protected onFindInputFocusTrackerBlur() { - this._findInputFocused.reset(); - } } \ No newline at end of file diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts index c00f5649a41c61ee0e95213ab10ea5c628574a6f..c79a19b806195be093dac53b22ad4df7b72e2e52 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts @@ -355,11 +355,11 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ShowPreviousFind actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(NextMatchTerminalFindWidgetAction, NextMatchTerminalFindWidgetAction.ID, NextMatchTerminalFindWidgetAction.LABEL, { primary: KeyCode.F3, mac: { primary: KeyMod.CtrlCmd | KeyCode.KEY_G, secondary: [KeyCode.F3] } -}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Find Next', category); +}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Find Next', category); actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(PreviousMatchTerminalFindWidgetAction, PreviousMatchTerminalFindWidgetAction.ID, PreviousMatchTerminalFindWidgetAction.LABEL, { primary: KeyMod.Shift | KeyCode.F3, mac: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_G, secondary: [KeyMod.Shift | KeyCode.F3] } -}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Find Previous', category); +}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Find Previous', category); actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(DeleteWordLeftTerminalAction, DeleteWordLeftTerminalAction.ID, DeleteWordLeftTerminalAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.Backspace, diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts index 3191af07b6f1004e66ea2f2f73e1642e64c2b321..07e44cc997019814b8a1a92900b75ae1555d7a08 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts @@ -48,11 +48,4 @@ export class TerminalFindWidget extends SimpleFindWidget { this._terminalService.getActiveInstance().notifyFindWidgetFocusChanged(false); } - protected onFindInputFocusTrackerFocus() { - this._findInputFocused.set(true); - } - - protected onFindInputFocusTrackerBlur() { - this._findInputFocused.reset(); - } } \ No newline at end of file diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts index e2f04f0569a44ce94e6936d6c2623e1b471e232e..41d0e87f1a48a38a3270bd2016712ffcfa9f7ef5 100644 --- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts +++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts @@ -14,7 +14,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { ReleaseNotesInput } from './releaseNotesInput'; import { EditorOptions } from 'vs/workbench/common/editor'; -import WebView from 'vs/workbench/parts/html/browser/webview'; +import Webview from 'vs/workbench/parts/html/browser/webview'; import { IOpenerService } from 'vs/platform/opener/common/opener'; import { IModeService } from 'vs/editor/common/services/modeService'; import { tokenizeToString } from 'vs/editor/common/modes/textToHtmlTokenizer'; @@ -95,7 +95,7 @@ export class ReleaseNotesEditor extends WebviewEditor { }) .then(renderBody) .then(body => { - this._webview = new WebView(this.content, this.partService.getContainer(Parts.EDITOR_PART), this._contextViewService, this._contextKeyService, this.contextKey); + this._webview = new Webview(this.content, this.partService.getContainer(Parts.EDITOR_PART), this._contextViewService, this._contextKeyService, this.contextKey); if (this.input && this.input instanceof ReleaseNotesInput) { const state = this.loadViewState(this.input.version);