Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove use of innerHTML to please Firefox validator (see https://github.com/codemirror/CodeMirror/pull/5313)

This commit is contained in:
Raymond Hill 2018-03-17 08:58:55 -04:00
parent e26e70ad4e
commit d29b40991a
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/codemirror/addon/merge/merge.css vendored
View File

@ -48,6 +48,12 @@
color: #555; color: #555;
line-height: 1; line-height: 1;
} }
.CodeMirror-merge-scrolllock:after {
content: "\21db\00a0\00a0\21da";
}
.CodeMirror-merge-scrolllock.CodeMirror-merge-scrolllock-enabled:after {
content: "\21db\21da";
}
.CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right { .CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
position: absolute; position: absolute;

2
src/lib/codemirror/addon/merge/merge.js vendored
View File

@ -211,7 +211,7 @@
function setScrollLock(dv, val, action) { function setScrollLock(dv, val, action) {
dv.lockScroll = val; dv.lockScroll = val;
if (val && action != false) syncScroll(dv, DIFF_INSERT) && makeConnections(dv); if (val && action != false) syncScroll(dv, DIFF_INSERT) && makeConnections(dv);
dv.lockButton.innerHTML = val ? "\u21db\u21da" : "\u21db  \u21da"; (val ? CodeMirror.addClass : CodeMirror.rmClass)(dv.lockButton, "CodeMirror-merge-scrolllock-enabled");
} }
// Updating the marks for editor content // Updating the marks for editor content