kashire/lainchan
4
0
Fork 0
Code Issues 18 Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5

Browse Source 
Conflicts:
	js/quick-reply.js
This commit is contained in:
czaks 2013-09-18 09:00:22 -04:00
commit 99a2e1cf3d
6 changed files with 450 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/bans.php
View File

@ -253,7 +253,7 @@ class Bans {
modLog('Created a new ' .
($length > 0 ? preg_replace('/^(\d+) (\w+?)s?$/', '$1-$2', until($length)) : 'permanent') .
' ban on ' .
($board ? '/' . $board . '/' : 'all boards') .
($ban_board ? '/' . $ban_board . '/' : 'all boards') .
' for ' .
(filter_var($mask, FILTER_VALIDATE_IP) !== false ? "<a href=\"?/IP/$mask\">$mask</a>" : $mask) .
' (<small>#' . $pdo->lastInsertId() . '</small>)' .

4
js/ajax.js
View File

@ -12,6 +12,7 @@
*/
$(window).ready(function() {
var settings = new script_settings('ajax');
var do_not_ajax = false;
var setup_form = function($form) {
@ -68,7 +69,8 @@ $(window).ready(function() {
$(form).find('input[type="submit"]').removeAttr('disabled');
}
} else if (post_response.redirect && post_response.id) {
if (!$(form).find('input[name="thread"]').length) {
if (!$(form).find('input[name="thread"]').length
|| (!settings.get('always_noko_replies', true) && !post_response.noko)) {
document.location = post_response.redirect;
} else {
$.ajax({

63
js/quick-reply.js
View File

@ -12,6 +12,9 @@
*
*/
(function() {
var settings = new script_settings('quick-reply');
var do_css = function() {
$('#quick-reply-css').remove();
@ -302,7 +305,7 @@ var show_quick_reply = function(){
if (localStorage.quickReplyPosition) {
var offset = JSON.parse(localStorage.quickReplyPosition);
if (offset.top < 0)
offset.top = 10;
offset.top = 0;
if (offset.right > $(window).width() - $postForm.width())
offset.right = $(window).width() - $postForm.width();
if (offset.top > $(window).height() - $postForm.height())
@ -330,6 +333,7 @@ var show_quick_reply = function(){
$postForm.find('th .close-btn').click(function() {
$origPostForm.find('textarea[name="body"]').attr('id', 'body');
$postForm.remove();
floating_link();
});
// Fix bug when table gets too big for form. Shouldn't exist, but crappy CSS etc.
@ -340,6 +344,7 @@ var show_quick_reply = function(){
$(window).trigger('quick-reply');
$(window).ready(function() {
if (settings.get('hide_at_top', true)) {
$(window).scroll(function() {
if ($(this).width() <= 800)
return;
@ -347,12 +352,17 @@ var show_quick_reply = function(){
$postForm.fadeOut(100);
else
$postForm.fadeIn(100);
}).on('stylesheet', function() {
}).scroll();
} else {
$postForm.show();
}
$(window).on('stylesheet', function() {
do_css();
if ($('link#stylesheet').attr('href')) {
$('link#stylesheet')[0].onload = do_css;
}
}).scroll();
});
});
};
@ -370,3 +380,50 @@ $(window).on('cite', function(e, id, with_link) {
});
}
});
var floating_link = function() {
if (!settings.get('floating_link', false))
return;
$('<a href="javascript:void(0)" class="quick-reply-btn">Quick Reply</a>')
.click(function() {
show_quick_reply();
$(this).remove();
}).prependTo($('body'));
$(window).on('quick-reply', function() {
$('.quick-reply-btn').remove();
});
};
if (settings.get('floating_link', false)) {
$(window).ready(function() {
if($('div.banner').length == 0)
return;
$('<style type="text/css">\
a.quick-reply-btn {\
position: fixed;\
right: 0;\
top: 0;\
display: block;\
padding: 5px 13px;\
text-decoration: none;\
}\
</style>').appendTo($('head'));
floating_link();
if (settings.get('hide_at_top', true)) {
$('.quick-reply-btn').hide();
$(window).scroll(function() {
if ($(this).width() <= 800)
return;
if ($(this).scrollTop() < $('form[name="post"]:first').offset().top + $('form[name="post"]:first').height() - 100)
$('.quick-reply-btn').fadeOut(100);
else
$('.quick-reply-btn').fadeIn(100);
}).scroll();
}
});
}
})();

40
js/settings.js Normal file
View File

@ -0,0 +1,40 @@
/*
* settings.js
* https://github.com/savetheinternet/Tinyboard/blob/master/js/settings.js
*
* Optional settings. Used to customize some scripts without needing to tweak their code.
* Notes:
* - You must include this script first.
* - This file is just an example.
* - You should copy settings.js to something like instance.settings.js to prevent conflicts when upgrading.
* - This file should always be optional.
*
* Released under the MIT license
* Copyright (c) 2013 Michael Save <savetheinternet@tinyboard.org>
*
* Usage:
* $config['additional_javascript'][] = 'js/jquery.min.js';
* $config['additional_javascript'][] = 'js/instance.settings.js';
* // $config['additional_javascript'][] = 'js/quick-reply.js';
*
* Usage in scripts:
* var settings = new script_settings('my-script');
* var some_value = settings.get('option', 'default value');
*
*/
var tb_settings = {};
// quick-reply.js
tb_settings['quick-reply'] = {
// Hide form when scrolled to top of page (where original form is visible)
hide_at_top: true,
// "Quick reply" button floating at the top right hand corner of the page at all times
floating_link: true
};
// ajax.js
tb_settings['ajax'] = {
// Always act as if "noko" was typed when posting replies with the ajax script
always_noko_replies: false
};

1
post.php
View File

@ -775,6 +775,7 @@ if (isset($_POST['delete'])) {
header('Content-Type: text/json; charset=utf-8');
echo json_encode(array(
'redirect' => $redirect,
'noko' => $config['always_noko'] || $noko,
'id' => $id
));
}

11
templates/main.js
View File

@ -249,6 +249,17 @@ function rememberStuff() {
}
}
var script_settings = function(script_name) {
this.script_name = script_name;
this.get = function(var_name, default_val) {
if (typeof tb_settings == 'undefined' ||
typeof tb_settings[this.script_name] == 'undefined' ||
typeof tb_settings[this.script_name][var_name] == 'undefined')
return default_val;
return tb_settings[this.script_name][var_name];
}
};
function init() {
init_stylechooser();