fix merge

This commit is contained in:
czaks 2013-07-27 01:08:26 -04:00
parent 64a66db613
commit 880cf25366
2 changed files with 1 additions and 5 deletions

View File

@ -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'))

View File

@ -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;