fix merge
This commit is contained in:
parent
64a66db613
commit
880cf25366
@ -41,9 +41,6 @@ $(document).ready(function(){
|
||||
else {
|
||||
last_expanded = post_in_doc;
|
||||
}
|
||||
else {
|
||||
last_expanded = post_in_doc;
|
||||
}
|
||||
});
|
||||
$('<span class="omitted"><a href="javascript:void(0)">' + _('Hide expanded replies') + '</a>.</span>')
|
||||
.insertAfter(thread.find('span.omitted').css('display', 'none'))
|
||||
|
@ -16,9 +16,8 @@ onready(function(){
|
||||
var link = this.getElementsByTagName('a');
|
||||
|
||||
for (var i = 0; i < link.length; i++) {
|
||||
if (typeof link[i] == "object" && link[i].childNodes && link[i].childNodes[0].src && link[i].className != 'file') {
|
||||
if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].className != 'file') {
|
||||
link[i].childNodes[0].style.maxWidth = '95%';
|
||||
link[i].childNodes[0].style.maxHeight = '95%';
|
||||
link[i].onclick = function(e) {
|
||||
if (this.childNodes[0].className == 'hidden')
|
||||
return false;
|
||||
|
Loading…
Reference in New Issue
Block a user