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

Close bullet list after hitting enter on empty list line #328

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

Close bullet list after hitting enter on empty list line #328

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c9aeb0
Close bullet list on enter of empty bullet line
Calamari Feb 2, 2020
392cc5d
If we hit enter on an empty numberd list close it
Calamari Feb 2, 2020
313cc2e
Fix caret position after auto adding `10.`
Calamari Feb 2, 2020
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
28 changes: 24 additions & 4 deletions js/bootstrap-markdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,12 +880,32 @@

var charFollowingLastLineBreak = chars[priorNewlineIndex + 1];
if (charFollowingLastLineBreak === '-') {
this.addBullet(enterIndex);
var line = chars.slice(priorNewlineIndex + 2, enterIndex).join('');
var allWhitespace = /^[\W]*$/.test(line);
if (allWhitespace) {
// If we hit enter on a empty line, we probably want to close the bullet list
var linesDeleted = line.length + 2;
this.setSelection(priorNewlineIndex, enterIndex);
this.replaceSelection("\n\n");
this.setSelection(enterIndex + 2 - linesDeleted, enterIndex + 2 - linesDeleted); // Put the cursor into new line
} else {
this.addBullet(enterIndex);
}
} else if ($.isNumeric(charFollowingLastLineBreak)) {
var numBullet = this.getBulletNumber(priorNewlineIndex + 1);
if (numBullet) {
var numBullet = this.getBulletNumber(priorNewlineIndex + 1);
if (numBullet) {
var line = chars.slice(priorNewlineIndex + 1, enterIndex).join('');
var allWhitespace = (new RegExp('^' + numBullet + '\\.[\\W]*$')).test(line);
if (allWhitespace) {
// If we hit enter on a empty line, we probably want to close the numbered bullet list
var linesDeleted = line.length;
this.setSelection(priorNewlineIndex, enterIndex);
this.replaceSelection("\n\n");
this.setSelection(enterIndex + 1 - linesDeleted, enterIndex + 1 - linesDeleted); // Put the cursor into new line
} else {
this.addNumberedBullet(enterIndex, numBullet);
}
}
}
break;

Expand Down Expand Up @@ -918,7 +938,7 @@
var numBullet = (num + 1) + '. \n';
this.insertContent(index, numBullet);

var prefixLength = num.toString().length + 2;
var prefixLength = (num + 1).toString().length + 2;
this.setSelection(index + prefixLength, index + prefixLength); // Put the cursor after the number
},
getBulletNumber: function(startIndex) {
Expand Down