mirror of
https://github.com/vichan-devel/vichan.git
synced 2024-11-24 07:30:10 +01:00
fix merge
This commit is contained in:
parent
64a66db613
commit
880cf25366
@ -41,9 +41,6 @@ $(document).ready(function(){
|
|||||||
else {
|
else {
|
||||||
last_expanded = post_in_doc;
|
last_expanded = post_in_doc;
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
last_expanded = post_in_doc;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
$('<span class="omitted"><a href="javascript:void(0)">' + _('Hide expanded replies') + '</a>.</span>')
|
$('<span class="omitted"><a href="javascript:void(0)">' + _('Hide expanded replies') + '</a>.</span>')
|
||||||
.insertAfter(thread.find('span.omitted').css('display', 'none'))
|
.insertAfter(thread.find('span.omitted').css('display', 'none'))
|
||||||
|
@ -16,9 +16,8 @@ onready(function(){
|
|||||||
var link = this.getElementsByTagName('a');
|
var link = this.getElementsByTagName('a');
|
||||||
|
|
||||||
for (var i = 0; i < link.length; i++) {
|
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.maxWidth = '95%';
|
||||||
link[i].childNodes[0].style.maxHeight = '95%';
|
|
||||||
link[i].onclick = function(e) {
|
link[i].onclick = function(e) {
|
||||||
if (this.childNodes[0].className == 'hidden')
|
if (this.childNodes[0].className == 'hidden')
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
Reference in New Issue
Block a user