summaryrefslogtreecommitdiff
path: root/js/inline-expanding.js
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2013-08-16 10:07:24 -0400
committerczaks <marcin@6irc.net>2013-08-16 10:07:24 -0400
commit146243c473f24e6b86e711dd1afeebfcdd711af7 (patch)
tree9b50f4b5bf76ada14b29cd9b672758f37522bd03 /js/inline-expanding.js
parentc2ffd324369dc8db4f67e6f035ccc335b3b20be7 (diff)
parent0565e2119d54cb4be8c6931ee42acfb586188893 (diff)
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts: inc/config.php inc/display.php inc/functions.php
Diffstat (limited to 'js/inline-expanding.js')
-rw-r--r--js/inline-expanding.js5
1 files changed, 1 insertions, 4 deletions
diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index 398db181..8710d632 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -16,10 +16,7 @@ onready(function(){
var link = this.getElementsByTagName('a');
for (var i = 0; i < link.length; i++) {
- if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].className != 'file') {
- if (window.jQuery && !$(link).prev().hasClass('fileinfo')) {
- continue;
- }
+ if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].childNodes[0].className.match(/post-image/)) {
link[i].childNodes[0].style.maxWidth = '95%';
link[i].onclick = function(e) {
if (this.childNodes[0].className == 'hidden')