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

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

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();