From e8304ba477d2c4ff6f577a6399a98c6a90358a88 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sun, 25 Dec 2011 20:46:00 -0300 Subject: made live search behave on the ask question page --- askbot/skins/common/media/js/live_search.js | 20 ++++++++++++-------- askbot/views/commands.py | 1 - 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/askbot/skins/common/media/js/live_search.js b/askbot/skins/common/media/js/live_search.js index bb18ce3b..8b2e4e93 100644 --- a/askbot/skins/common/media/js/live_search.js +++ b/askbot/skins/common/media/js/live_search.js @@ -578,20 +578,24 @@ var liveSearch = function(){ eval_query(); } - var send_query = function(query_text, sort_method){ - var post_data = {query: query_text}; - $.ajax({ + var send_query = function(query_text, mode){ + var post_data = { url: search_url, - //data: {query: query_text, sort: sort_method}, dataType: 'json', success: render_result, complete: try_again - }); + } + if (mode === 'ask_page'){ + post_data['data'] = {query: query_text}; + } + $.ajax(post_data); prev_text = query_text; var context = { state:1, rand:Math.random() }; var title = "Questions"; var query = search_url; - History.pushState( context, title, query ); + if (mode === 'main_page'){ + History.pushState( context, title, query ); + } //var stateObj = { page: search_url }; //window.history.pushState(stateObj, "Questions", search_url); @@ -671,7 +675,7 @@ var liveSearch = function(){ } } } - send_query(cur_text, sortMethod); + send_query(cur_text, mode); }; restart_query = function() { reset_sort_method(); @@ -689,7 +693,7 @@ var liveSearch = function(){ search_url = askbot['urls']['api_get_questions']; render_result = render_ask_page_result; process_query = function(){ - send_query(cur_text); + send_query(cur_text, mode); }; restart_query = function(){ $('#' + q_list_sel).css('height',0).children().remove(); diff --git a/askbot/views/commands.py b/askbot/views/commands.py index 7ecec578..2ef56731 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -440,7 +440,6 @@ def api_get_questions(request): page_size = form.cleaned_data.get('page_size', 30) questions = questions[:page_size] - question_list = list() for question in questions: question_list.append({ -- cgit v1.2.3-1-g7c22