Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wiki - editor - enable side-by-side button #7242

Merged
merged 15 commits into from
Nov 16, 2019
Merged

wiki - editor - enable side-by-side button #7242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
11b58a5
wiki - enable side-by-side button in editor
Cherrg Jun 18, 2019
0cc350f
decrease timeinterval user need to stop before rendering is triggered
Cherrg Jun 18, 2019
c1c0f18
removed not needed code with simpleMDE placeholder
Cherrg Jun 20, 2019
6e55a29
Merge branch 'master' into wiki_enable_side_by_side
Cherrg Jun 20, 2019
84f3b4f
run highlight.js on markdown preview
Cherrg Jun 20, 2019
983772a
Merge branch 'master' into wiki_enable_side_by_side
Cherrg Jun 22, 2019
66c919f
Merge branch 'master' into wiki_enable_side_by_side
zeripath Jun 27, 2019
d4be8a7
fix white border around side-by-side preview
Cherrg Jun 27, 2019
bae3fe7
Merge branch 'master' into wiki_enable_side_by_side
Cherrg Jul 5, 2019
cd8eb30
Merge branch 'master' into wiki_enable_side_by_side
Cherrg Jul 7, 2019
d86a5c7
Merge branch 'master' into wiki_enable_side_by_side
Cherrg Jul 8, 2019
23f82e8
Merge branch 'wiki_enable_side_by_side' of github.com:Cherrg/gitea in…
Cherrg Jul 12, 2019
7b5d861
Merge branch 'master' into wiki_enable_side_by_side
Cherrg Jul 12, 2019
4cfb52e
Merge branch 'master' into wiki_enable_side_by_side
Cherrg Nov 16, 2019
6e6b646
Merge branch 'master' into wiki_enable_side_by_side
Cherrg Nov 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions public/css/theme-arc-green.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ footer{background:#2e323e;border-top:1px solid #313131}
.markdown:not(code) table thead tr:nth-child(2n-1){background-color:#464c5d!important}
.markdown:not(code) table td,.markdown:not(code) table th{border-color:#4c505c!important}
.repository.file.editor.edit,.repository.wiki.new .CodeMirror{border-right:1px solid rgba(187,187,187,.6);border-left:1px solid rgba(187,187,187,.6);border-bottom:1px solid rgba(187,187,187,.6)}
.repository.file.editor.edit .editor-preview,.repository.file.editor.edit .editor-preview-side,.repository.wiki.new .CodeMirror .editor-preview,.repository.wiki.new .CodeMirror .editor-preview-side{background:#353945}
.repository.file.editor.edit .editor-preview .markdown:not(code).ui.segment,.repository.file.editor.edit .editor-preview-side .markdown:not(code).ui.segment,.repository.wiki.new .CodeMirror .editor-preview .markdown:not(code).ui.segment,.repository.wiki.new .CodeMirror .editor-preview-side .markdown:not(code).ui.segment{border-width:0}
.repository.file.editor.edit .editor-preview,.repository.file.editor.edit .editor-preview-side,.repository.file.editor.edit+.editor-preview-side,.repository.wiki.new .CodeMirror .editor-preview,.repository.wiki.new .CodeMirror .editor-preview-side,.repository.wiki.new .CodeMirror+.editor-preview-side{background:#353945}
.repository.file.editor.edit .editor-preview .markdown:not(code).ui.segment,.repository.file.editor.edit .editor-preview-side .markdown:not(code).ui.segment,.repository.file.editor.edit+.editor-preview-side .markdown:not(code).ui.segment,.repository.wiki.new .CodeMirror .editor-preview .markdown:not(code).ui.segment,.repository.wiki.new .CodeMirror .editor-preview-side .markdown:not(code).ui.segment,.repository.wiki.new .CodeMirror+.editor-preview-side .markdown:not(code).ui.segment{border-width:0}
.ui.dropdown .menu{background:#2c303a}
.ui.dropdown .menu>.message:not(.ui){color:#636363}
.ui.input{color:#dbdbdb}
Expand Down
2 changes: 1 addition & 1 deletion public/js/index.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

54 changes: 42 additions & 12 deletions web_src/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1134,6 +1134,8 @@ function initTeamSettings() {

function initWikiForm() {
const $editArea = $('.repository.wiki textarea#edit_area');
let sideBySideChanges = 0;
let sideBySideTimeout = null;
if ($editArea.length > 0) {
const simplemde = new SimpleMDE({
autoDownloadFontAwesome: false,
Expand All @@ -1142,18 +1144,46 @@ function initWikiForm() {
previewRender(plainText, preview) { // Async method
setTimeout(() => {
// FIXME: still send render request when return back to edit mode
$.post($editArea.data('url'), {
_csrf: csrf,
mode: 'gfm',
context: $editArea.data('context'),
text: plainText
}, (data) => {
preview.innerHTML = `<div class="markdown ui segment">${data}</div>`;
emojify.run($('.editor-preview')[0]);
});
const render = function () {
sideBySideChanges = 0;
if (sideBySideTimeout != null) {
clearTimeout(sideBySideTimeout);
sideBySideTimeout = null;
}
$.post($editArea.data('url'), {
_csrf: csrf,
mode: 'gfm',
context: $editArea.data('context'),
text: plainText
},
(data) => {
preview.innerHTML = `<div class="markdown ui segment">${data}</div>`;
emojify.run($('.editor-preview')[0]);
$(preview).find('pre code').each((_, e) => {
hljs.highlightBlock(e);
});
});
};
if (!simplemde.isSideBySideActive()) {
render();
} else {
// delay preview by keystroke counting
sideBySideChanges++;
if (sideBySideChanges > 10) {
render();
}
// or delay preview by timeout
if (sideBySideTimeout != null) {
clearTimeout(sideBySideTimeout);
sideBySideTimeout = null;
}
sideBySideTimeout = setTimeout(render, 600);
}
}, 0);

return 'Loading...';
if (!simplemde.isSideBySideActive()) {
return 'Loading...';
}
return preview.innerHTML;
},
renderingConfig: {
singleLineBreaks: false
Expand Down Expand Up @@ -1199,7 +1229,7 @@ function initWikiForm() {
}, '|',
'unordered-list', 'ordered-list', '|',
'link', 'image', 'table', 'horizontal-rule', '|',
'clean-block', 'preview', 'fullscreen']
'clean-block', 'preview', 'fullscreen', 'side-by-side']
});
$(simplemde.codemirror.getInputField()).addClass('js-quick-submit');
}
Expand Down
3 changes: 2 additions & 1 deletion web_src/less/themes/arc-green.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,8 @@ a.ui.basic.green.label:hover {
border-bottom: 1px solid rgba(187, 187, 187, 0.6);

.editor-preview,
.editor-preview-side {
.editor-preview-side,
& + .editor-preview-side {
background: #353945;

.markdown:not(code).ui.segment {
Expand Down