Compare commits

...

16 Commits

Author SHA1 Message Date
Barış Soner Uşaklı
c28ac8ec52 fix: hooks is sometimes undefined 2021-11-08 19:47:02 -05:00
Barış Soner Uşaklı
400153f5f5 fix: remove unused code 2021-10-28 09:47:10 -04:00
Barış Soner Uşaklı
0f29433baf Merge branch 'v1.18.x' of https://github.com/NodeBB/NodeBB into v1.18.x 2021-10-27 14:28:28 -04:00
Barış Soner Uşaklı
ebe7f11d0b merge 2021-10-27 14:25:37 -04:00
Misty (Bot)
c248805165 chore: incrementing version number - v1.18.5 2021-10-27 16:47:58 +00:00
Misty (Bot)
830cddfb40 Merge commit 'bf20965f0bd68a46de4de4e3f274a6fbffa28073' into v1.18.x 2021-10-27 16:47:54 +00:00
Barış Soner Uşaklı
abbbc3d7c2 chore: up persona 2021-10-07 09:24:44 -04:00
Misty (Bot)
8593ea87e9 chore: incrementing version number - v1.18.4 2021-10-06 17:59:38 +00:00
Misty (Bot)
1d401329ee Merge commit 'f4e62fb1cdbeade062ef3172dbdfaaedacb14925' into v1.18.x 2021-10-06 17:59:33 +00:00
Misty (Bot)
9e52236973 chore: incrementing version number - v1.18.3 2021-09-22 17:01:44 +00:00
Misty (Bot)
eff03e4b57 Merge commit '9855429445d1856a28b3f845e4bad788f5860914' into v1.18.x 2021-09-22 17:01:34 +00:00
Misty (Bot)
854c078b73 chore: incrementing version number - v1.18.2 2021-09-08 16:27:00 +00:00
Misty (Bot)
36653525bd Merge commit '507517fce5248ad37f6a239fce16ae92d0e0f5b0' into v1.18.x 2021-09-08 16:26:58 +00:00
Misty (Bot)
0409403f5b chore: incrementing version number - v1.18.1 2021-09-03 15:04:06 +00:00
Misty (Bot)
839673d321 Merge commit 'b73d8849ab768fb665271a1b3cffe8211e6083f0' into v1.18.x 2021-09-03 15:03:59 +00:00
Misty (Bot)
d220d1d461 chore: incrementing version number - v1.18.0 2021-08-25 20:29:55 +00:00
4 changed files with 10 additions and 25 deletions

View File

@@ -2,7 +2,7 @@
"name": "nodebb",
"license": "GPL-3.0",
"description": "NodeBB Forum",
"version": "1.18.4",
"version": "1.18.5",
"homepage": "http://www.nodebb.org",
"repository": {
"type": "git",
@@ -182,4 +182,4 @@
"url": "https://github.com/barisusakli"
}
]
}
}

View File

@@ -593,11 +593,14 @@ app.cacheBuster = null;
});
let ajaxified = false;
hooks.on('action:ajaxify.end', function () {
if (!ajaxify.isCold()) {
ajaxified = true;
}
require(['hooks'], function (hooks) {
hooks.on('action:ajaxify.end', function () {
if (!ajaxify.isCold()) {
ajaxified = true;
}
});
});
inputEl.on('focus', function () {
mousedownOnResults = false;
const query = inputEl.val();

View File

@@ -32,12 +32,6 @@ define('forum/topic', [
navigator.disable();
components.get('navbar/title').find('span').text('').hide();
app.removeAlert('bookmark');
require(['search'], function (search) {
if (search.topicDOM.active) {
search.topicDOM.end();
}
});
}
});
@@ -79,18 +73,6 @@ define('forum/topic', [
};
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) {
require(['mousetrap'], function (mousetrap) {
mousetrap.bind(['command+f', 'ctrl+f'], function (e) {

View File

@@ -58,7 +58,7 @@ async function searchInContent(data) {
}
let pids = [];
let tids = [];
const inTopic = data.query.match(/^in:topic-([\d]+) /);
const inTopic = String(data.query || '').match(/^in:topic-([\d]+) /);
if (inTopic) {
const tid = inTopic[1];
const cleanedTerm = data.query.replace(inTopic[0], '');