v1.18.x
Baris Usakli 7 years ago
parent 5f663b580c
commit ef4de68f5b

@ -10,9 +10,6 @@ define('forum/topic/merge', function () {
Merge.init = function () { Merge.init = function () {
$('.category').on('click', '[component="topic/merge"]', onMergeTopicsClicked); $('.category').on('click', '[component="topic/merge"]', onMergeTopicsClicked);
if (modal) {
$('[component="category/topic"]').on('click', 'a', onTopicClicked);
}
}; };
function onMergeTopicsClicked() { function onMergeTopicsClicked() {
@ -28,7 +25,7 @@ define('forum/topic/merge', function () {
modal.find('.close,#merge_topics_cancel').on('click', closeModal); modal.find('.close,#merge_topics_cancel').on('click', closeModal);
$('[component="category/topic"]').on('click', 'a', onTopicClicked); $('[component="category"]').on('click', '[component="category/topic"] a', onTopicClicked);
showTopicsSelected(); showTopicsSelected();
@ -41,14 +38,19 @@ define('forum/topic/merge', function () {
function onTopicClicked(ev) { function onTopicClicked(ev) {
var tid = $(this).parents('[component="category/topic"]').attr('data-tid'); var tid = $(this).parents('[component="category/topic"]').attr('data-tid');
var index = $(this).parents('[component="category/topic"]').attr('data-index'); var index = $(this).parents('[component="category/topic"]').attr('data-index');
var title = ajaxify.data.topics[index] ? ajaxify.data.topics[index].title : 'No title'; socket.emit('topics.getTopic', tid, function (err, topicData) {
if (selectedTids[tid]) { if (err) {
delete selectedTids[tid]; return app.alertError(err);
} else { }
selectedTids[tid] = title; var title = topicData ? topicData.title : 'No title';
} if (selectedTids[tid]) {
checkButtonEnable(); delete selectedTids[tid];
showTopicsSelected(); } else {
selectedTids[tid] = title;
}
checkButtonEnable();
showTopicsSelected();
});
ev.preventDefault(); ev.preventDefault();
ev.stopPropagation(); ev.stopPropagation();
return false; return false;

Loading…
Cancel
Save