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/config.php
	inc/display.php
	inc/functions.php
	inc/image.php
	js/expand.js
	js/hide-threads.js
	js/local-time.js
	js/smartphone-spoiler.js
	templates/header.html
	templates/index.html
	templates/main.js
	templates/page.html
	templates/post_reply.html
	templates/post_thread.html
	templates/thread.html
This commit is contained in:
czaks 2013-07-31 14:54:20 -04:00
commit 55c7146d88
18 changed files with 668 additions and 623 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/expand.js
View file

@ -14,7 +14,7 @@
$(document).ready(function(){
if($('div.banner').length != 0)
return; // not index
var do_expand = function() {
$(this)
.html($(this).text().replace(_("Click reply to view."), '<a href="javascript:void(0)">'+_("Click to expand")+'</a>.'))

5
js/inline-expanding.js
View file

@ -14,7 +14,7 @@
onready(function(){
var inline_expand_post = 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') {
link[i].childNodes[0].style.maxWidth = '95%';
@ -54,7 +54,7 @@ onready(function(){
if (window.jQuery) {
$('div[id^="thread_"]').each(inline_expand_post);
// allow to work with auto-reload.js, etc.
$(document).bind('new_post', function(e, post) {
inline_expand_post.call(post);
@ -63,4 +63,3 @@ onready(function(){
inline_expand_post.call(document);
}
});

14
js/local-time.js
View file

@ -6,7 +6,7 @@
* Copyright (c) 2012 Michael Save <savetheinternet@tinyboard.org>
*
* Usage:
* $config['additional_javascript'][] = 'js/jquery.min.js';
* // $config['additional_javascript'][] = 'js/jquery.min.js';
* $config['additional_javascript'][] = 'js/local-time.js';
*
*/
@ -44,10 +44,12 @@ onready(function(){
};
do_localtime(document);
// allow to work with auto-reload.js, etc.
$(document).bind('new_post', function(e, post) {
do_localtime(post);
});
if (window.jQuery) {
// allow to work with auto-reload.js, etc.
$(document).bind('new_post', function(e, post) {
do_localtime(post);
});
}
});