Skip to content

Implemented a "word wrap" option. #88

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

Open
YellowAfterlife wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Implemented a "word wrap" option. #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 21 additions & 11 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,30 +74,40 @@ body {
-webkit-font-smoothing: subpixel-antialiased;
}

pre {
.hljs {
counter-reset: lines;
word-wrap: normal !important;
white-space: pre !important;
font-family: inherit;
line-height: normal;
outline: none;
cursor: text;
display: block;
overflow: visible;
}
.hljs:not(.word-wrap) {
word-wrap: normal !important;
white-space: pre !important;
}

pre .line {
.hljs .line-number {
counter-increment: lines;
-webkit-user-select: none;
border-right: solid 1px;
color: #BBB;
padding-right: 0.5em;
min-width: 2em;
text-align: right;
}

pre .line::before {
.hljs .line-number::before {
content: counter(lines);
text-align: right;
display: inline-block;
width: 2em;
padding-right: 0.5em;
margin-right: 0.5em;
color: #BBB;
border-right: solid 1px;
}

.hljs .line-content {
padding-left: 0.5em;
word-wrap: normal;
white-space: pre;
}
.hljs.word-wrap .line-content {
white-space: pre-wrap;
}
26 changes: 16 additions & 10 deletions js/background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@
theme: 'sunburst',
font: 'Inconsolata',
fontSize: 'medium',
lineNumbers: true
lineNumbers: true,
wordWrap: false
};

const OPTIONS = Object.keys(OPTIONS_DEFAULTS);
Expand Down Expand Up @@ -135,14 +136,19 @@
EXT_LANG_MAP[filename];
}

function getHighlightingCode(font, fontSize, lineNumbers, language) {
return 'document.body.style.fontFamily = "' + font + '";' +
'document.body.style.fontSize = "' + fontSize + '";' +
'var container = document.querySelector("pre");' +
'container.classList.add("' + language + '");' +
'hljs.configure({ lineNumbers: ' + lineNumbers + ' });' +
'hljs.highlightBlock(container);' +
'document.body.style.backgroundColor = getComputedStyle(container).backgroundColor;';
function getHighlightingCode(font, fontSize, lineNumbers, wordWrap, language) {
return 'document.body.style.fontFamily = "' + font + '";\n' +
'document.body.style.fontSize = "' + fontSize + '";\n' +
'var container = document.querySelector("pre");\n' +
'container.classList.add("' + language + '");\n' +
'if (' + wordWrap + ') container.classList.add("word-wrap");\n'+
'hljs.highlightBlock(container);\n' +
'var containerStyle = getComputedStyle(container);\n' +
'if (' + lineNumbers + ') container.innerHTML = "<table style=\'color:inherit\'>" + container.innerHTML' +
'.replace(/^(.*)$/gm, function(_, line) {\n' +
' return \'<tr><td class="line-number"></td><td class="line-content">\' + line + \'</td></tr>\';\n' +
'}) + "</table>";\n' +
'document.body.style.backgroundColor = containerStyle.backgroundColor;';
}

const JS_BEUTIFY_CODE =
Expand Down Expand Up @@ -179,7 +185,7 @@
}

scripts.push({
code: getHighlightingCode.apply(this, ['font', 'fontSize', 'lineNumbers'].
code: getHighlightingCode.apply(this, ['font', 'fontSize', 'lineNumbers', 'wordWrap'].
map(localStorage.getItem.bind(localStorage)).concat(language))
});

Expand Down
18 changes: 17 additions & 1 deletion js/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,25 @@
decode: eq('true'),
render: function(value) {
var codeEl = doc.getElementById('code');
hljs.configure({ lineNumbers: value });
codeEl.innerHTML = codeEl.textContent;
hljs.highlightBlock(codeEl);
if (value) {
codeEl.innerHTML = '<table style="color:inherit">' +
codeEl.innerHTML.replace(/^(.*)$/gm, function(_, line) {
return '<tr><td class="line-number"></td><td class="line-content">' + line + '</td></tr>';
}) + "</table>";
}
}
},
wordWrap: {
selector: '#word-wrap',
value: 'checked',
decode: eq('true'),
render: function(value) {
var codeEl = doc.getElementById('code');
if (value) {
codeEl.classList.add("word-wrap");
} else codeEl.classList.remove("word-wrap");
}
}
};
Expand Down
1 change: 1 addition & 0 deletions options.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ <h3>Select your font size</h3>
<option value="xx-large">xx-large</option>
</select>
<h3>Line numbers:<input id="line-numbers" type="checkbox"></h3>
<h3>Word wrap:<input id="word-wrap" type="checkbox"></h3>
<pre id="code" class="go">
package main

Expand Down