hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closes #1840

Browse Source
v1.18.x
barisusakli 11 years ago
parent 8cfce1c91c
commit 161069c390
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

24
public/src/forum/topic/postTools.js
Unescape Escape View File

@ -64,7 +64,7 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com
}); });
postContainer.on('click', '.favourite', function() { postContainer.on('click', '.favourite', function() {
favouritePost($(this), getPid($(this))); favouritePost($(this), getData($(this), 'data-pid'));
}); });
postContainer.on('click', '.upvote', function() { postContainer.on('click', '.upvote', function() {
@ -76,11 +76,11 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com
}); });
postContainer.on('click', '.flag', function() { postContainer.on('click', '.flag', function() {
flagPost(getPid($(this))); flagPost(getData($(this), 'data-pid'));
}); });
postContainer.on('click', '.edit', function(e) { postContainer.on('click', '.edit', function(e) {
composer.editPost(getPid($(this))); composer.editPost(getData($(this), 'data-pid'));
}); });
postContainer.on('click', '.delete', function(e) { postContainer.on('click', '.delete', function(e) {
@ -114,16 +114,16 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com
var username = getUserName(selectionText ? $(selection.baseNode) : button); var username = getUserName(selectionText ? $(selection.baseNode) : button);
if (selectionText.length) { if (selectionText.length) {
composer.addQuote(tid, getPid(button), topicName, username, selectionText); composer.addQuote(tid, ajaxify.variables.get('topic_slug'), getData(button, 'data-index'), getData(button, 'data-pid'), topicName, username, selectionText);
} else { } else {
composer.newReply(tid, getPid(button), topicName, username ? username + ' ' : ''); composer.newReply(tid, getData(button, 'data-pid'), topicName, username ? username + ' ' : '');
} }
} }
function onQuoteClicked(button, tid, topicName) { function onQuoteClicked(button, tid, topicName) {
var username = getUserName(button), var username = getUserName(button),
pid = getPid(button); pid = getData(button, 'data-pid');
socket.emit('posts.getRawPost', pid, function(err, post) { socket.emit('posts.getRawPost', pid, function(err, post) {
if(err) { if(err) {
@ -135,7 +135,7 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com
} }
if($('.composer').length) { if($('.composer').length) {
composer.addQuote(tid, pid, topicName, username, quoted); composer.addQuote(tid, ajaxify.variables.get('topic_slug'), getData(button, 'data-index'), pid, topicName, username, quoted);
} else { } else {
composer.newReply(tid, pid, topicName, '[[modules:composer.user_said, ' + username + ']]' + quoted); composer.newReply(tid, pid, topicName, '[[modules:composer.user_said, ' + username + ']]' + quoted);
} }
@ -173,8 +173,8 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com
return false; return false;
} }
function getPid(button) { function getData(button, data) {
return button.parents('.post-row').attr('data-pid'); return button.parents('.post-row').attr(data);
} }
function getUserName(button) { function getUserName(button) {
@ -188,7 +188,7 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com
} }
function deletePost(button, tid) { function deletePost(button, tid) {
var pid = getPid(button), var pid = getData(button, 'data-pid'),
postEl = $('#post-container li[data-pid="' + pid + '"]'), postEl = $('#post-container li[data-pid="' + pid + '"]'),
action = !postEl.hasClass('deleted') ? 'delete' : 'restore'; action = !postEl.hasClass('deleted') ? 'delete' : 'restore';
@ -196,7 +196,7 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com
} }
function purgePost(button, tid) { function purgePost(button, tid) {
postAction('purge', getPid(button), tid); postAction('purge', getData(button, 'data-pid'), tid);
} }
function postAction(action, pid, tid) { function postAction(action, pid, tid) {
@ -238,7 +238,7 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com
}); });
moveBtn.on('click', function() { moveBtn.on('click', function() {
movePost(button.parents('.post-row'), getPid(button), topicId.val()); movePost(button.parents('.post-row'), getData(button, 'data-pid'), topicId.val());
}); });
} }

4
public/src/modules/composer.js
Unescape Escape View File

@ -115,7 +115,7 @@ define('composer', dependencies, function(taskbar, controls, uploads, formatting
}); });
}; };
composer.addQuote = function(tid, pid, title, username, text){ composer.addQuote = function(tid, topicSlug, postIndex, pid, title, username, text) {
var uuid = composer.active; var uuid = composer.active;
if (uuid === undefined) { if (uuid === undefined) {
@ -126,7 +126,7 @@ define('composer', dependencies, function(taskbar, controls, uploads, formatting
var bodyEl = postContainer.find('textarea'); var bodyEl = postContainer.find('textarea');
var prevText = bodyEl.val(); var prevText = bodyEl.val();
if(tid !== composer.posts[uuid].tid) { if(tid !== composer.posts[uuid].tid) {
var link = '[' + title + '](/topic/' + tid + '#' + pid + ')'; var link = '[' + title + '](/topic/' + topicSlug + '/' + (parseInt(postIndex, 10) + 1) + ')';
translator.translate('[[modules:composer.user_said_in, ' + username + ', ' + link + ']]', onTranslated); translator.translate('[[modules:composer.user_said_in, ' + username + ', ' + link + ']]', onTranslated);
} else { } else {
translator.translate('[[modules:composer.user_said, ' + username + ']]', onTranslated); translator.translate('[[modules:composer.user_said, ' + username + ']]', onTranslated);

Write Preview
Loading…
Cancel
Save