Browse Source

Format bans page fix patch

pull/107/head
Zankaria 3 months ago
parent
commit
1b00660d33
  1. 20
      js/longtable/longtable.js
  2. 65
      js/mod/ban-list.js

20
js/longtable/longtable.js

@ -42,7 +42,7 @@ $.fn.longtable = function(fields, options, data) {
}
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);
@ -75,7 +75,6 @@ $.fn.longtable = function(fields, options, data) {
$(elem).trigger("new-row", [data[id], el]);
shown_rows[id] = true;
},
_sort_by: function(field) {
if (field !== undefined) {
if (sorted_by == field) {
@ -88,22 +87,18 @@ $.fn.longtable = function(fields, options, data) {
}
lt.sort_by(sorted_by, sorted_reverse);
},
_apply_filter: function() {
data = data.filter(filter);
data = data.filter(filter);
},
_reset_data: function() {
data = orig_data;
},
set_filter: function(f) {
filter = f;
lt._reset_data();
lt._apply_filter();
lt._sort_by();
},
sort_by: function(field, reverse) {
if (field !== undefined) {
sorted_by = field;
@ -117,7 +112,6 @@ $.fn.longtable = function(fields, options, data) {
lt.update_data();
},
update_viewport: function() {
var first = $(window).scrollTop() - $(elem).offset().top - options.row_h;
var last = first + $(window).height();
@ -139,20 +133,14 @@ $.fn.longtable = function(fields, options, data) {
if (!shown_rows[id]) lt._insert(id);
}
},
update_data: function() {
lt._clean();
lt.update_viewport();
},
get_data: function() {
return data;
},
destroy: function() {
},
destroy: function() {},
// http://web.archive.org/web/20130826203933/http://my.opera.com/GreyWyvern/blog/show.dml/1671288
sort_alphanum: function(a, b) {
function chunkify(t) {
@ -185,8 +173,6 @@ $.fn.longtable = function(fields, options, data) {
// End of foreign code
};
lt._gen_tr().appendTo(elem);
lt.update_data();

65
js/mod/ban-list.js

@ -2,7 +2,6 @@ var banlist_init = function(token, my_boards, inMod) {
inMod = !inMod;
var lt;
var selected = {};
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) {
return pre+"<a href='?/IP/"+f.mask+"'>"+f.mask+"</a>";
}
return pre+f.mask;
return pre+"<a href='?/IP/"+f.mask+"'>"+f.mask+"</a>";
}
return pre+f.mask;
} },
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.message) {
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;
}
if (f.message) {
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;
}
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;
else return add + "-" + suf;
} },
board: {name: _("Board"), width: "60px", fmt: function(f) {
if (f.board) return "/"+f.board+"/";
else return "<em>"+_("all")+"</em>";
else return "<em>"+_("all")+"</em>";
} },
created: {name: _("Set"), width: "100px", fmt: function(f) {
return ago(f.created) + _(" ago"); // in AGO form
} },
// duration?
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) +
((f.expires < time()) ? "" : " <small>"+_("in ")+until(f.expires|0)+"</small>");
} },
username: {name: _("Staff"), width: "100px", fmt: function(f) {
var pre='',suf='',un=f.username;
if (inMod && f.username && f.username != '?' && !f.vstaff) {
pre = "<a href='?/new_PM/"+f.username+"'>";
suf = "</a>";
}
if (!f.username) {
un = "<em>"+_("system")+"</em>";
}
return pre + un + suf;
var pre='',suf='',un=f.username;
if (inMod && f.username && f.username != '?' && !f.vstaff) {
pre = "<a href='?/new_PM/"+f.username+"'>";
suf = "</a>";
}
if (!f.username) {
un = "<em>"+_("system")+"</em>";
}
return pre + un + suf;
} }
}, {}, t);
@ -92,22 +91,22 @@ var banlist_init = function(token, my_boards, inMod) {
var fields = ["mask", "reason", "board", "staff", "message"];
var ret_false = false;
terms.forEach(function(t) {
terms.forEach(function(t) {
var fs = fields;
var re = /^(mask|reason|board|staff|message):/, ma;
var re = /^(mask|reason|board|staff|message):/, ma;
if (ma = t.match(re)) {
fs = [ma[1]];
t = t.replace(re, "");
}
var found = false
fs.forEach(function(f) {
if (e[f] && e[f].indexOf(t) !== -1) {
found = true;
}
});
if (!found) ret_false = true;
t = t.replace(re, "");
}
var found = false
fs.forEach(function(f) {
if (e[f] && e[f].indexOf(t) !== -1) {
found = true;
}
});
if (!found) ret_false = true;
});
if (ret_false) return false;

Loading…
Cancel
Save