Skip to content

Commit

Permalink
[WebUI] Update map editor
Browse files Browse the repository at this point in the history
CodeJar 3.7.0 -> 4.2.0
  • Loading branch information
moisseev committed Oct 27, 2023
1 parent d2f250a commit 4c2688b
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 14 deletions.
1 change: 1 addition & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"**/*.min.css",
"**/*.js",
"interface/css/d3evolution.css",
"interface/css/codejar-linenumbers.css",
"interface/css/nprogress.css",
"interface/css/prism.css"
],
Expand Down
17 changes: 17 additions & 0 deletions interface/css/codejar-linenumbers.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
.codejar-linenumbers-inner-wrap {
position: absolute;
top: 0px;
left: 0px;
bottom: 0px;
overflow: hidden;
}

.codejar-linenumbers {
mix-blend-mode: initial;
height: 100%;
}

.codejar-linenumber {
position: relative;
top: 0px;
}
10 changes: 5 additions & 5 deletions interface/css/rspamd.css
Original file line number Diff line number Diff line change
Expand Up @@ -548,15 +548,15 @@ table#symbolsTable input[type="number"] {
/* Fix line wrapping */
scrollbar-width: thin;
}
.codejar-linenumbers-inner-wrap {
bottom: unset;
}
.codejar-linenumbers {
background: rgba(255 255 255 / 0.07) !important;
bottom: unset !important;
}
.codejar-linenumber {
color: rgba(120 120 120 / 1) !important;
height: inherit;
mix-blend-mode: unset !important;
text-align: right;
overflow: unset !important;
user-select: none;
}
.editor {
font-family: monospace;
Expand Down
1 change: 1 addition & 0 deletions interface/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<link rel="stylesheet" type="text/css" href="./css/d3evolution.css">
<link rel="stylesheet" type="text/css" href="./css/d3pie.css">
<link rel="stylesheet" type="text/css" href="./css/nprogress.css"/>
<link rel="stylesheet" type="text/css" href="./css/codejar-linenumbers.css"/>
<link rel="stylesheet" type="text/css" href="./css/prism.css"/>
<link href="./css/rspamd.css" rel="stylesheet">
</head>
Expand Down
4 changes: 3 additions & 1 deletion interface/js/app/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,16 @@ define(["jquery", "codejar", "linenumbers", "prism"],
mode = (new Blob([data[0].data]).size > 5120) ? "basic" : $("input[name=editorMode]:checked").val();

$("<" + editor[mode].elt + ' id="editor" class="' + editor[mode].class + '" data-id="' + item.map + '">' +
rspamd.escapeHTML(data[0].data) +
"</" + editor[mode].elt + ">").appendTo("#modalBody");

if (editor[mode].codejar) {
jar = new CodeJar(
document.querySelector("#editor"),
withLineNumbers((el) => Prism.highlightElement(el))
);
jar.updateCode(data[0].data);
} else {
document.querySelector("#editor").innerHTML = rspamd.escapeHTML(data[0].data);
}

var icon = "fa-edit";
Expand Down
6 changes: 6 additions & 0 deletions interface/js/lib/codejar-linenumbers.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions interface/js/lib/codejar.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions interface/js/lib/linenumbers.min.js

This file was deleted.

2 changes: 1 addition & 1 deletion interface/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ requirejs.config({
fontawesome: "fontawesome.min",
fontawesome_solid: "solid.min",
footable: "footable.min",
linenumbers: "linenumbers.min",
linenumbers: "codejar-linenumbers.min",
nprogress: "nprogress.min",
prism: "prism",
stickytabs: "jquery.stickytabs.min"
Expand Down

0 comments on commit 4c2688b

Please sign in to comment.