Skip to content

Commit a38ba63

Browse files
authored
Load EasyMDE/CodeMirror dynamically, remove RequireEasyMDE (#18069)
This PR makes frontend load EasyMDE/CodeMirror dynamically, and removes `RequireEasyMDE`.
1 parent 0572c78 commit a38ba63

File tree

17 files changed

+237
-221
lines changed

17 files changed

+237
-221
lines changed

routers/web/repo/commit.go

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,6 @@ func CompareDiff(ctx *context.Context) {
764764
ctx.Data["IsRepoToolbarCommits"] = true
765765
ctx.Data["IsDiffCompare"] = true
766766
ctx.Data["RequireTribute"] = true
767-
ctx.Data["RequireEasyMDE"] = true
768767
setTemplateIfExists(ctx, pullRequestTemplateKey, nil, pullRequestTemplateCandidates)
769768
ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled
770769
upload.AddUploadContext(ctx, "comment")

routers/web/repo/editor.go

Lines changed: 0 additions & 4 deletions
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

Lines changed: 0 additions & 3 deletions
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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,6 @@ func ViewPullFiles(ctx *context.Context) {
738738
setCompareContext(ctx, baseCommit, commit, ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
739739

740740
ctx.Data["RequireHighlightJS"] = true
741-
ctx.Data["RequireEasyMDE"] = true
742741
ctx.Data["RequireTribute"] = true
743742
if ctx.Data["Assignees"], err = models.GetRepoAssignees(ctx.Repo.Repository); err != nil {
744743
ctx.ServerError("GetAssignees", err)
@@ -1098,7 +1097,6 @@ func CompareAndPullRequestPost(ctx *context.Context) {
10981097
ctx.Data["IsDiffCompare"] = true
10991098
ctx.Data["IsRepoToolbarCommits"] = true
11001099
ctx.Data["RequireTribute"] = true
1101-
ctx.Data["RequireEasyMDE"] = true
11021100
ctx.Data["RequireHighlightJS"] = true
11031101
ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes
11041102
ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled

routers/web/repo/release.go

Lines changed: 0 additions & 4 deletions
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

Lines changed: 0 additions & 4 deletions
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

Lines changed: 0 additions & 8 deletions
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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@
5959
</script>
6060
<link rel="icon" href="{{AssetUrlPrefix}}/img/logo.svg" type="image/svg+xml">
6161
<link rel="alternate icon" href="{{AssetUrlPrefix}}/img/favicon.png" type="image/png">
62-
{{if .RequireEasyMDE}}
63-
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/easymde.css?v={{MD5 AppVer}}">
64-
{{end}}
6562
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/index.css?v={{MD5 AppVer}}">
6663
<noscript>
6764
<style>

web_src/js/easymde.js

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

0 commit comments

Comments
 (0)