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

Add markdown toolbar #2528

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add markdown toolbar #2528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea3d853
add markdown toolbar
onukura Aug 27, 2020
a451fda
fix JSDoc
onukura Aug 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
68 changes: 68 additions & 0 deletions src/main/twirl/gitbucket/core/helper/preview.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,15 @@
<ul class="nav nav-tabs fill-width" style="margin-bottom: 10px;">
<li class="active"><a href="#tab@uid" data-toggle="tab" id="write@uid">Write</a></li>
<li><a href="#tab@(uid + 1)" data-toggle="tab" id="preview@uid">Preview</a></li>
<li class="mde-toolbar"><a id="mde-tasklist@uid"><i class="fa fa-check-square-o" aria-hidden="true"></i></a></li>
<li class="mde-toolbar"><a id="mde-list-ol@uid"><i class="fa fa-list-ol" aria-hidden="true"></i></a></li>
<li class="mde-toolbar"><a id="mde-list-ul@uid"><i class="fa fa-list-ul" aria-hidden="true"></i></a></li>
<li class="mde-toolbar"><a id="mde-link@uid"><i class="fa fa-link" aria-hidden="true"></i></a></li>
<li class="mde-toolbar"><a id="mde-code@uid"><i class="fa fa-code" aria-hidden="true"></i></a></li>
<li class="mde-toolbar"><a id="mde-quote@uid"><i class="fa fa-quote-right" aria-hidden="true"></i></a></li>
<li class="mde-toolbar"><a id="mde-italic@uid"><i class="fa fa-italic" aria-hidden="true"></i></a></li>
<li class="mde-toolbar"><a id="mde-bold@uid"><i class="fa fa-bold" aria-hidden="true"></i></a></li>
<li class="mde-toolbar"><a id="mde-heading@uid"><i class="fa fa-header" aria-hidden="true"></i></a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" style="margin-top: 4px;" id="tab@uid">
Expand Down Expand Up @@ -48,12 +57,14 @@
$('#content@uid').elastic();
$('#content@uid').trigger('blur');
}

@if(focus){
$('#content@uid').trigger('focus');
}

$('#write@uid').on('shown.bs.tab', function(){
$('#content@uid').trigger('focus');
$('.mde-toolbar').show();
});

$('#preview@uid').click(function(){
Expand All @@ -69,6 +80,63 @@
$('#preview-area@uid input').prop('disabled', true);
prettyPrint();
});
$('.mde-toolbar').hide();
});

$('#mde-heading@uid').click(function(){
var content = $('#content@uid');
var newTextInfo = mdeDecorateWord(
content.val(), content.prop('selectionStart'), content.prop('selectionEnd'), '###', 1);
mdePostProcess(content, newTextInfo);
});
$('#mde-bold@uid').click(function(){
var content = $('#content@uid');
var newTextInfo = mdeWrapWord(
content.val(), content.prop('selectionStart'), content.prop('selectionEnd'), '**');
mdePostProcess(content, newTextInfo);
});
$('#mde-italic@uid').click(function(){
var content = $('#content@uid');
var newTextInfo = mdeWrapWord(
content.val(), content.prop('selectionStart'), content.prop('selectionEnd'), '_');
mdePostProcess(content, newTextInfo);
});
$('#mde-code@uid').click(function(){
var content = $('#content@uid');
var newTextInfo = mdeWrapWord(
content.val(), content.prop('selectionStart'), content.prop('selectionEnd'), '`');
mdePostProcess(content, newTextInfo);
});
$('#mde-link@uid').click(function(){
var content = $('#content@uid');
var newTextInfo = mdeWrapWordLink(
content.val(), content.prop('selectionStart'), content.prop('selectionEnd'));
mdePostProcess(content, newTextInfo);
});
$('#mde-quote@uid').click(function(){
var content = $('#content@uid');
var newTextInfo = mdeDecorateWordWithNewLine(
content.val(), content.prop('selectionStart'), content.prop('selectionEnd'), '>', '>');
mdePostProcess(content, newTextInfo);
});
$('#mde-list-ul@uid').click(function(){
var content = $('#content@uid');
var newTextInfo = mdeDecorateWordWithNewLine(
content.val(), content.prop('selectionStart'), content.prop('selectionEnd'), '-', '-');
mdePostProcess(content, newTextInfo);
});
$('#mde-list-ol@uid').click(function(){
var content = $('#content@uid');
var newTextInfo = mdeDecorateWordWithNewLine(
content.val(), content.prop('selectionStart'), content.prop('selectionEnd'), '1.', "1\\.");
mdePostProcess(content, newTextInfo);
});
$('#mde-tasklist@uid').click(function(){
var content = $('#content@uid');
var newTextInfo = mdeDecorateWordWithNewLine(
content.val(), content.prop('selectionStart'), content.prop('selectionEnd'), '- [ ]', "-\\s\\[\\s\\]");
mdePostProcess(content, newTextInfo);
});

});
</script>
16 changes: 16 additions & 0 deletions src/main/webapp/assets/common/css/gitbucket.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1665,6 +1665,22 @@ a.markdown-anchor-link span.octicon {
vertical-align: middle;
}

/****************************************************************************/
/* Markdown Toolbar */
/****************************************************************************/
li.mde-toolbar {
float: right;
}

li.mde-toolbar a {
border: 0;
margin-right: 0;
}

li.mde-toolbar a i {
color: gray;
}

/****************************************************************************/
/* File finder */
/****************************************************************************/
Expand Down