From 944ff929a1d79777bfe9caf4d96f83dfb68ad39e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 17 Oct 2016 21:04:19 +0200
Subject: [PATCH] Fix accidentally removed semicolon that broke the style of
line gutter backgrounds
And don't put indentation in css strings.
Issue #4312
---
src/measurement/update_line.js | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/measurement/update_line.js b/src/measurement/update_line.js
index cbfa657b..007eba7f 100644
--- a/src/measurement/update_line.js
+++ b/src/measurement/update_line.js
@@ -95,15 +95,13 @@ function updateLineGutter(cm, lineView, lineN, dims) {
if (lineView.line.gutterClass) {
let wrap = ensureLineWrapped(lineView)
lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
- `left: ${cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth}px
- width: ${dims.gutterTotalWidth}px`)
+ `left: ${cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth}px; width: ${dims.gutterTotalWidth}px`)
wrap.insertBefore(lineView.gutterBackground, lineView.text)
}
let markers = lineView.line.gutterMarkers
if (cm.options.lineNumbers || markers) {
let wrap = ensureLineWrapped(lineView)
- let gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", `left:
- ${cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth}px`)
+ let gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", `left: ${cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth}px`)
cm.display.input.setUneditable(gutterWrap)
wrap.insertBefore(gutterWrap, lineView.text)
if (lineView.line.gutterClass)
@@ -112,8 +110,7 @@ function updateLineGutter(cm, lineView, lineN, dims) {
lineView.lineNumber = gutterWrap.appendChild(
elt("div", lineNumberFor(cm.options, lineN),
"CodeMirror-linenumber CodeMirror-gutter-elt",
- `left: ${dims.gutterLeft["CodeMirror-linenumbers"]}px;
- width: ${cm.display.lineNumInnerWidth}px`))
+ `left: ${dims.gutterLeft["CodeMirror-linenumbers"]}px; width: ${cm.display.lineNumInnerWidth}px`))
if (markers) for (let k = 0; k < cm.options.gutters.length; ++k) {
let id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id]
if (found)
--
GitLab