Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3344 from savef/fix-bold-and-italic-buttons-2 

Fix italics/bold WYSIWYG bug with nothing highlighted.
This commit is contained in:
Régis Hanol 2015-04-07 19:02:05 +02:00
parent 13e97a0b77 895e0261ed
commit 293ff05e3b
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/assets/javascripts/discourse/lib/Markdown.Editor.js
View File

@ -1550,13 +1550,13 @@
// Don't show the fallback text if more than one line is selected,
// it's probably a break between paragraphs.
if(lines.length > 1) {
fallbackText = ""
if (lines.length > 1) {
fallbackText = "";
}
for(var i=0; i<lines.length; i++) {
// Split before, selection and after up.
var lineMatch = lines[i].match(/^(\**)(.*?)(\**)$/);
var lineMatch = lines[i].match(/^(\s*\**)(.*?)(\**\s*)$/);
var newChunk = new Chunks();
newChunk.before = lineMatch[1];
@ -1564,8 +1564,16 @@
newChunk.after = lineMatch[3];
this.doSurroundLine(newChunk, postProcessing, nStars, fallbackText);
lines[i] = newChunk.before + newChunk.selection + newChunk.after;
if (lines.length > 1) {
lines[i] = newChunk.before + newChunk.selection + newChunk.after;
} else {
realChunk.startTag = newChunk.before;
realChunk.endTag = newChunk.after;
lines[i] = newChunk.selection;
}
}
realChunk.selection = lines.join("\n");
};
@ -1591,11 +1599,11 @@
}
// Only operate if it's not a blank line
if(chunk.selection) {
// Add the true markup.
var markup = nStars === 1 ? "*" : "**";
chunk.before = chunk.before + markup;
chunk.after = markup + chunk.after;
if (chunk.selection) {
// Add the true markup.
var markup = nStars === 1 ? "*" : "**";
chunk.before = chunk.before + markup;
chunk.after = markup + chunk.after;
}
}
};