mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-12-17 14:00:29 +01:00
Compare commits
21 Commits
socket.io-
...
v1.18.7-be
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b46dcd9243 | ||
|
|
1a375000a7 | ||
|
|
1f8f2e9168 | ||
|
|
edae9522b5 | ||
|
|
7ff2b7fbb1 | ||
|
|
22e74dc0bb | ||
|
|
27acf19325 | ||
|
|
0f29433baf | ||
|
|
ebe7f11d0b | ||
|
|
c248805165 | ||
|
|
830cddfb40 | ||
|
|
abbbc3d7c2 | ||
|
|
8593ea87e9 | ||
|
|
1d401329ee | ||
|
|
9e52236973 | ||
|
|
eff03e4b57 | ||
|
|
854c078b73 | ||
|
|
36653525bd | ||
|
|
0409403f5b | ||
|
|
839673d321 | ||
|
|
d220d1d461 |
@@ -2,7 +2,7 @@
|
|||||||
"name": "nodebb",
|
"name": "nodebb",
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"description": "NodeBB Forum",
|
"description": "NodeBB Forum",
|
||||||
"version": "1.18.5",
|
"version": "1.18.6",
|
||||||
"homepage": "http://www.nodebb.org",
|
"homepage": "http://www.nodebb.org",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
@@ -89,7 +89,7 @@
|
|||||||
"nodebb-plugin-emoji": "^3.5.0",
|
"nodebb-plugin-emoji": "^3.5.0",
|
||||||
"nodebb-plugin-emoji-android": "2.0.5",
|
"nodebb-plugin-emoji-android": "2.0.5",
|
||||||
"nodebb-plugin-markdown": "8.14.4",
|
"nodebb-plugin-markdown": "8.14.4",
|
||||||
"nodebb-plugin-mentions": "3.0.2",
|
"nodebb-plugin-mentions": "3.0.3",
|
||||||
"nodebb-plugin-spam-be-gone": "0.7.11",
|
"nodebb-plugin-spam-be-gone": "0.7.11",
|
||||||
"nodebb-rewards-essentials": "0.2.0",
|
"nodebb-rewards-essentials": "0.2.0",
|
||||||
"nodebb-theme-lavender": "5.3.1",
|
"nodebb-theme-lavender": "5.3.1",
|
||||||
@@ -182,4 +182,4 @@
|
|||||||
"url": "https://github.com/barisusakli"
|
"url": "https://github.com/barisusakli"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -285,7 +285,7 @@ define('forum/topic/threadTools', [
|
|||||||
|
|
||||||
threadEl.find('[component="post"][data-uid="' + app.user.uid + '"].deleted [component="post/tools"]').toggleClass('hidden', isLocked);
|
threadEl.find('[component="post"][data-uid="' + app.user.uid + '"].deleted [component="post/tools"]').toggleClass('hidden', isLocked);
|
||||||
|
|
||||||
$('.topic-header [component="topic/locked"]').toggleClass('hidden', !data.isLocked);
|
$('[component="topic/labels"] [component="topic/locked"]').toggleClass('hidden', !data.isLocked);
|
||||||
$('[component="post/tools"] .dropdown-menu').html('');
|
$('[component="post/tools"] .dropdown-menu').html('');
|
||||||
ajaxify.data.locked = data.isLocked;
|
ajaxify.data.locked = data.isLocked;
|
||||||
|
|
||||||
@@ -334,7 +334,7 @@ define('forum/topic/threadTools', [
|
|||||||
|
|
||||||
components.get('topic/pin').toggleClass('hidden', data.pinned).parent().attr('hidden', data.pinned ? '' : null);
|
components.get('topic/pin').toggleClass('hidden', data.pinned).parent().attr('hidden', data.pinned ? '' : null);
|
||||||
components.get('topic/unpin').toggleClass('hidden', !data.pinned).parent().attr('hidden', !data.pinned ? '' : null);
|
components.get('topic/unpin').toggleClass('hidden', !data.pinned).parent().attr('hidden', !data.pinned ? '' : null);
|
||||||
const icon = $('.topic-header [component="topic/pinned"]');
|
const icon = $('[component="topic/labels"] [component="topic/pinned"]');
|
||||||
icon.toggleClass('hidden', !data.pinned);
|
icon.toggleClass('hidden', !data.pinned);
|
||||||
if (data.pinned) {
|
if (data.pinned) {
|
||||||
icon.translateAttr('title', (
|
icon.translateAttr('title', (
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ module.exports = function (Categories) {
|
|||||||
let cids = await findCids(query, data.hardCap);
|
let cids = await findCids(query, data.hardCap);
|
||||||
|
|
||||||
const result = await plugins.hooks.fire('filter:categories.search', {
|
const result = await plugins.hooks.fire('filter:categories.search', {
|
||||||
|
data: data,
|
||||||
cids: cids,
|
cids: cids,
|
||||||
uid: uid,
|
uid: uid,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -53,10 +53,10 @@ module.exports = function (SocketCategories) {
|
|||||||
const result = await categories.search({
|
const result = await categories.search({
|
||||||
uid: uid,
|
uid: uid,
|
||||||
query: data.search,
|
query: data.search,
|
||||||
|
qs: data.query,
|
||||||
paginate: false,
|
paginate: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
let matchedCids = result.categories.map(c => c.cid);
|
let matchedCids = result.categories.map(c => c.cid);
|
||||||
// no need to filter if all 3 states are used
|
// no need to filter if all 3 states are used
|
||||||
const filterByWatchState = !Object.values(categories.watchStates)
|
const filterByWatchState = !Object.values(categories.watchStates)
|
||||||
|
|||||||
Reference in New Issue
Block a user