Skip to content

Commit 2a6115d

Browse files
authored
Merge branch 'master' into ui_create_tag
2 parents 87a4b7b + 5de7696 commit 2a6115d

File tree

2 files changed

+28
-6
lines changed

2 files changed

+28
-6
lines changed

templates/repo/wiki/new.tmpl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616
<div class="field {{if .Err_Title}}error{{end}}">
1717
<input name="title" value="{{.title}}" autofocus required>
1818
</div>
19-
<div class="ui top attached tabular menu previewtabs">
19+
<div class="ui top attached tabular menu previewtabs" data-write="write" data-preview="preview">
2020
<a class="active item" data-tab="write">{{.i18n.Tr "write"}}</a>
21-
<a class="item" data-tab="preview">{{.i18n.Tr "preview"}}</a>
21+
<a class="item" data-tab="preview" data-url="{{$.Repository.APIURL}}/markdown" data-context="{{$.RepoLink}}">{{$.i18n.Tr "preview"}}</a>
2222
</div>
23-
<div class="field">
24-
<textarea class="js-quick-submit" id="edit_area" name="content" data-id="wiki-{{.title}}" data-url="{{.Repository.APIURL}}/markdown" data-context="{{.RepoLink}}" required>{{if .PageIsWikiEdit}}{{.content}}{{else}}{{.i18n.Tr "repo.wiki.welcome"}}{{end}}</textarea>
23+
<div class="field content" data-loading="{{.i18n.Tr "loading"}}">
24+
<div class="ui bottom active tab" data-tab="write">
25+
<textarea class="js-quick-submit" id="edit_area" name="content" data-id="wiki-{{.title}}" data-url="{{.Repository.APIURL}}/markdown" data-context="{{.RepoLink}}" required>{{if .PageIsWikiEdit}}{{.content}}{{else}}{{.i18n.Tr "repo.wiki.welcome"}}{{end}}</textarea>
26+
</div>
2527
</div>
2628
<div class="field">
2729
<input name="message" placeholder="{{.i18n.Tr "repo.wiki.default_commit_message"}}">

web_src/js/index.js

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,6 +1414,7 @@ function initWikiForm() {
14141414
const $editArea = $('.repository.wiki textarea#edit_area');
14151415
let sideBySideChanges = 0;
14161416
let sideBySideTimeout = null;
1417+
let hasSimpleMDE = true;
14171418
if ($editArea.length > 0) {
14181419
const simplemde = new SimpleMDE({
14191420
autoDownloadFontAwesome: false,
@@ -1510,6 +1511,12 @@ function initWikiForm() {
15101511
name: 'revert-to-textarea',
15111512
action(e) {
15121513
e.toTextArea();
1514+
hasSimpleMDE = false;
1515+
const $form = $('.repository.wiki.new .ui.form');
1516+
const $root = $form.find('.field.content');
1517+
const loading = $root.data('loading');
1518+
$root.append(`<div class="ui bottom tab markdown" data-tab="preview">${loading}</div>`);
1519+
initCommentPreviewTab($form);
15131520
},
15141521
className: 'fa fa-file',
15151522
title: 'Revert to simple textarea',
@@ -1524,15 +1531,26 @@ function initWikiForm() {
15241531
const $toolbar = $('.editor-toolbar');
15251532
const $bPreview = $('.editor-toolbar button.preview');
15261533
const $bSideBySide = $('.editor-toolbar a.fa-columns');
1527-
$bEdit.on('click', () => {
1534+
$bEdit.on('click', (e) => {
1535+
if (!hasSimpleMDE) {
1536+
return false;
1537+
}
1538+
e.stopImmediatePropagation();
15281539
if ($toolbar.hasClass('disabled-for-preview')) {
15291540
$bPreview.trigger('click');
15301541
}
1542+
1543+
return false;
15311544
});
1532-
$bPrev.on('click', () => {
1545+
$bPrev.on('click', (e) => {
1546+
if (!hasSimpleMDE) {
1547+
return false;
1548+
}
1549+
e.stopImmediatePropagation();
15331550
if (!$toolbar.hasClass('disabled-for-preview')) {
15341551
$bPreview.trigger('click');
15351552
}
1553+
return false;
15361554
});
15371555
$bPreview.on('click', () => {
15381556
setTimeout(() => {
@@ -1552,6 +1570,8 @@ function initWikiForm() {
15521570
}
15531571
}
15541572
}, 0);
1573+
1574+
return false;
15551575
});
15561576
$bSideBySide.on('click', () => {
15571577
sideBySideChanges = 10;

0 commit comments

Comments
 (0)