Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 19:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #4512

Browse Source
This commit is contained in:
barisusakli
2016-04-18 16:06:59 +03:00
parent accd9b6e2e
commit ff9b2bad49
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/client/topic.js
View File

@@ -143,7 +143,7 @@ define('forum/topic', [
if (components.get('post/anchor', postIndex).length) { if (components.get('post/anchor', postIndex).length) {
return navigator.scrollToPostIndex(postIndex, true); return navigator.scrollToPostIndex(postIndex, true);
} }
} else if (bookmark && (!config.usePagination || (config.usePagination && ajaxify.data.pagination.currentPage === 1)) && ajaxify.data.postcount > 5) { } else if (bookmark && (!config.usePagination || (config.usePagination && ajaxify.data.pagination.currentPage === 1)) && ajaxify.data.postcount > ajaxify.data.bookmarkThreshold) {
navigator.update(0); navigator.update(0);
app.alert({ app.alert({
alert_id: 'bookmark', alert_id: 'bookmark',
@@ -280,7 +280,7 @@ define('forum/topic', [
var bookmarkKey = 'topic:' + ajaxify.data.tid + ':bookmark'; var bookmarkKey = 'topic:' + ajaxify.data.tid + ':bookmark';
var currentBookmark = ajaxify.data.bookmark || localStorage.getItem(bookmarkKey); var currentBookmark = ajaxify.data.bookmark || localStorage.getItem(bookmarkKey);
if (ajaxify.data.postcount > 5 && (!currentBookmark || parseInt(index, 10) > parseInt(currentBookmark, 10))) { if (ajaxify.data.postcount > ajaxify.data.bookmarkThreshold && (!currentBookmark || parseInt(index, 10) > parseInt(currentBookmark, 10))) {
if (app.user.uid) { if (app.user.uid) {
socket.emit('topics.bookmark', { socket.emit('topics.bookmark', {
'tid': ajaxify.data.tid, 'tid': ajaxify.data.tid,

1
src/controllers/topics.js
View File

@@ -261,6 +261,7 @@ topicsController.get = function(req, res, callback) {
data['reputation:disabled'] = parseInt(meta.config['reputation:disabled'], 10) === 1; data['reputation:disabled'] = parseInt(meta.config['reputation:disabled'], 10) === 1;
data['downvote:disabled'] = parseInt(meta.config['downvote:disabled'], 10) === 1; data['downvote:disabled'] = parseInt(meta.config['downvote:disabled'], 10) === 1;
data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1; data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
data.bookmarkThreshold = parseInt(meta.config.bookmarkThreshold, 10) || 5;
data.scrollToMyPost = settings.scrollToMyPost; data.scrollToMyPost = settings.scrollToMyPost;
data.rssFeedUrl = nconf.get('relative_path') + '/topic/' + data.tid + '.rss'; data.rssFeedUrl = nconf.get('relative_path') + '/topic/' + data.tid + '.rss';
data.pagination = pagination.create(currentPage, pageCount); data.pagination = pagination.create(currentPage, pageCount);

4
src/views/admin/settings/post.tpl
View File

@@ -100,6 +100,10 @@
<label for="unreadCutoff">Unread cutoff days</label> <label for="unreadCutoff">Unread cutoff days</label>
<input id="unreadCutoff" type="text" class="form-control" value="2" data-field="unreadCutoff"> <input id="unreadCutoff" type="text" class="form-control" value="2" data-field="unreadCutoff">
</div> </div>
<div class="form-group">
<label for="bookmarkthreshold">Minimum posts in topic before tracking last read</label>
<input id="bookmarkthreshold" type="text" class="form-control" value="5" data-field="bookmarkThreshold">
</div>
</form> </form>
</div> </div>
</div> </div>