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

closes #1996

Browse Source
This commit is contained in:
barisusakli
2014-08-27 18:03:53 -04:00
parent ba4b98de0e
commit 94c765fa25
6 changed files with 123 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
public/src/forum/admin/tags.js
View File

@@ -1,8 +1,9 @@
"use strict";
/*global define, socket, app, admin*/
/*global define, socket, app, admin, utils*/
define('forum/admin/tags', [], function() {
define('forum/admin/tags', ['forum/infinitescroll'], function(infinitescroll) {
var Tags = {};
var timeoutId = 0;
Tags.init = function() {
handleColorPickers();
@@ -12,10 +13,22 @@ define('forum/admin/tags', [], function() {
});
$('#tag-search').on('input propertychange', function() {
$('.tag-list').children().each(function() {
var $this = $(this);
$this.toggleClass('hide', $this.attr('data-tag').indexOf($('#tag-search').val()) === -1);
});
if (timeoutId) {
clearTimeout(timeoutId);
timeoutId = 0;
}
timeoutId = setTimeout(function() {
socket.emit('topics.searchAndLoadTags', {query: $('#tag-search').val()}, function(err, tags) {
if (err) {
return app.alertError(err.message);
}
infinitescroll.parseAndTranslate('admin/tags', 'tags', {tags: tags}, function(html) {
$('.tag-list').html(html);
utils.makeNumbersHumanReadable(html.find('.human-readable-number'));
timeoutId = 0;
});
});
}, 100);
});
};

51
public/src/forum/tags.js
View File

@@ -1,20 +1,59 @@
'use strict';
/* globals define, app */
/* globals define, app, utils, socket */
define('forum/tags', function() {
define('forum/tags', ['forum/infinitescroll'], function(infinitescroll) {
var Tags = {};
var timeoutId = 0;
Tags.init = function() {
app.enterRoom('tags');
$('#tag-search').on('input propertychange', function() {
$('.tag-list').children().each(function() {
var $this = $(this);
$this.toggleClass('hide', $this.find('a').attr('data-value').indexOf($('#tag-search').val()) === -1);
})
if (timeoutId) {
clearTimeout(timeoutId);
timeoutId = 0;
}
timeoutId = setTimeout(function() {
socket.emit('topics.searchAndLoadTags', {query: $('#tag-search').val()}, function(err, results) {
if (err) {
return app.alertError(err.message);
}
onTagsLoaded(results, true, function() {
timeoutId = 0;
});
});
}, 100);
});
infinitescroll.init(Tags.loadMoreTags);
};
Tags.loadMoreTags = function(direction) {
if(direction < 0 || !$('.tag-list').length) {
return;
}
infinitescroll.loadMore('topics.loadMoreTags', {
after: $('.tag-list').attr('data-nextstart')
}, function(data, done) {
if (data && data.tags && data.tags.length) {
onTagsLoaded(data.tags, false, done);
$('.tag-list').attr('data-nextstart', data.nextStart);
} else {
done();
}
});
};
function onTagsLoaded(tags, replace, callback) {
callback = callback || function() {};
infinitescroll.parseAndTranslate('tags', 'tags', {tags: tags}, function(html) {
$('.tag-list')[replace ? 'html' : 'append'](html);
utils.makeNumbersHumanReadable(html.find('.human-readable-number'));
callback();
});
}
return Tags;
});

2
src/controllers/admin.js
View File

@@ -132,7 +132,7 @@ function filterAndRenderCategories(req, res, next, active) {
}
adminController.tags.get = function(req, res, next) {
topics.getTags(0, -1, function(err, tags) {
topics.getTags(0, 99, function(err, tags) {
if (err) {
return next(err);
}

5
src/controllers/tags.js
View File

@@ -47,14 +47,13 @@ tagsController.getTag = function(req, res, next) {
};
tagsController.getTags = function(req, res, next) {
topics.getTags(0, -1, function(err, tags) {
topics.getTags(0, 99, function(err, tags) {
if (err) {
return next(err);
}
res.render('tags', {tags: tags});
res.render('tags', {tags: tags, nextStart: 100});
});
};
module.exports = tagsController;

49
src/socket.io/topics.js
View File

@@ -518,4 +518,53 @@ SocketTopics.searchTags = function(socket, data, callback) {
topics.searchTags(data, callback);
};
SocketTopics.searchAndLoadTags = function(socket, data, callback) {
topics.searchTags(data, function(err, tags) {
if (err) {
return callback(err);
}
async.parallel({
counts: function(next) {
db.sortedSetScores('tags:topic:count', tags, next);
},
tagData: function(next) {
tags = tags.map(function(tag) {
return {value: tag};
});
topics.getTagData(tags, next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
results.tagData.forEach(function(tag, index) {
tag.score = results.counts[index];
});
results.tagData.sort(function(a, b) {
return parseInt(b.score, 10) - parseInt(a.score, 10);
});
callback(null, results.tagData);
});
});
};
SocketTopics.loadMoreTags = function(socket, data, callback) {
if(!data || !data.after) {
return callback(new Error('[[error:invalid-data]]'));
}
var start = parseInt(data.after, 10),
end = start + 99;
topics.getTags(start, end, function(err, tags) {
if (err) {
return callback(err);
}
callback(null, {tags: tags, nextStart: end + 1});
});
};
module.exports = SocketTopics;

13
src/topics/tags.js
View File

@@ -89,11 +89,11 @@ module.exports = function(Topics) {
return callback(err);
}
addTagData(tags, callback);
Topics.getTagData(tags, callback);
});
};
function addTagData(tags, callback) {
Topics.getTagData = function(tags, callback) {
var keys = tags.map(function(tag) {
return 'tag:' + tag.value;
});
@@ -109,7 +109,7 @@ module.exports = function(Topics) {
});
callback(null, tags);
});
}
};
Topics.getTopicTags = function(tid, callback) {
db.getSetMembers('topic:' + tid + ':tags', callback);
@@ -139,7 +139,7 @@ module.exports = function(Topics) {
async.parallel({
tagData: function(next) {
addTagData(tags, next);
Topics.getTagData(tags, next);
},
counts: function(next) {
db.sortedSetScores('tags:topic:count', uniqueTopicTags, next);
@@ -214,12 +214,13 @@ module.exports = function(Topics) {
return callback(null, []);
}
db.getSortedSetRevRange('tags:topic:count', 0, -1, function(err, tags) {
if (err) {
return callback(null, []);
}
if (data.query === '') {
return callback(null, tags);
}
data.query = data.query.toLowerCase();
var matches = [];
for(var i=0; i<tags.length; ++i) {