tweaks and formatting

v1.18.x
Julian Lam 11 years ago
parent 7edf041747
commit 4ae8824faf

@ -401,7 +401,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
quoted = '> ' + post.replace(/\n/g, '\n> ') + '\n\n'; quoted = '> ' + post.replace(/\n/g, '\n> ') + '\n\n';
} }
if($('.composer').length) { if($('.composer').length) {
composer.addQuote(tid, pid, topic_name ,username, quoted); composer.addQuote(tid, pid, topic_name, username, quoted);
}else { }else {
composer.newReply(tid, topic_name, username + ' said:\n' + quoted); composer.newReply(tid, topic_name, username + ' said:\n' + quoted);
} }

@ -32,18 +32,18 @@ define(['taskbar'], function(taskbar) {
} }
} }
composer.addQuote = function(tid,pid, title,username, text){ composer.addQuote = function(tid, pid, title, username, text){
if (allowed()) { if (allowed()) {
var uuid = composer.active; var uuid = composer.active;
if(uuid !== undefined){ if(uuid !== undefined){
var bodyEl = $('#cmp-uuid-'+uuid).find('textarea'); var bodyEl = $('#cmp-uuid-'+uuid).find('textarea');
var prevText = bodyEl.val(); var prevText = bodyEl.val();
if(tid !== composer.posts[uuid].tid) { if(tid !== composer.posts[uuid].tid) {
text = '\n'+username + ' said in ['+title+'](/topic/'+tid+'#'+pid+'):\n'+text; text = username + ' said in ['+title+'](/topic/'+tid+'#'+pid+'):\n'+text;
}else { }else {
text ='\n'+ username + ' said:\n' + text; text = username + ' said:\n' + text;
} }
composer.posts[uuid].body = prevText + text; composer.posts[uuid].body = (prevText.length ? prevText + '\n\n' : '') + text;
bodyEl.val(composer.posts[uuid].body); bodyEl.val(composer.posts[uuid].body);
}else{ }else{
composer.newReply(tid,title,username + ' said:\n' + text); composer.newReply(tid,title,username + ' said:\n' + text);

Loading…
Cancel
Save