summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2010-12-21 16:28:36 +0100
committerYorhel <git@yorhel.nl>2010-12-21 16:28:36 +0100
commitfa403120fc7c5b417cc21e93ce2f5acb43b5ede4 (patch)
treeac1ad53fce0c4a3f545b12e681fd5aac12a7c178
parente15869b9c0c124d67f5d8ac85ffefad383642672 (diff)
Don't send 'tagspoil' filter when 'tag_inc' isn't active
-rw-r--r--ChangeLog1
-rw-r--r--data/script.js9
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c80fa245..fac815eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
- Added notes field to the user VN list
- Added vnlists.status filter to /u+/list
- Pass VN tag filters by ID rather than name
+ - Don't send 'tagspoil' filter when 'tag_inc' isn't active
2.15 - 2010-12-15
- Removed expand/collapse from history browser and /u+/posts and switched to
diff --git a/data/script.js b/data/script.js
index b208af56..998c24d9 100644
--- a/data/script.js
+++ b/data/script.js
@@ -1840,8 +1840,8 @@ function filSelectField(obj) {
}
function filSerialize() {
- var l = [];
var num = 0;
+ var values = {};
for(var f in fil_cats[0]) {
if(!byId('fil_check_'+f).checked)
continue;
@@ -1861,8 +1861,13 @@ function filSerialize() {
}
}
if(r.length > 0 && r[0] != '')
- l.push(fil_cats[0][f].fil_code+'-'+r.join('~'));
+ values[fil_cats[0][f].fil_code] = r.join('~');
}
+ if(!values['tag_inc'])
+ delete values['tagspoil'];
+ var l = [];
+ for(var f in values)
+ l.push(f+'-'+values[f]);
byId('fil').value = l.join('.');
setText(byName(byId('filselect'), 'i')[1], num > 0 ? ' ('+num+')' : '');
}