Fix for #348 (Indent broken with CodeMirror v5.48).

CodeMirror added line styles that conflict with ours. Added more specific CSS selectors as a workaround.
FirebaseExtended · Jan 18, 2020 · b7aa36d · b7aa36d
1 parent 5231f92
commit b7aa36d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1 +1 @@
-
+* Fix indentation issue with CodeMirror 5.48 or newer.
diff --git a/lib/firepad.css b/lib/firepad.css
@@ -76,7 +76,8 @@
 .firepad-la-right { text-align: right; }
 
 /** Line Styles */
-pre.firepad-lt-o, pre.firepad-lt-u, pre.firepad-lt-t, pre.firepad-lt-tc {
+pre.firepad-lt-o, pre.firepad-lt-u, pre.firepad-lt-t, pre.firepad-lt-tc,
+pre.CodeMirror-line.firepad-lt-o, pre.CodeMirror-line.firepad-lt-u, pre.CodeMirror-line.firepad-lt-t, pre.CodeMirror-line.firepad-lt-tc {
   padding-left: 40px;
 }
 

diff --git a/lib/rich-text-codemirror.js b/lib/rich-text-codemirror.js
@@ -420,6 +420,13 @@ firepad.RichTextCodeMirror = (function () {
                   '.' + className;
 
               this.addStyleWithCSS_(selector + ' { ' + css + ' }');
+
+              // As of v5.48, CodeMirror applies its own pre style which conflicts with ours, so we
+              // need to make sure we add our styles with a more-specific css selector as well.
+              if (attr === ATTR.LINE_INDENT) {
+                var selector = 'pre.CodeMirror-line.' + className;
+                this.addStyleWithCSS_(selector + ' { ' + css + ' }');
+              }
             }
           }
         }