Skip to content

Fix font-family not loading correctly #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 24, 2019
Merged

Fix font-family not loading correctly #121

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c8f1c46
fix font-family
kufii Sep 11, 2019
8e0d3df
double quote
kufii Sep 11, 2019
187ebc2
fix eol
kufii Sep 11, 2019
a2ab7e6
format
kufii Sep 11, 2019
350cedc
format
kufii Sep 11, 2019
1b8f598
Re add meta
kufii Sep 11, 2019
87a0d00
minor cleanup
kufii Sep 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions webview/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
let target = 'container'
let transparentBackground = false
let backgroundColor = '#f2f2f2'
let fontFamily

vscode.postMessage({
type: 'getAndUpdateCacheAndSettings'
Expand All @@ -14,14 +15,15 @@
const obturateur = document.getElementById('save')

snippetContainerNode.style.opacity = '1'
const oldState = vscode.getState();
const oldState = vscode.getState()
if (oldState && oldState.innerHTML) {
snippetNode.innerHTML = oldState.innerHTML
}

const getInitialHtml = fontFamily => {
const getInitialHtml = ff => {
const cameraWithFlashEmoji = String.fromCodePoint(128248)
const monoFontStack = `${fontFamily},SFMono-Regular,Consolas,DejaVu Sans Mono,Ubuntu Mono,Liberation Mono,Menlo,Courier,monospace`
const monoFontStack = `${ff},SFMono-Regular,Consolas,DejaVu Sans Mono,Ubuntu Mono,Liberation Mono,Menlo,Courier,monospace`
fontFamily = monoFontStack
return `<meta charset="utf-8"><div style="color: #d8dee9;background-color: #2e3440; font-family: ${monoFontStack};font-weight: normal;font-size: 12px;line-height: 18px;white-space: pre;"><div><span style="color: #8fbcbb;">console</span><span style="color: #eceff4;">.</span><span style="color: #88c0d0;">log</span><span style="color: #d8dee9;">(</span><span style="color: #eceff4;">'</span><span style="color: #a3be8c;">0. Run command \`Polacode ${cameraWithFlashEmoji}\`</span><span style="color: #eceff4;">'</span><span style="color: #d8dee9;">)</span></div><div><span style="color: #8fbcbb;">console</span><span style="color: #eceff4;">.</span><span style="color: #88c0d0;">log</span><span style="color: #d8dee9;">(</span><span style="color: #eceff4;">'</span><span style="color: #a3be8c;">1. Copy some code</span><span style="color: #eceff4;">'</span><span style="color: #d8dee9;">)</span></div><div><span style="color: #8fbcbb;">console</span><span style="color: #eceff4;">.</span><span style="color: #88c0d0;">log</span><span style="color: #d8dee9;">(</span><span style="color: #eceff4;">'</span><span style="color: #a3be8c;">2. Paste into Polacode view</span><span style="color: #eceff4;">'</span><span style="color: #d8dee9;">)</span></div><div><span style="color: #8fbcbb;">console</span><span style="color: #eceff4;">.</span><span style="color: #88c0d0;">log</span><span style="color: #d8dee9;">(</span><span style="color: #eceff4;">'</span><span style="color: #a3be8c;">3. Click the button ${cameraWithFlashEmoji}</span><span style="color: #eceff4;">'</span><span style="color: #d8dee9;">)</span></div></div></div>`
}

Expand Down Expand Up @@ -61,7 +63,7 @@
}
function getSnippetBgColor(html) {
const match = html.match(/background-color: (#[a-fA-F0-9]+)/)
return match ? match[1] : undefined;
return match ? match[1] : undefined
}

function updateEnvironment(snippetBgColor) {
Expand Down Expand Up @@ -102,7 +104,10 @@
}

document.addEventListener('paste', e => {
const innerHTML = e.clipboardData.getData('text/html')
const div = document.createElement('div')
div.innerHTML = e.clipboardData.getData('text/html')
div.querySelector('div').style.fontFamily = fontFamily
const innerHTML = div.innerHTML

const code = e.clipboardData.getData('text/plain')
const minIndent = getMinIndent(code)
Expand All @@ -129,7 +134,7 @@

obturateur.addEventListener('click', () => {
if (target === 'container') {
shootAll()
shootAll()
} else {
shootSnippet()
}
Expand Down Expand Up @@ -228,7 +233,6 @@
} else {
snippetContainerNode.style.background = 'none'
}

} else if (e.data.type === 'update') {
document.execCommand('paste')
} else if (e.data.type === 'restore') {
Expand All @@ -253,10 +257,10 @@
})()

function getRgba(hex, transparentBackground) {
const bigint = parseInt(hex.slice(1), 16);
const r = (bigint >> 16) & 255;
const g = (bigint >> 8) & 255;
const b = bigint & 255;
const bigint = parseInt(hex.slice(1), 16)
const r = (bigint >> 16) & 255
const g = (bigint >> 8) & 255
const b = bigint & 255
const a = transparentBackground ? 0 : 1
return `rgba(${r}, ${g}, ${b}, ${a})`
}
}