move a few options to a general tab in options panel

1 files changed, 25 insertions, 7 deletions

diff --git a/js/toggle-locked-threads.js b/js/toggle-locked-threads.js
index 20a288ed..d0ad6df4 100644
--- a/js/toggle-locked-threads.js
+++ b/js/toggle-locked-threads.js
@@ -7,20 +7,21 @@
  *
  * Usage:
  *   $config['additional_javascript'][] = 'js/jquery.min.js';
+ *   //$config['additional_javascript'][] = 'js/options.js';
+ *   //$config['additional_javascript'][] = 'js/style-select.js';
+ *   //$config['additional_javascript'][] = 'js/options/general.js';
  *   $config['additional_javascript'][] = 'js/toggle-locked-threads.js';
  *
  */
 
-if (active_page == 'ukko' || active_page == 'index')
+if (active_page == 'ukko' || active_page == 'index' || (window.Options && Options.get_tab('general')))
 $(document).ready(function(){
-	if($('div.banner').length != 0)
-		return; // not index
-	
 	var hide_locked_threads = localStorage['hidelockedthreads'] ? true : false;
 
 	$('<style type="text/css"> img.hidden{ opacity: 0.1; background: grey; border: 1px solid #000; } </style>').appendTo($('head'));
 	
 	var hideLockedThread = function($thread) {
+		if (active_page == 'ukko' || active_page == 'index')
 		$thread
 			.hide()
 			.addClass('hidden');
@@ -35,11 +36,24 @@ $(document).ready(function(){
 	var getThreadFromIcon = function($icon) {
 		return $icon.parent().parent().parent()
 	};
+
+	var selector, event;
+        if (window.Options && Options.get_tab('general')) {
+                selector = '#toggle-locked-threads>input';
+                event = 'change';
+                Options.extend_tab("general", "<label id='toggle-locked-threads'><input type='checkbox' /> "+_('Hide locked threads')+"</label>");
+        }
+        else {
+                selector = '#toggle-locked-threads a';
+                event = 'click';
+		$('hr:first').before('<div id="toggle-locked-threads" style="text-align:right"><a class="unimportant" href="javascript:void(0)">-</a></div>');
+        }
 	
-	$('hr:first').before('<div id="toggle-locked-threads" style="text-align:right"><a class="unimportant" href="javascript:void(0)">-</a></div>');
 	$('div#toggle-locked-threads a')
-		.text(hide_locked_threads ? _('Show locked threads') : _('Hide locked threads'))
-		.click(function() {
+		.text(hide_locked_threads ? _('Show locked threads') : _('Hide locked threads'));
+
+	$(selector)
+		.on(event, function() {
 			hide_locked_threads = !hide_locked_threads;
 			if (hide_locked_threads) {
 				$('img.icon[title="Locked"], i.fa-lock.fa').each(function() {
@@ -60,6 +74,10 @@ $(document).ready(function(){
 		$('img.icon[title="Locked"], i.fa-lock.fa').each(function() {
 			hideLockedThread(getThreadFromIcon($(this)));
 		});
+
+		if (window.Options && Options.get_tab('general')) {
+			$('#toggle-locked-threads>input').prop('checked', true);
+		}
 	}
         $(document).on('new_post', function(e, post) {
 		if (hide_locked_threads) {