dont require search and moustrap on topic page until needed

v1.18.x
Barış Soner Uşaklı 6 years ago
parent e17c4b2766
commit 1ce15e69ab

@ -73,18 +73,21 @@ define('forum/topic', [
}; };
function handleTopicSearch() { function handleTopicSearch() {
require(['search', 'mousetrap'], function (search, mousetrap) {
$('.topic-search').off('click') $('.topic-search').off('click')
.on('click', '.prev', function () { .on('click', '.prev', function () {
require(['search'], function (search) {
search.topicDOM.prev(); search.topicDOM.prev();
});
}) })
.on('click', '.next', function () { .on('click', '.next', function () {
require(['search'], function (search) {
search.topicDOM.next(); search.topicDOM.next();
}); });
});
mousetrap.bind('ctrl+f', function (e) {
if (config.topicSearchEnabled) { if (config.topicSearchEnabled) {
// If in topic, open search window and populate, otherwise regular behaviour require(['mousetrap'], function (mousetrap) {
mousetrap.bind('ctrl+f', function (e) {
var match = ajaxify.currentPage.match(/^topic\/([\d]+)/); var match = ajaxify.currentPage.match(/^topic\/([\d]+)/);
var tid; var tid;
if (match) { if (match) {
@ -93,10 +96,10 @@ define('forum/topic', [
$('#search-fields input').val('in:topic-' + tid + ' '); $('#search-fields input').val('in:topic-' + tid + ' ');
app.prepareSearch(); app.prepareSearch();
} }
}
}); });
}); });
} }
}
Topic.toTop = function () { Topic.toTop = function () {
navigator.scrollTop(0); navigator.scrollTop(0);

@ -67,7 +67,6 @@ JS.scripts = {
'public/src/modules/topicList.js', 'public/src/modules/topicList.js',
'public/src/modules/categorySelector.js', 'public/src/modules/categorySelector.js',
'public/src/modules/share.js', 'public/src/modules/share.js',
'public/src/modules/search.js',
'public/src/modules/alerts.js', 'public/src/modules/alerts.js',
'public/src/modules/taskbar.js', 'public/src/modules/taskbar.js',
'public/src/modules/helpers.js', 'public/src/modules/helpers.js',

Loading…
Cancel
Save