Netsyms/easy-markdown-editor
2
0
Fork 0
mirror of https://github.com/Ionaru/easy-markdown-editor synced 2025-07-21 00:44:28 -06:00
Code Issues Releases Wiki Activity

Merge branch 'dev-headlines' of https://github.com/peter-power-594/easy-markdown-editor into dev-headlines

Browse Source 
# Conflicts:
#	src/js/easymde.js
This commit is contained in:
Pierre-Henri Lavigne 2024-09-14 00:42:25 +09:00
commit f2e080f707
No known key found for this signature in database
GPG Key ID: E2D1C9E2BBD3007D
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/js/easymde.js
View File

@ -2358,7 +2358,7 @@ EasyMDE.prototype.render = function (el) {
ch: obj.to.ch + 1, ch: obj.to.ch + 1,
}); });
if (!/\s|#/.test(myChar || '')) { if (!/\s|#/.test(myChar || '')) {
// Don't bother to go further if no headlines were detected // Don't bother to go further if no headling were detected
return false; return false;
} }
if ((obj.from.line === obj.to.line) && obj.text.length === 1) { if ((obj.from.line === obj.to.line) && obj.text.length === 1) {
@ -2369,11 +2369,11 @@ EasyMDE.prototype.render = function (el) {
return false; return false;
} }
if (!/#/.test(myText)) { if (!/#/.test(myText)) {
myText = '# ' + myText.trim(); // Wasn't headline myText = '# ' + myText.trim(); // Wasn't heading
} else { } else {
myText = myText.replace(/#/, '##'); // Increment one sharp sign myText = myText.replace(/#/, '##'); // Increment one sharp sign
} }
myLevels = headlineNeedUpdate(myText, cm.options.backdrop.headingLevels); myLevels = headingNeedUpdate(myText, cm.options.backdrop.headingLevels);
if (!myLevels) { if (!myLevels) {
return false; return false;
} }
@ -2389,7 +2389,7 @@ EasyMDE.prototype.render = function (el) {
return true; return true;
} }
else if (/delete/.test(obj.origin) && obj.text[0] === '') { else if (/delete/.test(obj.origin) && obj.text[0] === '') {
myLevels = headlineNeedUpdate(myText.replace(/#/, ''), cm.options.backdrop.headingLevels, 'dsc'); myLevels = headingNeedUpdate(myText.replace(/#/, ''), cm.options.backdrop.headingLevels, 'dsc');
if (!myLevels) { if (!myLevels) {
return false; return false;
} }
@ -2424,13 +2424,13 @@ EasyMDE.prototype.render = function (el) {
return row; return row;
} }
row = row.replace(/^(\s*)#/, '#'); row = row.replace(/^(\s*)#/, '#');
var myLevels = headlineNeedUpdate(row, cm.options.backdrop.headingLevels); var myLevels = headingNeedUpdate(row, cm.options.backdrop.headingLevels);
if (!myLevels || !myLevels.from || !myLevels.to) { if (!myLevels || !myLevels.from || !myLevels.to) {
return row; return row;
} else if (myLevels.from < myLevels.to) { } else if (myLevels.from < myLevels.to) {
return headlineMakeBigger(row, myLevels.from, myLevels.to); return headingMakeBigger(row, myLevels.from, myLevels.to);
} else if (myLevels.to < myLevels.from) { } else if (myLevels.to < myLevels.from) {
return headlineMakeSmaller(row, myLevels.from, myLevels.to); return headingMakeSmaller(row, myLevels.from, myLevels.to);
} }
return row; return row;
}; };
@ -2461,16 +2461,16 @@ EasyMDE.prototype.render = function (el) {
if (obj.text.length === 1 && obj.text[0].length === 1) { if (obj.text.length === 1 && obj.text[0].length === 1) {
// Only one character on one line is being updated // Only one character on one line is being updated
if (obj.text[0] === ' ') { if (obj.text[0] === ' ') {
return headlineCheckNew(cm, obj); return headingCheckNew(cm, obj);
} else if (obj.text[0] === '#') { } else if (obj.text[0] === '#') {
return headlineCheckExisting(cm, obj); return headingCheckExisting(cm, obj);
} }
} }
} }
else if (/delete/.test(obj.origin)) { // Something was removed else if (/delete/.test(obj.origin)) { // Something was removed
if (obj.text.length === 1 && !obj.text[0].length) { if (obj.text.length === 1 && !obj.text[0].length) {
// Only one character on one line has been removed // Only one character on one line has been removed
return headlineCheckExisting(cm, obj); return headingCheckExisting(cm, obj);
} }
} }
if (obj.text.length < 2) { if (obj.text.length < 2) {