Format bans page fix patch
This commit is contained in:
parent
a028434e94
commit
b515b74594
|
@ -42,7 +42,7 @@ $.fn.longtable = function(fields, options, data) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fields[field].max_width) {
|
if (fields[field].max_width) {
|
||||||
el.css("max-width", fields[field].max_width);
|
el.css("max-width", fields[field].max_width);
|
||||||
}
|
}
|
||||||
el.css("width", fields[field].width);
|
el.css("width", fields[field].width);
|
||||||
|
|
||||||
|
@ -75,7 +75,6 @@ $.fn.longtable = function(fields, options, data) {
|
||||||
$(elem).trigger("new-row", [data[id], el]);
|
$(elem).trigger("new-row", [data[id], el]);
|
||||||
shown_rows[id] = true;
|
shown_rows[id] = true;
|
||||||
},
|
},
|
||||||
|
|
||||||
_sort_by: function(field) {
|
_sort_by: function(field) {
|
||||||
if (field !== undefined) {
|
if (field !== undefined) {
|
||||||
if (sorted_by == field) {
|
if (sorted_by == field) {
|
||||||
|
@ -88,22 +87,18 @@ $.fn.longtable = function(fields, options, data) {
|
||||||
}
|
}
|
||||||
lt.sort_by(sorted_by, sorted_reverse);
|
lt.sort_by(sorted_by, sorted_reverse);
|
||||||
},
|
},
|
||||||
|
|
||||||
_apply_filter: function() {
|
_apply_filter: function() {
|
||||||
data = data.filter(filter);
|
data = data.filter(filter);
|
||||||
},
|
},
|
||||||
_reset_data: function() {
|
_reset_data: function() {
|
||||||
data = orig_data;
|
data = orig_data;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
set_filter: function(f) {
|
set_filter: function(f) {
|
||||||
filter = f;
|
filter = f;
|
||||||
lt._reset_data();
|
lt._reset_data();
|
||||||
lt._apply_filter();
|
lt._apply_filter();
|
||||||
lt._sort_by();
|
lt._sort_by();
|
||||||
},
|
},
|
||||||
|
|
||||||
sort_by: function(field, reverse) {
|
sort_by: function(field, reverse) {
|
||||||
if (field !== undefined) {
|
if (field !== undefined) {
|
||||||
sorted_by = field;
|
sorted_by = field;
|
||||||
|
@ -117,7 +112,6 @@ $.fn.longtable = function(fields, options, data) {
|
||||||
|
|
||||||
lt.update_data();
|
lt.update_data();
|
||||||
},
|
},
|
||||||
|
|
||||||
update_viewport: function() {
|
update_viewport: function() {
|
||||||
var first = $(window).scrollTop() - $(elem).offset().top - options.row_h;
|
var first = $(window).scrollTop() - $(elem).offset().top - options.row_h;
|
||||||
var last = first + $(window).height();
|
var last = first + $(window).height();
|
||||||
|
@ -139,20 +133,14 @@ $.fn.longtable = function(fields, options, data) {
|
||||||
if (!shown_rows[id]) lt._insert(id);
|
if (!shown_rows[id]) lt._insert(id);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
update_data: function() {
|
update_data: function() {
|
||||||
|
|
||||||
lt._clean();
|
lt._clean();
|
||||||
lt.update_viewport();
|
lt.update_viewport();
|
||||||
},
|
},
|
||||||
|
|
||||||
get_data: function() {
|
get_data: function() {
|
||||||
return data;
|
return data;
|
||||||
},
|
},
|
||||||
|
destroy: function() {},
|
||||||
destroy: function() {
|
|
||||||
},
|
|
||||||
|
|
||||||
// http://web.archive.org/web/20130826203933/http://my.opera.com/GreyWyvern/blog/show.dml/1671288
|
// http://web.archive.org/web/20130826203933/http://my.opera.com/GreyWyvern/blog/show.dml/1671288
|
||||||
sort_alphanum: function(a, b) {
|
sort_alphanum: function(a, b) {
|
||||||
function chunkify(t) {
|
function chunkify(t) {
|
||||||
|
@ -185,8 +173,6 @@ $.fn.longtable = function(fields, options, data) {
|
||||||
// End of foreign code
|
// End of foreign code
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
lt._gen_tr().appendTo(elem);
|
lt._gen_tr().appendTo(elem);
|
||||||
lt.update_data();
|
lt.update_data();
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ var banlist_init = function(token, my_boards, inMod) {
|
||||||
inMod = !inMod;
|
inMod = !inMod;
|
||||||
|
|
||||||
var lt;
|
var lt;
|
||||||
|
|
||||||
var selected = {};
|
var selected = {};
|
||||||
|
|
||||||
var time = function() { return Date.now()/1000|0; }
|
var time = function() { return Date.now()/1000|0; }
|
||||||
|
@ -33,46 +32,46 @@ var banlist_init = function(token, my_boards, inMod) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (inMod && f.single_addr && !f.masked) {
|
if (inMod && f.single_addr && !f.masked) {
|
||||||
return pre+"<a href='?/IP/"+f.mask+"'>"+f.mask+"</a>";
|
return pre+"<a href='?/IP/"+f.mask+"'>"+f.mask+"</a>";
|
||||||
}
|
}
|
||||||
return pre+f.mask;
|
return pre+f.mask;
|
||||||
} },
|
} },
|
||||||
reason: {name: _("Reason"), width: "40%", max_width: "40%", max_height: "240px", handle_longwords: true, fmt: function(f) {
|
reason: {name: _("Reason"), width: "40%", max_width: "40%", max_height: "240px", handle_longwords: true, fmt: function(f) {
|
||||||
var add = "", suf = '';
|
var add = "", suf = '';
|
||||||
if (f.seen == 1) add += "<i class='fa fa-check' title='"+_("Seen")+"'></i>";
|
if (f.seen == 1) add += "<i class='fa fa-check' title='"+_("Seen")+"'></i>";
|
||||||
if (f.message) {
|
if (f.message) {
|
||||||
add += "<i class='fa fa-comment' title='"+_("Message for which user was banned is included")+"'></i>";
|
add += "<i class='fa fa-comment' title='"+_("Message for which user was banned is included")+"'></i>";
|
||||||
suf = "<br /><br /><strong>"+_("Message:")+"</strong><br />"+f.message;
|
suf = "<br /><br /><strong>"+_("Message:")+"</strong><br />"+f.message;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (add) { add = "<div style='float: right;'>"+add+"</div>"; }
|
if (add) { add = "<div style='float: right;'>"+add+"</div>"; }
|
||||||
|
|
||||||
if (f.reason) return add + f.reason + suf;
|
if (f.reason) return add + f.reason + suf;
|
||||||
else return add + "-" + suf;
|
else return add + "-" + suf;
|
||||||
} },
|
} },
|
||||||
board: {name: _("Board"), width: "60px", fmt: function(f) {
|
board: {name: _("Board"), width: "60px", fmt: function(f) {
|
||||||
if (f.board) return "/"+f.board+"/";
|
if (f.board) return "/"+f.board+"/";
|
||||||
else return "<em>"+_("all")+"</em>";
|
else return "<em>"+_("all")+"</em>";
|
||||||
} },
|
} },
|
||||||
created: {name: _("Set"), width: "100px", fmt: function(f) {
|
created: {name: _("Set"), width: "100px", fmt: function(f) {
|
||||||
return ago(f.created) + _(" ago"); // in AGO form
|
return ago(f.created) + _(" ago"); // in AGO form
|
||||||
} },
|
} },
|
||||||
// duration?
|
// duration?
|
||||||
expires: {name: _("Expires"), width: "235px", fmt: function(f) {
|
expires: {name: _("Expires"), width: "235px", fmt: function(f) {
|
||||||
if (!f.expires || f.expires == 0) return "<em>"+_("never")+"</em>";
|
if (!f.expires || f.expires == 0) return "<em>"+_("never")+"</em>";
|
||||||
return strftime(window.post_date, new Date((f.expires|0)*1000), datelocale) +
|
return strftime(window.post_date, new Date((f.expires|0)*1000), datelocale) +
|
||||||
((f.expires < time()) ? "" : " <small>"+_("in ")+until(f.expires|0)+"</small>");
|
((f.expires < time()) ? "" : " <small>"+_("in ")+until(f.expires|0)+"</small>");
|
||||||
} },
|
} },
|
||||||
username: {name: _("Staff"), width: "100px", fmt: function(f) {
|
username: {name: _("Staff"), width: "100px", fmt: function(f) {
|
||||||
var pre='',suf='',un=f.username;
|
var pre='',suf='',un=f.username;
|
||||||
if (inMod && f.username && f.username != '?' && !f.vstaff) {
|
if (inMod && f.username && f.username != '?' && !f.vstaff) {
|
||||||
pre = "<a href='?/new_PM/"+f.username+"'>";
|
pre = "<a href='?/new_PM/"+f.username+"'>";
|
||||||
suf = "</a>";
|
suf = "</a>";
|
||||||
}
|
}
|
||||||
if (!f.username) {
|
if (!f.username) {
|
||||||
un = "<em>"+_("system")+"</em>";
|
un = "<em>"+_("system")+"</em>";
|
||||||
}
|
}
|
||||||
return pre + un + suf;
|
return pre + un + suf;
|
||||||
} }
|
} }
|
||||||
}, {}, t);
|
}, {}, t);
|
||||||
|
|
||||||
|
@ -92,22 +91,22 @@ var banlist_init = function(token, my_boards, inMod) {
|
||||||
var fields = ["mask", "reason", "board", "staff", "message"];
|
var fields = ["mask", "reason", "board", "staff", "message"];
|
||||||
|
|
||||||
var ret_false = false;
|
var ret_false = false;
|
||||||
terms.forEach(function(t) {
|
terms.forEach(function(t) {
|
||||||
var fs = fields;
|
var fs = fields;
|
||||||
|
|
||||||
var re = /^(mask|reason|board|staff|message):/, ma;
|
var re = /^(mask|reason|board|staff|message):/, ma;
|
||||||
if (ma = t.match(re)) {
|
if (ma = t.match(re)) {
|
||||||
fs = [ma[1]];
|
fs = [ma[1]];
|
||||||
t = t.replace(re, "");
|
t = t.replace(re, "");
|
||||||
}
|
}
|
||||||
|
|
||||||
var found = false
|
var found = false
|
||||||
fs.forEach(function(f) {
|
fs.forEach(function(f) {
|
||||||
if (e[f] && e[f].indexOf(t) !== -1) {
|
if (e[f] && e[f].indexOf(t) !== -1) {
|
||||||
found = true;
|
found = true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if (!found) ret_false = true;
|
if (!found) ret_false = true;
|
||||||
});
|
});
|
||||||
|
|
||||||
if (ret_false) return false;
|
if (ret_false) return false;
|
||||||
|
|
Loading…
Reference in New Issue