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

Conflicts:
	js/quick-reply.js

1 files changed, 40 insertions, 0 deletions

diff --git a/js/settings.js b/js/settings.js
new file mode 100644
index 00000000..e98b35ae
--- /dev/null
+++ b/js/settings.js
@@ -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	
+};