mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-12-19 23:10:21 +01:00
Compare commits
16 Commits
socket.io-
...
v1.18.5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c28ac8ec52 | ||
|
|
400153f5f5 | ||
|
|
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.4",
|
"version": "1.18.5",
|
||||||
"homepage": "http://www.nodebb.org",
|
"homepage": "http://www.nodebb.org",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
@@ -182,4 +182,4 @@
|
|||||||
"url": "https://github.com/barisusakli"
|
"url": "https://github.com/barisusakli"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -593,11 +593,14 @@ app.cacheBuster = null;
|
|||||||
});
|
});
|
||||||
|
|
||||||
let ajaxified = false;
|
let ajaxified = false;
|
||||||
hooks.on('action:ajaxify.end', function () {
|
require(['hooks'], function (hooks) {
|
||||||
if (!ajaxify.isCold()) {
|
hooks.on('action:ajaxify.end', function () {
|
||||||
ajaxified = true;
|
if (!ajaxify.isCold()) {
|
||||||
}
|
ajaxified = true;
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
inputEl.on('focus', function () {
|
inputEl.on('focus', function () {
|
||||||
mousedownOnResults = false;
|
mousedownOnResults = false;
|
||||||
const query = inputEl.val();
|
const query = inputEl.val();
|
||||||
|
|||||||
@@ -32,12 +32,6 @@ define('forum/topic', [
|
|||||||
navigator.disable();
|
navigator.disable();
|
||||||
components.get('navbar/title').find('span').text('').hide();
|
components.get('navbar/title').find('span').text('').hide();
|
||||||
app.removeAlert('bookmark');
|
app.removeAlert('bookmark');
|
||||||
|
|
||||||
require(['search'], function (search) {
|
|
||||||
if (search.topicDOM.active) {
|
|
||||||
search.topicDOM.end();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -79,18 +73,6 @@ define('forum/topic', [
|
|||||||
};
|
};
|
||||||
|
|
||||||
function handleTopicSearch() {
|
function handleTopicSearch() {
|
||||||
$('.topic-search').off('click')
|
|
||||||
.on('click', '.prev', function () {
|
|
||||||
require(['search'], function (search) {
|
|
||||||
search.topicDOM.prev();
|
|
||||||
});
|
|
||||||
})
|
|
||||||
.on('click', '.next', function () {
|
|
||||||
require(['search'], function (search) {
|
|
||||||
search.topicDOM.next();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
if (config.topicSearchEnabled) {
|
if (config.topicSearchEnabled) {
|
||||||
require(['mousetrap'], function (mousetrap) {
|
require(['mousetrap'], function (mousetrap) {
|
||||||
mousetrap.bind(['command+f', 'ctrl+f'], function (e) {
|
mousetrap.bind(['command+f', 'ctrl+f'], function (e) {
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ async function searchInContent(data) {
|
|||||||
}
|
}
|
||||||
let pids = [];
|
let pids = [];
|
||||||
let tids = [];
|
let tids = [];
|
||||||
const inTopic = data.query.match(/^in:topic-([\d]+) /);
|
const inTopic = String(data.query || '').match(/^in:topic-([\d]+) /);
|
||||||
if (inTopic) {
|
if (inTopic) {
|
||||||
const tid = inTopic[1];
|
const tid = inTopic[1];
|
||||||
const cleanedTerm = data.query.replace(inTopic[0], '');
|
const cleanedTerm = data.query.replace(inTopic[0], '');
|
||||||
|
|||||||
Reference in New Issue
Block a user