Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-12 15:02:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

closes #2027

Browse Source
This commit is contained in:
barisusakli
2014-09-17 19:39:59 -04:00
parent 0f258859a7
commit 63a7766ac1
2 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
public/src/forum/category.js
View File

@@ -42,8 +42,8 @@ define('forum/category', ['composer', 'forum/pagination', 'forum/infinitescroll'
var clickedTid = $(this).parents('li.category-item[data-tid]').attr('data-tid');
$('#topics-container li.category-item').each(function(index, el) {
if($(el).offset().top - $(window).scrollTop() > 0) {
localStorage.setItem('category:bookmark', $(el).attr('data-tid'));
localStorage.setItem('category:bookmark:clicked', clickedTid);
localStorage.setItem('category:' + cid + ':bookmark', $(el).attr('data-tid'));
localStorage.setItem('category:' + cid + ':bookmark:clicked', clickedTid);
return false;
}
});
@@ -84,45 +84,53 @@ define('forum/category', ['composer', 'forum/pagination', 'forum/infinitescroll'
$(window).on('action:popstate', function(ev, data) {
if(data.url.indexOf('category/') === 0) {
var bookmark = localStorage.getItem('category:bookmark');
var clicked = localStorage.getItem('category:bookmark:clicked');
var cid = data.url.match(/^category\/(\d+)/);
if (cid && cid[1]) {
cid = cid[1];
}
if (!cid) {
return;
}
if (bookmark) {
var bookmark = localStorage.getItem('category:' + cid + ':bookmark');
var clicked = localStorage.getItem('category:' + cid + ':bookmark:clicked');
if(config.usePagination) {
socket.emit('topics.getTidPage', bookmark, function(err, page) {
if(err) {
return;
}
if(parseInt(page, 10) !== pagination.currentPage) {
pagination.loadPage(page);
} else {
Category.scrollToTopic(bookmark, clicked, 400);
}
if (!bookmark) {
return;
}
if(config.usePagination) {
socket.emit('topics.getTidPage', bookmark, function(err, page) {
if (err) {
return;
}
if(parseInt(page, 10) !== pagination.currentPage) {
pagination.loadPage(page);
} else {
Category.scrollToTopic(bookmark, clicked, 400);
}
});
} else {
socket.emit('topics.getTidIndex', bookmark, function(err, index) {
if (err) {
return;
}
if (index === 0) {
Category.highlightTopic(clicked);
return;
}
if (index < 0) {
index = 0;
}
$('#topics-container').empty();
loadTopicsAfter(index, function() {
Category.scrollToTopic(bookmark, clicked, 0);
});
} else {
socket.emit('topics.getTidIndex', bookmark, function(err, index) {
if(err) {
return;
}
if(index === 0) {
Category.highlightTopic(clicked);
return;
}
if (index < 0) {
index = 0;
}
$('#topics-container').empty();
loadTopicsAfter(index, function() {
Category.scrollToTopic(bookmark, clicked, 0);
});
});
}
});
}
}
});

2
public/src/modules/alerts.js
View File

@@ -6,7 +6,7 @@ define('alerts', function() {
module.alert = function (params) {
params.alert_id = 'alert_button_' + (params.alert_id ? params.alert_id : new Date().getTime());
params.title = params.title.trim() || '';
params.title = params.title ? params.title.trim() || '' : '';
params.message = params.message.trim();
params.location = params.location || 'right-top';