Merge d7beab0abeb4d0981114ea54ccc5c5fc2087fe7d into e32fe3f91c2d45f27f72a3662133b1c0e1a5bda1

This commit is contained in:
Adam Misiorny 2017-05-19 08:45:40 +00:00 committed by GitHub
commit 571f47d9c1

View File

@ -562,6 +562,14 @@ function toggleHeadingBigger(editor) {
_toggleHeading(cm, "bigger"); _toggleHeading(cm, "bigger");
} }
/**
* Action for removing heading
*/
function removeHeading(editor) {
var cm = editor.codemirror;
_toggleHeading(cm, undefined, 0);
}
/** /**
* Action for toggling heading size 1 * Action for toggling heading size 1
*/ */
@ -856,7 +864,11 @@ function _toggleHeading(cm, direction, size) {
} }
} }
} else { } else {
if(size == 1) { if (size == 0) {
if (currHeadingLevel > 0) {
text = text.substr(currHeadingLevel + 1);
}
} else if(size == 1) {
if(currHeadingLevel <= 0) { if(currHeadingLevel <= 0) {
text = "# " + text; text = "# " + text;
} else if(currHeadingLevel == size) { } else if(currHeadingLevel == size) {
@ -1942,6 +1954,7 @@ SimpleMDE.toggleStrikethrough = toggleStrikethrough;
SimpleMDE.toggleBlockquote = toggleBlockquote; SimpleMDE.toggleBlockquote = toggleBlockquote;
SimpleMDE.toggleHeadingSmaller = toggleHeadingSmaller; SimpleMDE.toggleHeadingSmaller = toggleHeadingSmaller;
SimpleMDE.toggleHeadingBigger = toggleHeadingBigger; SimpleMDE.toggleHeadingBigger = toggleHeadingBigger;
SimpleMDE.removeHeading = removeHeading;
SimpleMDE.toggleHeading1 = toggleHeading1; SimpleMDE.toggleHeading1 = toggleHeading1;
SimpleMDE.toggleHeading2 = toggleHeading2; SimpleMDE.toggleHeading2 = toggleHeading2;
SimpleMDE.toggleHeading3 = toggleHeading3; SimpleMDE.toggleHeading3 = toggleHeading3;
@ -1980,6 +1993,9 @@ SimpleMDE.prototype.toggleHeadingSmaller = function() {
SimpleMDE.prototype.toggleHeadingBigger = function() { SimpleMDE.prototype.toggleHeadingBigger = function() {
toggleHeadingBigger(this); toggleHeadingBigger(this);
}; };
SimpleMDE.prototype.removeHeading = function() {
removeHeading(this);
};
SimpleMDE.prototype.toggleHeading1 = function() { SimpleMDE.prototype.toggleHeading1 = function() {
toggleHeading1(this); toggleHeading1(this);
}; };