Skip to content

Commit 3338246

Browse files
committed
Load EasyMDE/CodeMirror dynamically, remove RequireEasyMDE
1 parent 62dcf1a commit 3338246

16 files changed

+254
-230
lines changed

routers/web/repo/commit.go

-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ func FileHistory(ctx *context.Context) {
254254
func Diff(ctx *context.Context) {
255255
ctx.Data["PageIsDiff"] = true
256256
ctx.Data["RequireHighlightJS"] = true
257-
ctx.Data["RequireEasyMDE"] = true
258257
ctx.Data["RequireTribute"] = true
259258

260259
userName := ctx.Repo.Owner.Name

routers/web/repo/compare.go

-1
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,6 @@ func CompareDiff(ctx *context.Context) {
760760
ctx.Data["IsRepoToolbarCommits"] = true
761761
ctx.Data["IsDiffCompare"] = true
762762
ctx.Data["RequireTribute"] = true
763-
ctx.Data["RequireEasyMDE"] = true
764763
setTemplateIfExists(ctx, pullRequestTemplateKey, nil, pullRequestTemplateCandidates)
765764
ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled
766765
upload.AddUploadContext(ctx, "comment")

routers/web/repo/editor.go

-4
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ func editFile(ctx *context.Context, isNewFile bool) {
6969
ctx.Data["PageIsEdit"] = true
7070
ctx.Data["IsNewFile"] = isNewFile
7171
ctx.Data["RequireHighlightJS"] = true
72-
ctx.Data["RequireEasyMDE"] = true
7372
canCommit := renderCommitRights(ctx)
7473

7574
treePath := cleanUploadFileName(ctx.Repo.TreePath)
@@ -200,7 +199,6 @@ func editFilePost(ctx *context.Context, form forms.EditRepoFileForm, isNewFile b
200199
ctx.Data["PageHasPosted"] = true
201200
ctx.Data["IsNewFile"] = isNewFile
202201
ctx.Data["RequireHighlightJS"] = true
203-
ctx.Data["RequireEasyMDE"] = true
204202
ctx.Data["TreePath"] = form.TreePath
205203
ctx.Data["TreeNames"] = treeNames
206204
ctx.Data["TreePaths"] = treePaths
@@ -544,7 +542,6 @@ func DeleteFilePost(ctx *context.Context) {
544542
func UploadFile(ctx *context.Context) {
545543
ctx.Data["PageIsUpload"] = true
546544
ctx.Data["RequireTribute"] = true
547-
ctx.Data["RequireEasyMDE"] = true
548545
upload.AddUploadContext(ctx, "repo")
549546
canCommit := renderCommitRights(ctx)
550547
treePath := cleanUploadFileName(ctx.Repo.TreePath)
@@ -580,7 +577,6 @@ func UploadFilePost(ctx *context.Context) {
580577
form := web.GetForm(ctx).(*forms.UploadRepoFileForm)
581578
ctx.Data["PageIsUpload"] = true
582579
ctx.Data["RequireTribute"] = true
583-
ctx.Data["RequireEasyMDE"] = true
584580
upload.AddUploadContext(ctx, "repo")
585581
canCommit := renderCommitRights(ctx)
586582

routers/web/repo/issue.go

-3
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,6 @@ func NewIssue(ctx *context.Context) {
789789
ctx.Data["PageIsIssueList"] = true
790790
ctx.Data["NewIssueChooseTemplate"] = len(ctx.IssueTemplatesFromDefaultBranch()) > 0
791791
ctx.Data["RequireHighlightJS"] = true
792-
ctx.Data["RequireEasyMDE"] = true
793792
ctx.Data["RequireTribute"] = true
794793
ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes
795794
title := ctx.FormString("title")
@@ -962,7 +961,6 @@ func NewIssuePost(ctx *context.Context) {
962961
ctx.Data["PageIsIssueList"] = true
963962
ctx.Data["NewIssueChooseTemplate"] = len(ctx.IssueTemplatesFromDefaultBranch()) > 0
964963
ctx.Data["RequireHighlightJS"] = true
965-
ctx.Data["RequireEasyMDE"] = true
966964
ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes
967965
ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled
968966
upload.AddUploadContext(ctx, "comment")
@@ -1147,7 +1145,6 @@ func ViewIssue(ctx *context.Context) {
11471145

11481146
ctx.Data["RequireHighlightJS"] = true
11491147
ctx.Data["RequireTribute"] = true
1150-
ctx.Data["RequireEasyMDE"] = true
11511148
ctx.Data["IsProjectsEnabled"] = ctx.Repo.CanRead(unit.TypeProjects)
11521149
ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled
11531150
upload.AddUploadContext(ctx, "comment")

routers/web/repo/pull.go

-2
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,6 @@ func ViewPullFiles(ctx *context.Context) {
701701
setCompareContext(ctx, baseCommit, commit, ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
702702

703703
ctx.Data["RequireHighlightJS"] = true
704-
ctx.Data["RequireEasyMDE"] = true
705704
ctx.Data["RequireTribute"] = true
706705
if ctx.Data["Assignees"], err = models.GetRepoAssignees(ctx.Repo.Repository); err != nil {
707706
ctx.ServerError("GetAssignees", err)
@@ -1050,7 +1049,6 @@ func CompareAndPullRequestPost(ctx *context.Context) {
10501049
ctx.Data["IsDiffCompare"] = true
10511050
ctx.Data["IsRepoToolbarCommits"] = true
10521051
ctx.Data["RequireTribute"] = true
1053-
ctx.Data["RequireEasyMDE"] = true
10541052
ctx.Data["RequireHighlightJS"] = true
10551053
ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes
10561054
ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled

routers/web/repo/release.go

-4
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ func LatestRelease(ctx *context.Context) {
262262
func NewRelease(ctx *context.Context) {
263263
ctx.Data["Title"] = ctx.Tr("repo.release.new_release")
264264
ctx.Data["PageIsReleaseList"] = true
265-
ctx.Data["RequireEasyMDE"] = true
266265
ctx.Data["RequireTribute"] = true
267266
ctx.Data["tag_target"] = ctx.Repo.Repository.DefaultBranch
268267
if tagName := ctx.FormString("tag"); len(tagName) > 0 {
@@ -296,7 +295,6 @@ func NewReleasePost(ctx *context.Context) {
296295
form := web.GetForm(ctx).(*forms.NewReleaseForm)
297296
ctx.Data["Title"] = ctx.Tr("repo.release.new_release")
298297
ctx.Data["PageIsReleaseList"] = true
299-
ctx.Data["RequireEasyMDE"] = true
300298
ctx.Data["RequireTribute"] = true
301299

302300
if ctx.HasError() {
@@ -415,7 +413,6 @@ func EditRelease(ctx *context.Context) {
415413
ctx.Data["Title"] = ctx.Tr("repo.release.edit_release")
416414
ctx.Data["PageIsReleaseList"] = true
417415
ctx.Data["PageIsEditRelease"] = true
418-
ctx.Data["RequireEasyMDE"] = true
419416
ctx.Data["RequireTribute"] = true
420417
ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled
421418
upload.AddUploadContext(ctx, "release")
@@ -454,7 +451,6 @@ func EditReleasePost(ctx *context.Context) {
454451
ctx.Data["Title"] = ctx.Tr("repo.release.edit_release")
455452
ctx.Data["PageIsReleaseList"] = true
456453
ctx.Data["PageIsEditRelease"] = true
457-
ctx.Data["RequireEasyMDE"] = true
458454
ctx.Data["RequireTribute"] = true
459455

460456
tagName := ctx.Params("*")

routers/web/repo/wiki.go

-4
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,6 @@ func WikiRaw(ctx *context.Context) {
622622
func NewWiki(ctx *context.Context) {
623623
ctx.Data["Title"] = ctx.Tr("repo.wiki.new_page")
624624
ctx.Data["PageIsWiki"] = true
625-
ctx.Data["RequireEasyMDE"] = true
626625

627626
if !ctx.Repo.Repository.HasWiki() {
628627
ctx.Data["title"] = "Home"
@@ -639,7 +638,6 @@ func NewWikiPost(ctx *context.Context) {
639638
form := web.GetForm(ctx).(*forms.NewWikiForm)
640639
ctx.Data["Title"] = ctx.Tr("repo.wiki.new_page")
641640
ctx.Data["PageIsWiki"] = true
642-
ctx.Data["RequireEasyMDE"] = true
643641

644642
if ctx.HasError() {
645643
ctx.HTML(http.StatusOK, tplWikiNew)
@@ -677,7 +675,6 @@ func NewWikiPost(ctx *context.Context) {
677675
func EditWiki(ctx *context.Context) {
678676
ctx.Data["PageIsWiki"] = true
679677
ctx.Data["PageIsWikiEdit"] = true
680-
ctx.Data["RequireEasyMDE"] = true
681678

682679
if !ctx.Repo.Repository.HasWiki() {
683680
ctx.Redirect(ctx.Repo.RepoLink + "/wiki")
@@ -697,7 +694,6 @@ func EditWikiPost(ctx *context.Context) {
697694
form := web.GetForm(ctx).(*forms.NewWikiForm)
698695
ctx.Data["Title"] = ctx.Tr("repo.wiki.new_page")
699696
ctx.Data["PageIsWiki"] = true
700-
ctx.Data["RequireEasyMDE"] = true
701697

702698
if ctx.HasError() {
703699
ctx.HTML(http.StatusOK, tplWikiNew)

templates/base/footer.tmpl

-8
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@
1212
{{template "custom/body_outer_post" .}}
1313

1414
{{template "base/footer_content" .}}
15-
{{if .RequireEasyMDE}}
16-
<script src="{{AssetUrlPrefix}}/js/easymde.js?v={{MD5 AppVer}}"></script>
17-
<script src="{{AssetUrlPrefix}}/vendor/plugins/codemirror/addon/mode/loadmode.js"></script>
18-
<script src="{{AssetUrlPrefix}}/vendor/plugins/codemirror/mode/meta.js"></script>
19-
<script>
20-
CodeMirror.modeURL = '{{AssetUrlPrefix}}/vendor/plugins/codemirror/mode/%N/%N.js';
21-
</script>
22-
{{end}}
2315

2416
<!-- Third-party libraries -->
2517
{{if .RequireU2F}}

templates/base/head.tmpl

-3
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@
5656
</script>
5757
<link rel="icon" href="{{AssetUrlPrefix}}/img/logo.svg" type="image/svg+xml">
5858
<link rel="alternate icon" href="{{AssetUrlPrefix}}/img/favicon.png" type="image/png">
59-
{{if .RequireEasyMDE}}
60-
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/easymde.css?v={{MD5 AppVer}}">
61-
{{end}}
6259
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/index.css?v={{MD5 AppVer}}">
6360
<noscript>
6461
<style>

web_src/js/easymde.js

-7
This file was deleted.

web_src/js/features/comp/CommentEasyMDE.js renamed to web_src/js/features/comp/EasyMDE.js

+63-8
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,69 @@
11
import attachTribute from '../tribute.js';
22

3+
const {appSubUrl} = window.config;
4+
5+
function loadScript(url) {
6+
return new Promise((resolve, reject) => {
7+
const script = document.createElement('script');
8+
script.async = true;
9+
script.addEventListener('load', () => {
10+
resolve();
11+
});
12+
script.addEventListener('error', (e) => {
13+
reject(e.error);
14+
});
15+
document.body.appendChild(script);
16+
script.src = url;
17+
});
18+
}
19+
20+
export async function importEasyMDE() {
21+
// for CodeMirror: the plugins should be loaded dynamically
22+
// https://github.com/codemirror/CodeMirror/issues/5484
23+
// https://github.com/codemirror/CodeMirror/issues/4838
24+
25+
const [{default: EasyMDE}, {default: CodeMirror}] = await Promise.all([
26+
import(/* webpackChunkName: "easymde" */'easymde'),
27+
import(/* webpackChunkName: "codemirror" */'codemirror'),
28+
import(/* webpackChunkName: "easymde" */'easymde/dist/easymde.min.css'),
29+
]);
30+
31+
// CodeMirror plugins must be loaded by a "Plain browser env"
32+
window.CodeMirror = CodeMirror;
33+
await Promise.all([
34+
loadScript(`${appSubUrl}/assets/vendor/plugins/codemirror/addon/mode/loadmode.js`),
35+
loadScript(`${appSubUrl}/assets/vendor/plugins/codemirror/mode/meta.js`),
36+
]);
37+
38+
// the loadmode.js/meta.js would set the modeURL/modeInfo properties, so we check it to make sure our loading works
39+
if (!CodeMirror.modeURL || !CodeMirror.modeInfo) {
40+
throw new Error('failed to load plugins for CodeMirror');
41+
}
42+
43+
CodeMirror.modeURL = `${appSubUrl}/assets/vendor/plugins/codemirror/mode/%N/%N.js`;
44+
return EasyMDE;
45+
}
46+
347
/**
448
* create an EasyMDE editor for comment
549
* @param textarea jQuery or HTMLElement
650
* @returns {null|EasyMDE}
751
*/
8-
export function createCommentEasyMDE(textarea) {
52+
export async function createCommentEasyMDE(textarea) {
953
if (textarea instanceof jQuery) {
1054
textarea = textarea[0];
1155
}
1256
if (!textarea) {
1357
return null;
1458
}
1559

16-
const easyMDE = new window.EasyMDE({
60+
const EasyMDE = await importEasyMDE();
61+
const easyMDE = new EasyMDE({
1762
autoDownloadFontAwesome: false,
1863
element: textarea,
1964
forceSync: true,
2065
renderingConfig: {
21-
singleLineBreaks: false
66+
singleLineBreaks: false,
2267
},
2368
indentWithTabs: false,
2469
tabSize: 4,
@@ -56,7 +101,7 @@ export function createCommentEasyMDE(textarea) {
56101
className: 'fa fa-file',
57102
title: 'Revert to simple textarea',
58103
},
59-
]
104+
],
60105
});
61106
const inputField = easyMDE.codemirror.getInputField();
62107
inputField.classList.add('js-quick-submit');
@@ -72,13 +117,12 @@ export function createCommentEasyMDE(textarea) {
72117
cm.getInputField().trigger('input');
73118
}
74119
cm.execCommand('delCharBefore');
75-
}
120+
},
76121
});
77122
attachTribute(inputField, {mentions: true, emoji: true});
78123

79-
// TODO: that's the only way we can do now to attach the EasyMDE object to a HTMLElement
80-
inputField._data_easyMDE = easyMDE;
81-
textarea._data_easyMDE = easyMDE;
124+
setAttachedEasyMDE(inputField, easyMDE);
125+
setAttachedEasyMDE(textarea, easyMDE);
82126
return easyMDE;
83127
}
84128

@@ -96,3 +140,14 @@ export function getAttachedEasyMDE(el) {
96140
}
97141
return el._data_easyMDE;
98142
}
143+
144+
function setAttachedEasyMDE(el, easyMDE) {
145+
if (el instanceof jQuery) {
146+
el = el[0];
147+
}
148+
if (!el) {
149+
return;
150+
}
151+
// TODO: that's the only way we can do now to attach the EasyMDE object to a HTMLElement
152+
el._data_easyMDE = easyMDE;
153+
}

web_src/js/features/repo-issue.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {htmlEscape} from 'escape-goat';
22
import attachTribute from './tribute.js';
3-
import {createCommentEasyMDE, getAttachedEasyMDE} from './comp/CommentEasyMDE.js';
3+
import {createCommentEasyMDE, getAttachedEasyMDE} from './comp/EasyMDE.js';
44
import {initCompImagePaste} from './comp/ImagePaste.js';
55
import {initCompMarkupContentPreviewTab} from './comp/MarkupContentPreview.js';
66

@@ -439,16 +439,17 @@ export function initRepoPullRequestReview() {
439439
$(`#show-outdated-${id}`).removeClass('hide');
440440
});
441441

442-
$(document).on('click', 'button.comment-form-reply', function (e) {
442+
$(document).on('click', 'button.comment-form-reply', async function (e) {
443443
e.preventDefault();
444+
444445
$(this).hide();
445446
const form = $(this).closest('.comment-code-cloud').find('.comment-form');
446447
form.removeClass('hide');
447448
const $textarea = form.find('textarea');
448449
let easyMDE = getAttachedEasyMDE($textarea);
449450
if (!easyMDE) {
450-
attachTribute($textarea.get(), {mentions: true, emoji: true});
451-
easyMDE = createCommentEasyMDE($textarea);
451+
await attachTribute($textarea.get(), {mentions: true, emoji: true});
452+
easyMDE = await createCommentEasyMDE($textarea);
452453
}
453454
$textarea.focus();
454455
easyMDE.codemirror.focus();
@@ -515,8 +516,8 @@ export function initRepoPullRequestReview() {
515516
td.find("input[name='side']").val(side === 'left' ? 'previous' : 'proposed');
516517
td.find("input[name='path']").val(path);
517518
const $textarea = commentCloud.find('textarea');
518-
attachTribute($textarea.get(), {mentions: true, emoji: true});
519-
const easyMDE = createCommentEasyMDE($textarea);
519+
await attachTribute($textarea.get(), {mentions: true, emoji: true});
520+
const easyMDE = await createCommentEasyMDE($textarea);
520521
$textarea.focus();
521522
easyMDE.codemirror.focus();
522523
}

web_src/js/features/repo-legacy.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {createCommentEasyMDE, getAttachedEasyMDE} from './comp/CommentEasyMDE.js';
1+
import {createCommentEasyMDE, getAttachedEasyMDE} from './comp/EasyMDE.js';
22
import {initCompMarkupContentPreviewTab} from './comp/MarkupContentPreview.js';
33
import {initCompImagePaste, initEasyMDEImagePaste} from './comp/ImagePaste.js';
44
import {
@@ -256,6 +256,7 @@ export function initRepoCommentForm() {
256256

257257
async function onEditContent(event) {
258258
event.preventDefault();
259+
259260
$(this).closest('.dropdown').find('.menu').toggle('visible');
260261
const $segment = $(this).closest('.header').next();
261262
const $editContentZone = $segment.find('.edit-content-zone');
@@ -341,7 +342,7 @@ async function onEditContent(event) {
341342
$tabMenu.find('.preview.item').attr('data-tab', $editContentZone.data('preview'));
342343
$editContentForm.find('.write').attr('data-tab', $editContentZone.data('write'));
343344
$editContentForm.find('.preview').attr('data-tab', $editContentZone.data('preview'));
344-
easyMDE = createCommentEasyMDE($textarea);
345+
easyMDE = await createCommentEasyMDE($textarea);
345346

346347
initCompMarkupContentPreviewTab($editContentForm);
347348
if ($dropzone.length === 1) {

web_src/js/features/repo-release.js

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import attachTribute from './tribute.js';
22
import {initCompMarkupContentPreviewTab} from './comp/MarkupContentPreview.js';
33
import {initEasyMDEImagePaste} from './comp/ImagePaste.js';
4-
import {createCommentEasyMDE} from './comp/CommentEasyMDE.js';
4+
import {createCommentEasyMDE} from './comp/EasyMDE.js';
55

66
export function initRepoRelease() {
77
$(document).on('click', '.remove-rel-attach', function() {
@@ -19,11 +19,13 @@ export function initRepoReleaseEditor() {
1919
return false;
2020
}
2121

22-
const $textarea = $editor.find('textarea');
23-
attachTribute($textarea.get(), {mentions: false, emoji: true});
24-
const $files = $editor.parent().find('.files');
25-
const easyMDE = createCommentEasyMDE($textarea);
26-
initCompMarkupContentPreviewTab($editor);
27-
const dropzone = $editor.parent().find('.dropzone')[0];
28-
initEasyMDEImagePaste(easyMDE, dropzone, $files);
22+
(async () => {
23+
const $textarea = $editor.find('textarea');
24+
await attachTribute($textarea.get(), {mentions: false, emoji: true});
25+
const $files = $editor.parent().find('.files');
26+
const easyMDE = await createCommentEasyMDE($textarea);
27+
initCompMarkupContentPreviewTab($editor);
28+
const dropzone = $editor.parent().find('.dropzone')[0];
29+
initEasyMDEImagePaste(easyMDE, dropzone, $files);
30+
})();
2931
}

0 commit comments

Comments
 (0)