summaryrefslogtreecommitdiffstats
path: root/askbot/skins/common
diff options
context:
space:
mode:
authorTomasz Zielinski <tomasz.zielinski@pyconsultant.eu>2012-01-14 00:49:12 +0100
committerTomasz Zielinski <tomasz.zielinski@pyconsultant.eu>2012-01-14 00:49:12 +0100
commit441b9d670f734ec2aad0d2e745017b7cdc080e7a (patch)
treea54585ebfdff04d57229c9a8ae53accb8393fca2 /askbot/skins/common
parent849464ff7b3e754055a0e16617edb427dab9729b (diff)
downloadaskbot-441b9d670f734ec2aad0d2e745017b7cdc080e7a.tar.gz
askbot-441b9d670f734ec2aad0d2e745017b7cdc080e7a.tar.bz2
askbot-441b9d670f734ec2aad0d2e745017b7cdc080e7a.zip
Fixed two bugs in removing search tags
Diffstat (limited to 'askbot/skins/common')
-rw-r--r--askbot/skins/common/media/js/live_search.js4
-rw-r--r--askbot/skins/common/media/js/utils.js7
2 files changed, 5 insertions, 6 deletions
diff --git a/askbot/skins/common/media/js/live_search.js b/askbot/skins/common/media/js/live_search.js
index 2b34d407..476cd37b 100644
--- a/askbot/skins/common/media/js/live_search.js
+++ b/askbot/skins/common/media/js/live_search.js
@@ -47,11 +47,12 @@ var liveSearch = function(query_string) {
'query:' + encodeURIComponent(query_text),
query_text === '' // remove if empty
);
+ return query_text;
};
var send_query = function(query_text){
running = true;
- update_query_string(query_text);
+ prev_text = update_query_string(query_text);
var url = search_url + query_string;
$.ajax({
url: url,
@@ -63,7 +64,6 @@ var liveSearch = function(query_string) {
},
cache: false
});
- prev_text = query_text;
var context = { state:1, rand:Math.random() };
History.pushState( context, "Questions", url );
setTimeout(function (){
diff --git a/askbot/skins/common/media/js/utils.js b/askbot/skins/common/media/js/utils.js
index 58072771..8708df54 100644
--- a/askbot/skins/common/media/js/utils.js
+++ b/askbot/skins/common/media/js/utils.js
@@ -192,17 +192,16 @@ QSutils.remove_search_tag = function(query_string, tag){
}
var tags = tag_string.split(this.TAG_SEP);
- var new_tags = [];
var pos = $.inArray(encodeURIComponent(tag), tags);
if(pos > -1) {
- new_tags = tags.splice(pos, 1);
+ tags.splice(pos, 1); /* array.splice() works in-place */
}
- if(new_tags.length === 0) {
+ if(tags.length === 0) {
return this.patch_query_string(query_string, 'tags:', true);
} else {
- return this.patch_query_string(query_string, 'tags:' + new_tags.join(this.TAG_SEP));
+ return this.patch_query_string(query_string, 'tags:' + tags.join(this.TAG_SEP));
}
};