Commit3a2c087

authored

Merge pull requestcoderoad#18 from ShMcK/fix/issues

Fix/issues

2 parents854ced0 +8f16421 commit3a2c087Copy full SHA for 3a2c087

File tree

2 files changed

+20

-20

lines changed

src/editor
- ReactWebView.ts
web-app/src
- App.tsx

2 files changed

+20

-20

lines changed

`‎src/editor/ReactWebView.ts`

Lines changed: 20 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,17 +43,19 @@ class ReactWebView {`
`43`	`43`	`orientation:0,`
`44`	`44`	`groups:[{groups:[{}],size:0.6},{groups:[{}],size:0.4}],`
`45`	`45`	`})`
`46`		`-this.panel.reveal(vscode.ViewColumn.Two)`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	`// prevents new panels from going ontop of coderoad panel`
`50`		`-vscode.window.onDidChangeActiveTextEditor(param=>{`
`51`		`-if(!param\|\|param.viewColumn!==vscode.ViewColumn.Two){`
	`49`	`+vscode.window.onDidChangeActiveTextEditor((textEditor)=>{`
	`50`	`+console.log('onDidChangeActiveTextEditor')`
	`51`	`+console.log(textEditor)`
	`52`	`+if(!textEditor\|\|textEditor.viewColumn!==vscode.ViewColumn.Two){`
`52`	`53`	`updateWindows()`
`53`	`54`	`}`
`54`	`55`	`})`
`55`	`56`	`// // prevents moving coderoad panel on top of left panel`
`56`		`-vscode.window.onDidChangeVisibleTextEditors(param=>{`
	`57`	`+vscode.window.onDidChangeVisibleTextEditors((textEditor)=>{`
	`58`	`+console.log('onDidChangeVisibleTextEditors')`
`57`	`59`	`updateWindows()`
`58`	`60`	`})`
`59`	`61`
`@@ -144,29 +146,29 @@ class ReactWebView {`
`144`	`146`	`const[n1,n2,n3]=[1,2,3].map(this.getNonce)`
`145`	`147`
`146`	`148`	return`<!DOCTYPE html>
`147`		`-<html lang="en">`
	`149`	`+<html lang='en'>`
`148`	`150`	`<head>`
`149`		`- <meta charset="utf-8">`
`150`		`- <meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">`
`151`		`- <meta name="theme-color" content="#000000">`
	`151`	`+ <meta charset='utf-8'>`
	`152`	`+ <meta name='viewport' content='width=device-width,initial-scale=1,shrink-to-fit=no'>`
	`153`	`+ <meta name='theme-color' content='#000000'>`
`152`	`154`	`<title>React App</title>`
`153`		`- <link rel="manifest" href="./manifest.json" />`
	`155`	`+ <link rel='manifest' href='./manifest.json' />`
`154`	`156`	`<!-- TODO: load styles through package -->`
`155`		`- <link rel="stylesheet" href="https://unpkg.com/@alifd/next/dist/next.css" />`
`156`		`- <link rel="stylesheet" type="text/css" href="${styleUri}">`
`157`		`- <meta http-equiv="Content-Security-Policy" content="default-src'none'; img-src vscode-resource: https:; script-src 'nonce-${n1}' 'nonce-${n2}' 'nonce-${n3}'; style-src vscode-resource: 'unsafe-inline' http: https: data:;">`
`158`		`- <base href="${vscode.Uri.file(path.join(this.extensionPath,'build')).with({`
	`157`	`+ <link rel='stylesheet' href='https://unpkg.com/@alifd/next/dist/next.css' />`
	`158`	`+ <link rel='stylesheet' type='text/css' href='${styleUri}'>`
	`159`	`+ <meta http-equiv='Content-Security-Policy' content="font-src*; img-src vscode-resource: https:; script-src 'nonce-${n1}' 'nonce-${n2}' 'nonce-${n3}'; style-src vscode-resource: 'unsafe-inline' http: https: data:;">`
	`160`	`+ <base href='${vscode.Uri.file(path.join(this.extensionPath,'build')).with({`
`159`	`161`	`scheme:'vscode-resource',`
`160`		`-})}/">`
	`162`	`+})}/'>`
`161`	`163`	`<style></style>`
`162`	`164`	`</head>`
`163`	`165`
`164`	`166`	`<body>`
`165`	`167`	`<noscript>You need to enable JavaScript to run this app.</noscript>`
`166`		`- <div id="root">Loading...</div>`
`167`		`- <script nonce=${n1} src="./webpackBuild.js"></script>`
`168`		`- <script nonce=${n2} src="${chunkUri}"></script>`
`169`		`- <script nonce="${n3}" src="${scriptUri}"></script>`
	`168`	`+ <div id='root'>Loading...</div>`
	`169`	`+ <script nonce=${n1} src='./webpackBuild.js'></script>`
	`170`	`+ <script nonce=${n2} src='${chunkUri}'></script>`
	`171`	`+ <script nonce='${n3}' src='${scriptUri}'></script>`
`170`	`172`	`</body>`
`171`	`173`	</html>`
`172`	`174`	`}`

`‎web-app/src/App.tsx`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ const App = () => {`
`17`	`17`	`// update state based on response from editor`
`18`	`18`	`consthandleEvent=(event:ReceivedEvent):void=>{`
`19`	`19`	`constmessage=event.data`
`20`		`-console.log('RECEIVED')`
`21`		`-console.log(message)`
`22`	`20`	`// messages from core`
`23`	`21`	`if(message.type==='SET_STATE'){`
`24`	`22`	`setState(message.payload.state)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit3a2c087

File tree

2 files changed

2 files changed

`‎src/editor/ReactWebView.ts`

`‎web-app/src/App.tsx`

0 commit comments