提交 6cceb4ea 编写于 作者: M Matt Bierner

Remove enabled setting and try to open simple browser to side of current editor

上级 1e3a23b4
...@@ -3,11 +3,12 @@ ...@@ -3,11 +3,12 @@
* Licensed under the MIT License. See License.txt in the project root for license information. * Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
import { URL } from 'url';
import * as vscode from 'vscode'; import * as vscode from 'vscode';
import * as nls from 'vscode-nls'; import * as nls from 'vscode-nls';
import { SimpleBrowserManager } from './simpleBrowserManager'; import { SimpleBrowserManager } from './simpleBrowserManager';
declare const URL: typeof import('url').URL;
const localize = nls.loadMessageBundle(); const localize = nls.loadMessageBundle();
const openApiCommand = 'simpleBrowser.api.open'; const openApiCommand = 'simpleBrowser.api.open';
...@@ -47,11 +48,6 @@ export function activate(context: vscode.ExtensionContext) { ...@@ -47,11 +48,6 @@ export function activate(context: vscode.ExtensionContext) {
context.subscriptions.push(vscode.window.registerExternalUriOpener(openerId, ['http', 'https'], { context.subscriptions.push(vscode.window.registerExternalUriOpener(openerId, ['http', 'https'], {
canOpenExternalUri(uri: vscode.Uri) { canOpenExternalUri(uri: vscode.Uri) {
const configuration = vscode.workspace.getConfiguration('simpleBrowser');
if (!configuration.get('opener.enabled', false)) {
return vscode.ExternalUriOpenerPriority.None;
}
const originalUri = new URL(uri.toString()); const originalUri = new URL(uri.toString());
if (enabledHosts.has(originalUri.hostname)) { if (enabledHosts.has(originalUri.hostname)) {
return isWeb() return isWeb()
...@@ -62,7 +58,9 @@ export function activate(context: vscode.ExtensionContext) { ...@@ -62,7 +58,9 @@ export function activate(context: vscode.ExtensionContext) {
return vscode.ExternalUriOpenerPriority.None; return vscode.ExternalUriOpenerPriority.None;
}, },
openExternalUri(resolveUri: vscode.Uri) { openExternalUri(resolveUri: vscode.Uri) {
return manager.show(resolveUri.toString()); return manager.show(resolveUri.toString(), {
viewColumn: vscode.window.activeTextEditor ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active
});
} }
}, { }, {
label: localize('openTitle', "Open in simple browser"), label: localize('openTitle', "Open in simple browser"),
......
...@@ -32,7 +32,7 @@ export class SimpleBrowserView extends Disposable { ...@@ -32,7 +32,7 @@ export class SimpleBrowserView extends Disposable {
super(); super();
this._webviewPanel = this._register(vscode.window.createWebviewPanel(SimpleBrowserView.viewType, SimpleBrowserView.title, { this._webviewPanel = this._register(vscode.window.createWebviewPanel(SimpleBrowserView.viewType, SimpleBrowserView.title, {
viewColumn: vscode.ViewColumn.Active, viewColumn: showOptions?.viewColumn ?? vscode.ViewColumn.Active,
preserveFocus: showOptions?.preserveFocus preserveFocus: showOptions?.preserveFocus
}, { }, {
enableScripts: true, enableScripts: true,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册