Skip to content

Commit 13b8c0b

Browse files
zeripathlafriks
andauthored
Switch from SimpleMDE to EasyMDE (#13333)
* Switch from SimpleMDE to EasyMDE Signed-off-by: Andrew Thornton <[email protected]> * use webpack to webpack the easymde css Signed-off-by: Andrew Thornton <[email protected]> * move css to only css Signed-off-by: Andrew Thornton <[email protected]> * move loading codemirror modes and addons back in to footer.tmpl Signed-off-by: Andrew Thornton <[email protected]> * Fix arc-green Signed-off-by: Andrew Thornton <[email protected]> * as per @silverwind * reinstall codemirror Signed-off-by: Andrew Thornton <[email protected]> Co-authored-by: Lauris BH <[email protected]>
1 parent 21d4963 commit 13b8c0b

File tree

11 files changed

+53
-48
lines changed

11 files changed

+53
-48
lines changed

package-lock.json

Lines changed: 33 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
"add-asset-webpack-plugin": "1.0.0",
1515
"babel-loader": "8.1.0",
1616
"clipboard": "2.0.6",
17+
"codemirror": "5.58.2",
1718
"core-js": "3.7.0",
1819
"css-loader": "5.0.1",
1920
"css-minimizer-webpack-plugin": "1.1.5",
2021
"dropzone": "5.7.2",
22+
"easymde": "2.12.1",
2123
"escape-goat": "3.0.0",
2224
"fast-glob": "3.2.4",
2325
"file-loader": "6.2.0",

public/vendor/plugins/simplemde/LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

public/vendor/plugins/simplemde/simplemde.min.css

Lines changed: 0 additions & 7 deletions
This file was deleted.

public/vendor/plugins/simplemde/simplemde.min.js

Lines changed: 0 additions & 14 deletions
This file was deleted.

templates/base/footer.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
{{template "base/footer_content" .}}
1414
{{if .RequireSimpleMDE}}
15-
<script src="{{StaticUrlPrefix}}/vendor/plugins/simplemde/simplemde.min.js"></script>
15+
<script src="{{StaticUrlPrefix}}/js/easymde.js?v={{MD5 AppVer}}"></script>
1616
<script src="{{StaticUrlPrefix}}/vendor/plugins/codemirror/addon/mode/loadmode.js"></script>
1717
<script src="{{StaticUrlPrefix}}/vendor/plugins/codemirror/mode/meta.js"></script>
1818
<script>

templates/base/head.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<link rel="mask-icon" href="{{StaticUrlPrefix}}/img/gitea-safari.svg" color="#609926">
6565
<link rel="fluid-icon" href="{{StaticUrlPrefix}}/img/gitea-lg.png" title="{{AppName}}">
6666
{{if .RequireSimpleMDE}}
67-
<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/simplemde/simplemde.min.css">
67+
<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/easymde.css?v={{MD5 AppVer}}">
6868
{{end}}
6969
<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/index.css?v={{MD5 AppVer}}">
7070
<noscript>

web_src/js/easymde.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import EasyMDE from 'easymde';
2+
3+
import CodeMirror from 'codemirror/lib/codemirror.js';
4+
5+
window.EasyMDE = EasyMDE;
6+
window.SimpleMDE = EasyMDE;
7+
window.CodeMirror = CodeMirror;
8+

web_src/less/_editor.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
opacity: 1 !important;
3030
}
3131

32-
.editor-toolbar a:not(:hover) {
32+
.editor-toolbar button:not(:hover) {
3333
background-color: transparent !important;
3434
}
3535

web_src/less/themes/theme-arc-green.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1784,12 +1784,12 @@ a.ui.labels .label:hover {
17841784
border-right-color: var(--color-secondary) !important;
17851785
}
17861786

1787-
.editor-toolbar a {
1787+
.editor-toolbar button {
17881788
color: #87ab63 !important;
17891789
}
17901790

1791-
.editor-toolbar a.active,
1792-
.editor-toolbar a:hover {
1791+
.editor-toolbar button.active,
1792+
.editor-toolbar button:hover {
17931793
background: #2a2e3a;
17941794
border-color: transparent;
17951795
}

webpack.config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ module.exports = {
5757
'eventsource.sharedworker': [
5858
resolve(__dirname, 'web_src/js/features/eventsource.sharedworker.js'),
5959
],
60+
'easymde': [
61+
resolve(__dirname, 'web_src/js/easymde.js'),
62+
resolve(__dirname, 'node_modules/easymde/dist/easymde.min.css'),
63+
],
6064
...themes,
6165
},
6266
devtool: false,

0 commit comments

Comments
 (0)