Merge branch 'master' of github.com:shish/shimmie2
This commit is contained in:
commit
1ae3c8e0ba
1 changed files with 12 additions and 5 deletions
|
@ -1,13 +1,15 @@
|
||||||
$(function() {
|
$(function() {
|
||||||
var blocked_tags = ($.cookie("ui-blocked-tags") || $.cookie("blocked-tags") || "").split(" ");
|
var blocked_tags = ($.cookie("ui-blocked-tags") || $.cookie("blocked-tags") || "").split(" ");
|
||||||
var themecheck = $(".thumb[data-tags~='tagme']").parent().attr('class');
|
var themecheck = $(".thumb[data-tags]").parent().attr('class');
|
||||||
var needs_refresh = false;
|
var needs_refresh = false;
|
||||||
for(i=0; i<blocked_tags.length; i++) {
|
for(i=0; i<blocked_tags.length; i++) {
|
||||||
var tag = blocked_tags[i];
|
var tag = blocked_tags[i];
|
||||||
if(tag) {
|
if(tag) {
|
||||||
$(".thumb[data-tags~='"+tag+"']").hide();
|
|
||||||
if(themecheck == "thumbblock") {
|
if(themecheck == "thumbblock") {
|
||||||
$(".thumb[data-tags~='tagme']").parent().height(0); //required for lite theme
|
$(".thumb[data-tags~='"+tag+"']").parent().hide();
|
||||||
|
$(".thumb[data-tags~='"+tag+"']").parent().height(0); //required for lite theme
|
||||||
|
}else{
|
||||||
|
$(".thumb[data-tags~='"+tag+"']").hide();
|
||||||
}
|
}
|
||||||
needs_refresh = true;
|
needs_refresh = true;
|
||||||
}
|
}
|
||||||
|
@ -16,9 +18,14 @@ $(function() {
|
||||||
// text-align: justify with element margins and doesn't recalculate
|
// text-align: justify with element margins and doesn't recalculate
|
||||||
// these margins when part of the line disappears...
|
// these margins when part of the line disappears...
|
||||||
if(needs_refresh) {
|
if(needs_refresh) {
|
||||||
|
if(themecheck == "thumbblock") {
|
||||||
|
$('.blockbody').hide();
|
||||||
|
$('.blockbody').show();
|
||||||
|
}else{
|
||||||
$('#image-list').hide();
|
$('#image-list').hide();
|
||||||
$('#image-list').show();
|
$('#image-list').show();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
function select_blocked_tags() {
|
function select_blocked_tags() {
|
||||||
|
|
Reference in a new issue