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

search fix, moved topic search to topic.js

Browse Source
This commit is contained in:
barisusakli
2015-06-09 15:10:30 -04:00
parent 1fef40eb6f
commit 387a5e36b2
2 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
public/src/app.js
View File

@@ -406,12 +406,6 @@ app.cacheBuster = null;
searchButton.show(); searchButton.show();
} }
function prepareSearch() {
searchFields.removeClass('hide').show();
searchButton.hide();
searchInput.focus();
}
searchButton.on('click', function(e) { searchButton.on('click', function(e) {
if (!config.loggedIn && !config.allowGuestSearching) { if (!config.loggedIn && !config.allowGuestSearching) {
app.alert({ app.alert({
@@ -423,43 +417,26 @@ app.cacheBuster = null;
} }
e.stopPropagation(); e.stopPropagation();
prepareSearch(); app.prepareSearch();
return false; return false;
}); });
require(['search', 'mousetrap'], function(search, Mousetrap) { $('#search-form').on('submit', function () {
$('#search-form').on('submit', function (e) {
e.preventDefault();
var input = $(this).find('input'); var input = $(this).find('input');
require(['search'], function(search) {
search.query({term: input.val()}, function() { search.query({term: input.val()}, function() {
input.val(''); input.val('');
}); });
}); });
return false;
});
};
$('.topic-search') app.prepareSearch = function() {
.on('click', '.prev', function() { $("#search-fields").removeClass('hide').show();
search.topicDOM.prev(); $("#search-button").hide();
}) $('#search-fields input').focus();
.on('click', '.next', function() { };
search.topicDOM.next();
});
Mousetrap.bind('ctrl+f', function(e) {
if (config.topicSearchEnabled) {
// If in topic, open search window and populate, otherwise regular behaviour
var match = ajaxify.currentPage.match(/^topic\/([\d]+)/),
tid;
if (match) {
e.preventDefault();
tid = match[1];
searchInput.val('in:topic-' + tid + ' ');
prepareSearch();
}
}
});
});
}
function handleStatusChange() { function handleStatusChange() {
$('#user-control-list .user-status').off('click').on('click', function(e) { $('#user-control-list .user-status').off('click').on('click', function(e) {

28
public/src/client/topic.js
View File

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