perdedora/leftypol
1
0
Fork 0
forked from leftypol/leftypol
Code Pull requests Activity

Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Browse source 
Conflicts:
	inc/functions.php
	inc/mod/pages.php
	install.php
	js/expand.js
	mod.php
This commit is contained in:
czaks 2013-07-31 02:30:44 -04:00
commit 96bcf5dd1e
15 changed files with 279 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/expand.js
View file

@ -3,7 +3,7 @@
* https://github.com/savetheinternet/Tinyboard/blob/master/js/expand.js
*
* Released under the MIT license
* Copyright (c) 2012 Michael Save <savetheinternet@tinyboard.org>
* Copyright (c) 2012-2013 Michael Save <savetheinternet@tinyboard.org>
*
* Usage:
* $config['additional_javascript'][] = 'js/jquery.min.js';
@ -35,10 +35,8 @@ $(document).ready(function(){
$(this).addClass('expanded').insertAfter(thread.find('div.post:first')).after('<br class="expanded">');
}
last_expanded = $(this);
$(document).trigger('new_post', this);
}
else {
} else {
last_expanded = post_in_doc;
}
});

2
js/inline-expanding.js
View file

@ -21,7 +21,7 @@ onready(function(){
link[i].onclick = function(e) {
if (this.childNodes[0].className == 'hidden')
return false;
if (e.which == 2)
if (e.which == 2 || e.metaKey)
return true;
if (!this.dataset.src) {
this.dataset.expanded = 'true';