From 0185e327ab33d93d039e89ac19f338efcd9c05c8 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 23 Mar 2017 22:31:43 -0700
Subject: [PATCH] Extract markdown preview strings to constant

---
 extensions/markdown/src/previewContentProvider.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/extensions/markdown/src/previewContentProvider.ts b/extensions/markdown/src/previewContentProvider.ts
index 486faf5100d..0b60857b1b1 100644
--- a/extensions/markdown/src/previewContentProvider.ts
+++ b/extensions/markdown/src/previewContentProvider.ts
@@ -16,6 +16,12 @@ export interface ContentSecurityPolicyArbiter {
 	isEnhancedSecurityDisableForWorkspace(): boolean;
 }
 
+const previewStrings = {
+	cspAlertMessageText: localize('preview.securityMessage.text', 'Scripts have been disabled in this document'),
+	cspAlertMessageTitle: localize('preview.securityMessage.title', 'Scripts are disabled in the markdown preview. Change the Markdown preview secuirty setting to enable scripts'),
+	cspAlertMessageLabel: localize('preview.securityMessage.label', 'Scripts Disabled Security Warning')
+};
+
 export function isMarkdownFile(document: vscode.TextDocument) {
 	return document.languageId === 'markdown'
 		&& document.uri.scheme !== 'markdown'; // prevent processing of own documents
@@ -132,7 +138,7 @@ export class MDDocumentContentProvider implements vscode.TextDocumentContentProv
 
 			let initialLine = 0;
 			const editor = vscode.window.activeTextEditor;
-			if (editor && editor.document.uri.path === sourceUri.path) {
+			if (editor && editor.document.uri.fsPath === sourceUri.fsPath) {
 				initialLine = editor.selection.active.line;
 			}
 
@@ -145,12 +151,6 @@ export class MDDocumentContentProvider implements vscode.TextDocumentContentProv
 				doubleClickToSwitchToEditor: !!markdownConfig.get('preview.doubleClickToSwitchToEditor', true),
 			};
 
-			const previewStrings = {
-				cspAlertMessageText: localize('preview.securityMessage.text', 'Scripts have been disabled in this document'),
-				cspAlertMessageTitle: localize('preview.securityMessage.title', 'Scripts are disabled in the markdown preview. Change the Markdown preview secuirty setting to enable scripts'),
-				cspAlertMessageLabel: localize('preview.securityMessage.label', 'Scripts Disabled Security Warning')
-			};
-
 			// Content Security Policy
 			const nonce = new Date().getTime() + '' + new Date().getMilliseconds();
 			let csp = `<meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src 'self' http: https: data:; media-src 'self' http: https: data:; child-src 'none'; script-src 'nonce-${nonce}'; style-src 'self' 'unsafe-inline' http: https: data:; font-src 'self' http: https: data:;">`;
-- 
GitLab